diff options
| author | Leo Famulari <leo@famulari.name> | 2017-06-07 12:11:24 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-06-07 12:11:55 -0400 |
| commit | c67d587f94173fd42d65097165afc5c512935646 (patch) | |
| tree | ee2bac9d683d0dec98d611d5e590b06d9876cad3 /gnu/packages/xdisorg.scm | |
| parent | 4f493cba06b97de756123b3855ea52dcf1ad3555 (diff) | |
| parent | 4679dd6967c21e21c740cd88e17191b8e2aac5ee (diff) | |
| download | guix-c67d587f94173fd42d65097165afc5c512935646.tar.gz | |
Merge branch 'master' into core-updates
This merge commit includes a fix for CVE-2017-6512 in Perl 5.26.0.
Diffstat (limited to 'gnu/packages/xdisorg.scm')
| -rw-r--r-- | gnu/packages/xdisorg.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d9cee8a257..3b06fbeb6b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -791,14 +791,14 @@ Escape key when Left Control is pressed and released on its own.") (define-public libwacom (package (name "libwacom") - (version "0.23") + (version "0.25") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/linuxwacom/libwacom/" name "-" version ".tar.bz2")) (sha256 (base32 - "0qiikh95b9crybkwgcbbv9y80hb7lsbvvmvaia4gbgbdyagwb2m0")))) + "1k20w2fkql3yr0dpdg51jjwzv7d4kp53ajmpyhcjxa08s0n8dl19")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -823,7 +823,7 @@ Wacom tablet applet.") (define-public xf86-input-wacom (package (name "xf86-input-wacom") - (version "0.34.0") + (version "0.34.2") (source (origin (method url-fetch) (uri (string-append @@ -831,9 +831,7 @@ Wacom tablet applet.") name "-" version ".tar.bz2")) (sha256 (base32 - "0idhkigl0pnyp08sqm6bqfb4h20v6rjrb71z1gdv59gk7d7qwpgi")) - (patches - (search-patches "xf86-input-wacom-xorg-abi-25.patch")))) + "073bf12ka1mcqvr1sviixb51bsfx37jalrj9xw53f10i2kdvkl9a")))) (arguments `(#:configure-flags (list (string-append "--with-sdkdir=" |