From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euMUx-0005pe-9x for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euMUu-0003EB-Dh for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:44898) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euMUu-0003Dv-94 for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1euMUu-0005Iz-3G for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:04 -0500 Subject: [bug#30761] [PATCH staging 6/9] gnu: libinput: Update to 1.10.2. Resent-Message-ID: From: Marius Bakke Date: Fri, 9 Mar 2018 19:11:05 +0100 Message-Id: <20180309181108.22888-6-mbakke@fastmail.com> In-Reply-To: <20180309181108.22888-1-mbakke@fastmail.com> References: <20180309181108.22888-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30761@debbugs.gnu.org * 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. (libinput-minimal)[native-inputs]: Inherit from LIBINPUT. [arguments]: Inherit from LIBINPUT. Adjust to build system change. --- gnu/packages/freedesktop.scm | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 3c83e668b..15e658da7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Mark H Weaver -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -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,19 +146,23 @@ 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) + `(("check" ,check) + ("cairo" ,cairo) ("gtk+" ,gtk+) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("valgrind" ,valgrind))) (propagated-inputs `(("libudev" ,eudev))) ; required by libinput.pc (inputs @@ -173,13 +181,17 @@ other applications that need to directly deal with input devices.") (package (inherit libinput) (name "libinput-minimal") (native-inputs - `(("pkg-config" ,pkg-config))) + (fold alist-delete (package-native-inputs libinput) + '("gtk+" "cairo"))) (inputs `(("libevdev" ,libevdev) ("mtdev" ,mtdev))) (arguments - `(#:configure-flags - '("--disable-libwacom"))))) + (substitute-keyword-arguments (package-arguments libinput) + ((#:configure-flags flags ''()) + `(cons* "-Dlibwacom=false" + "-Ddebug-gui=false" ;requires gtk+@3 + ,flags)))))) (define-public libxdg-basedir (package -- 2.16.2