ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libinput: Update to 1.10.2.

Browse source 
* 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.
This commit is contained in:
Marius Bakke 2018-03-09 18:34:10 +01:00
parent d5b5a15a40
commit 285c091e80
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
gnu/packages/freedesktop.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org> ;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -30,10 +30,12 @@
(define-module (gnu packages freedesktop) (define-module (gnu packages freedesktop)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages acl) #:use-module (gnu packages acl)
@ -68,11 +70,13 @@ (define-module (gnu packages freedesktop)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages perl-check) #:use-module (gnu packages perl-check)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages w3m) #:use-module (gnu packages w3m)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg)
#:use-module (srfi srfi-1))
(define-public xdg-utils (define-public xdg-utils
(package (package
@ -142,26 +146,31 @@ (define-public xdg-utils
(define-public libinput (define-public libinput
(package (package
(name "libinput") (name "libinput")
(version "1.7.3") (version "1.10.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://freedesktop.org/software/libinput/" (uri (string-append "https://freedesktop.org/software/libinput/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89")))) "1fbv354ii1g4wc4k7d7gbnalqjpzmk9zlpi8linqrzlf6inpc28m"))))
(build-system gnu-build-system) (build-system meson-build-system)
(arguments
`(#:configure-flags '("-Ddocumentation=false")))
(native-inputs (native-inputs
`(("cairo" ,cairo) `(("check" ,check)
("gtk+" ,gtk+) ("pkg-config" ,pkg-config)
("pkg-config" ,pkg-config))) ("valgrind" ,valgrind)))
(propagated-inputs (propagated-inputs
`(("libudev" ,eudev))) ; required by libinput.pc `(;; In Requires.private of libinput.pc.
(inputs
`(("glib" ,glib)
("libevdev" ,libevdev) ("libevdev" ,libevdev)
("mtdev" ,mtdev) ("libudev" ,eudev)
("libwacom" ,libwacom))) ("libwacom" ,libwacom)
("mtdev" ,mtdev)))
(inputs
`(("cairo" ,cairo)
("glib" ,glib)
("gtk+" ,gtk+)))
(home-page "https://www.freedesktop.org/wiki/Software/libinput/") (home-page "https://www.freedesktop.org/wiki/Software/libinput/")
(synopsis "Input devices handling library") (synopsis "Input devices handling library")
(description (description
@ -172,14 +181,15 @@ (define-public libinput
(define-public libinput-minimal (define-public libinput-minimal
(package (inherit libinput) (package (inherit libinput)
(name "libinput-minimal") (name "libinput-minimal")
(native-inputs (inputs '())
`(("pkg-config" ,pkg-config))) (propagated-inputs
(inputs (alist-delete "libwacom" (package-propagated-inputs libinput)))
`(("libevdev" ,libevdev)
("mtdev" ,mtdev)))
(arguments (arguments
`(#:configure-flags (substitute-keyword-arguments (package-arguments libinput)
'("--disable-libwacom"))))) ((#:configure-flags flags ''())
`(cons* "-Dlibwacom=false"
"-Ddebug-gui=false" ;requires gtk+@3
,flags))))))
(define-public libxdg-basedir (define-public libxdg-basedir
(package (package