From 7e5b944e8f54b9e216e0edff2116b3e37a7e37ff Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 1 Jan 2017 23:20:18 -0500 Subject: gnu: libdrm: Update to 2.4.74. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.74. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 21d396972a..b05debade7 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -266,7 +266,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.68") + (version "2.4.74") (source (origin (method url-fetch) @@ -276,7 +276,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "1px91j6imaaq2fy8ksvgldmv0cdz3w379jqiciqvqa99jajxjjsv")) + "02w4xy3gsp0556l9d395mlxhlzixqscxkk6was3lq7s0djkxa3fq")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (inputs -- cgit 1.4.1 From 737c572a2b7131fc69a07ac7639b173914d48363 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Jan 2017 15:34:19 +0100 Subject: gnu: libdrm: Update to 2.4.75. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.75. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b05debade7..2df9bd22f1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -266,7 +266,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.74") + (version "2.4.75") (source (origin (method url-fetch) @@ -276,7 +276,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "02w4xy3gsp0556l9d395mlxhlzixqscxkk6was3lq7s0djkxa3fq")) + "0kq5hmck0gq7b29fr8jp94njc7jpkpbyws12s63w4b21xw750nid")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (inputs -- cgit 1.4.1 From fbb4755c8ad49d82437bfc1db86ca7957769d67b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jan 2017 14:59:22 +0100 Subject: gnu: libxkbcommon: Update to 0.7.1. * gnu/packages/xdisorg.scm (libxkbcommon): Update to 0.7.1. [source]: Use HTTPS. [home-page]: Ditto. --- gnu/packages/xdisorg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2df9bd22f1..a606f68b0e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -131,14 +131,14 @@ avoiding password prompts when X11 forwarding has already been setup.") (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.6.1") + (version "0.7.1") (source (origin (method url-fetch) - (uri (string-append "http://xkbcommon.org/download/" name "-" + (uri (string-append "https://xkbcommon.org/download/" name "-" version ".tar.xz")) (sha256 (base32 - "0q47xa1szlxwgvwmhv4b7xwawnykz1hnc431d84nj8dlh2q8f22v")))) + "12z6hih3n1r0asp2hzp9qsiwdfkfz46jwp06x8kprr0r5rfk0nds")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) @@ -155,7 +155,7 @@ avoiding password prompts when X11 forwarding has already been setup.") (string-append "--with-x-locale-root=" (assoc-ref %build-inputs "libx11") "/share/X11/locale")))) - (home-page "http://xkbcommon.org/") + (home-page "https://xkbcommon.org/") (synopsis "Library to handle keyboard descriptions") (description "Xkbcommon is a library to handle keyboard descriptions, including loading them from disk, parsing them and handling their -- cgit 1.4.1 From f12def72ae6e6d06335d726b93bc88e0e896b9ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Feb 2017 14:41:03 +0100 Subject: gnu: xf86-input-wacom: Fix compatibility with xorg ABI 25. * gnu/packages/patches/xf86-input-wacom-xorg-abi-25.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/xdisorg.scm (xf86-input-wacom)[source](patches): Use it. --- gnu/local.mk | 1 + .../patches/xf86-input-wacom-xorg-abi-25.patch | 46 ++++++++++++++++++++++ gnu/packages/xdisorg.scm | 4 +- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/xf86-input-wacom-xorg-abi-25.patch (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 2ca90dfce6..82d9a31bd1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -970,6 +970,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/xdotool-fix-makefile.patch \ + %D%/packages/patches/xf86-input-wacom-xorg-abi-25.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-ast-remove-mibstore.patch \ %D%/packages/patches/xf86-video-geode-glibc-2.20.patch \ diff --git a/gnu/packages/patches/xf86-input-wacom-xorg-abi-25.patch b/gnu/packages/patches/xf86-input-wacom-xorg-abi-25.patch new file mode 100644 index 0000000000..dc594bdccb --- /dev/null +++ b/gnu/packages/patches/xf86-input-wacom-xorg-abi-25.patch @@ -0,0 +1,46 @@ +Resolves a test compatibility issue with xorg >= 1.19. + +Upstream bug report: + +https://sourceforge.net/p/linuxwacom/bugs/329/ + +Patch copied from upstream source repository: + +https://sourceforge.net/p/linuxwacom/xf86-input-wacom/ci/f0dedf7a610ac97bc45738492b98ce4f1e0514ec/ + +From f0dedf7a610ac97bc45738492b98ce4f1e0514ec Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Wed, 18 Jan 2017 09:00:10 -0800 +Subject: [PATCH] tests: Fix compilation under ABI 25 and greater + +diff --git a/test/fake-symbols.c b/test/fake-symbols.c +index 6f2c10a..e649fb9 100644 +--- a/test/fake-symbols.c ++++ b/test/fake-symbols.c +@@ -493,6 +493,7 @@ void TimerFree(OsTimerPtr timer) + { + } + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 24 + int + xf86BlockSIGIO (void) + { +@@ -503,6 +504,15 @@ void + xf86UnblockSIGIO (int wasset) + { + } ++#else ++void input_lock (void) ++{ ++} ++ ++void input_unlock (void) ++{ ++} ++#endif + + /* This is not the same as the X server one, but it'll do for the tests */ + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14 +-- +2.11.1 + diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7b3142657f..1b91404dbe 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -796,7 +796,9 @@ Wacom tablet applet.") name "-" version ".tar.bz2")) (sha256 (base32 - "0idhkigl0pnyp08sqm6bqfb4h20v6rjrb71z1gdv59gk7d7qwpgi")))) + "0idhkigl0pnyp08sqm6bqfb4h20v6rjrb71z1gdv59gk7d7qwpgi")) + (patches + (search-patches "xf86-input-wacom-xorg-abi-25.patch")))) (arguments `(#:configure-flags (list (string-append "--with-sdkdir=" -- cgit 1.4.1