[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/21: gnu: libinput: Update to 1.10.2.
From: |
Marius Bakke |
Subject: |
06/21: gnu: libinput: Update to 1.10.2. |
Date: |
Mon, 12 Mar 2018 13:22:33 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 285c091e80782bf46a0b4d75f41f1eb26105124a
Author: Marius Bakke <address@hidden>
Date: Fri Mar 9 18:34:10 2018 +0100
gnu: libinput: Update to 1.10.2.
* gnu/packages/freedesktop.scm (libinput): Update to 1.10.2.
[build-system]: Change to MESON-BUILD-SYSTEM.
[arguments]: Add #:configure-flags to not build documentation.
[native-inputs]: Add CHECK and VALGRIND. Move CAIRO and GTK+ ...
[inputs]: ... here. Move LIBEVDEV, LIBWACOM and MTDEV ...
[propagated-inputs]: ... here.
(libinput-minimal)[native-inputs]: Inherit from LIBINPUT.
[inputs]: New field; set to empty list.
[arguments]: Inherit from LIBINPUT. Adjust to build system change.
---
gnu/packages/freedesktop.scm | 50 ++++++++++++++++++++++++++------------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 3c83e66..a323778 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Kei Kebreau <address@hidden>
;;; Copyright © 2017 Mark H Weaver <address@hidden>
-;;; Copyright © 2017 Marius Bakke <address@hidden>
+;;; Copyright © 2017, 2018 Marius Bakke <address@hidden>
;;; Copyright © 2017 Rutger Helling <address@hidden>
;;; Copyright © 2017 Brendan Tildesley <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
@@ -30,10 +30,12 @@
(define-module (gnu packages freedesktop)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (gnu packages acl)
@@ -68,11 +70,13 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages python)
+ #:use-module (gnu packages valgrind)
#:use-module (gnu packages w3m)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg)
- #:use-module (gnu packages xorg))
+ #:use-module (gnu packages xorg)
+ #:use-module (srfi srfi-1))
(define-public xdg-utils
(package
@@ -142,26 +146,31 @@ freedesktop.org project.")
(define-public libinput
(package
(name "libinput")
- (version "1.7.3")
+ (version "1.10.2")
(source (origin
(method url-fetch)
(uri (string-append "https://freedesktop.org/software/libinput/"
name "-" version ".tar.xz"))
(sha256
(base32
- "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"))))
- (build-system gnu-build-system)
+ "1fbv354ii1g4wc4k7d7gbnalqjpzmk9zlpi8linqrzlf6inpc28m"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:configure-flags '("-Ddocumentation=false")))
(native-inputs
- `(("cairo" ,cairo)
- ("gtk+" ,gtk+)
- ("pkg-config" ,pkg-config)))
+ `(("check" ,check)
+ ("pkg-config" ,pkg-config)
+ ("valgrind" ,valgrind)))
(propagated-inputs
- `(("libudev" ,eudev))) ; required by libinput.pc
- (inputs
- `(("glib" ,glib)
+ `(;; In Requires.private of libinput.pc.
("libevdev" ,libevdev)
- ("mtdev" ,mtdev)
- ("libwacom" ,libwacom)))
+ ("libudev" ,eudev)
+ ("libwacom" ,libwacom)
+ ("mtdev" ,mtdev)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)))
(home-page "https://www.freedesktop.org/wiki/Software/libinput/")
(synopsis "Input devices handling library")
(description
@@ -172,14 +181,15 @@ other applications that need to directly deal with input
devices.")
(define-public libinput-minimal
(package (inherit libinput)
(name "libinput-minimal")
- (native-inputs
- `(("pkg-config" ,pkg-config)))
- (inputs
- `(("libevdev" ,libevdev)
- ("mtdev" ,mtdev)))
+ (inputs '())
+ (propagated-inputs
+ (alist-delete "libwacom" (package-propagated-inputs libinput)))
(arguments
- `(#:configure-flags
- '("--disable-libwacom")))))
+ (substitute-keyword-arguments (package-arguments libinput)
+ ((#:configure-flags flags ''())
+ `(cons* "-Dlibwacom=false"
+ "-Ddebug-gui=false" ;requires address@hidden
+ ,flags))))))
(define-public libxdg-basedir
(package
- 09/21: gnu: libical: Update to 3.0.3., (continued)
- 09/21: gnu: libical: Update to 3.0.3., Marius Bakke, 2018/03/12
- 10/21: gnu: libxshmfence: Update to 1.3., Marius Bakke, 2018/03/12
- 13/21: gnu: nss, nss-certs: Update to 3.36., Marius Bakke, 2018/03/12
- 17/21: gnu: alsa-plugins: Update to 1.1.5., Marius Bakke, 2018/03/12
- 16/21: gnu: alsa-utils: Update to 1.1.5., Marius Bakke, 2018/03/12
- 05/21: build-system/meson: Skip the 'fix-runpath' phase on armhf., Marius Bakke, 2018/03/12
- 14/21: gnu: bluez: Update to 5.49., Marius Bakke, 2018/03/12
- 12/21: gnu: nspr: Update to 4.19., Marius Bakke, 2018/03/12
- 19/21: gnu: libepoxy: Update to 1.5.0., Marius Bakke, 2018/03/12
- 20/21: gnu: mesa: Update to 17.3.6., Marius Bakke, 2018/03/12
- 06/21: gnu: libinput: Update to 1.10.2.,
Marius Bakke <=
- 21/21: gnu: libogg: Update to 1.3.3., Marius Bakke, 2018/03/12
- 15/21: gnu: alsa-lib: Update to 1.1.5., Marius Bakke, 2018/03/12