all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Marius Bakke <mbakke@fastmail.com>
To: 30761@debbugs.gnu.org
Subject: [bug#30761] [PATCH staging 6/9] gnu: libinput: Update to 1.10.2.
Date: Fri,  9 Mar 2018 19:11:05 +0100	[thread overview]
Message-ID: <20180309181108.22888-6-mbakke@fastmail.com> (raw)
In-Reply-To: <20180309181108.22888-1-mbakke@fastmail.com>

* 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 <efraim@flashner.co.il>
 ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
 ;;; 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 Brendan Tildesley <brendan.tildesley@openmailbox.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -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

  parent reply	other threads:[~2018-03-09 18:12 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-09 18:09 [bug#30761] [PATCH staging 0/9] Meson fixes (and some updates) Marius Bakke
2018-03-09 18:11 ` [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable Marius Bakke
2018-03-09 18:11   ` [bug#30761] [PATCH staging 2/9] gnu: meson-for-build: Update to 0.44.0 Marius Bakke
2018-03-11 22:18     ` Ludovic Courtès
2018-03-09 18:11   ` [bug#30761] [PATCH staging 3/9] gnu: meson: Update to 0.45.0 Marius Bakke
2018-03-11 22:18     ` Ludovic Courtès
2018-03-09 18:11   ` [bug#30761] [PATCH staging 4/9] build-system/meson: Add the output directory to RUNPATH Marius Bakke
2018-03-11 22:23     ` Ludovic Courtès
2018-03-12 13:04       ` Marius Bakke
2018-03-09 18:11   ` [bug#30761] [PATCH staging 5/9] build-system/meson: Skip the 'fix-runpath' phase on armhf Marius Bakke
2018-03-11 22:24     ` Ludovic Courtès
2018-03-12 13:05       ` Marius Bakke
2018-03-09 18:11   ` Marius Bakke [this message]
2018-03-11 22:25     ` [bug#30761] [PATCH staging 6/9] gnu: libinput: Update to 1.10.2 Ludovic Courtès
2018-03-09 18:11   ` [bug#30761] [PATCH staging 7/9] gnu: libinput: Correct inputs Marius Bakke
2018-03-11 22:25     ` Ludovic Courtès
2018-03-12 13:20       ` Marius Bakke
2018-03-09 18:11   ` [bug#30761] [PATCH staging 8/9] gnu: libwacom: Update to 0.29 Marius Bakke
2018-03-11 22:26     ` Ludovic Courtès
2018-03-09 18:11   ` [bug#30761] [PATCH staging 9/9] gnu: xf86-input-wacom: Update to 0.36.0 Marius Bakke
2018-03-11 22:26     ` Ludovic Courtès
2018-05-07  9:54       ` Ludovic Courtès
2018-05-07 14:21         ` bug#30761: " Marius Bakke
2018-03-09 18:16   ` [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable Marius Bakke
2018-03-11 22:17   ` Ludovic Courtès
2018-03-12 12:47     ` Marius Bakke
2018-03-12 13:08       ` Marius Bakke
2018-03-12 14:01         ` Ludovic Courtès
2018-03-12 14:00       ` Ludovic Courtès
2018-03-12 14:44         ` Marius Bakke
2018-03-12 16:16           ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180309181108.22888-6-mbakke@fastmail.com \
    --to=mbakke@fastmail.com \
    --cc=30761@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.