[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/11: gnu: xf86-input-wacom: Fix compatibility with xorg ABI 25.
From: |
Marius Bakke |
Subject: |
10/11: gnu: xf86-input-wacom: Fix compatibility with xorg ABI 25. |
Date: |
Tue, 21 Feb 2017 08:58:54 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit f12def72ae6e6d06335d726b93bc88e0e896b9ae
Author: Marius Bakke <address@hidden>
Date: Tue Feb 21 14:41:03 2017 +0100
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(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 2ca90df..82d9a31 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 0000000..dc594bd
--- /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 <address@hidden>
+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 7b31426..1b91404 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="
- branch core-updates updated (3b88f37 -> 9e5af7b), Marius Bakke, 2017/02/21
- 06/11: gnu: xorg-server: Use 'modify-phases' syntax., Marius Bakke, 2017/02/21
- 08/11: gnu: xf86-video-qxl: Change to libxfont2 ABI., Marius Bakke, 2017/02/21
- 04/11: gnu: cmake: Run tests in parallel., Marius Bakke, 2017/02/21
- 02/11: gnu: cmake: Update to 3.7.2., Marius Bakke, 2017/02/21
- 09/11: gnu: xf86-video-intel: Change to libxfont2 ABI., Marius Bakke, 2017/02/21
- 01/11: Merge branch 'staging' into core-updates, Marius Bakke, 2017/02/21
- 05/11: gnu: Add address@hidden, Marius Bakke, 2017/02/21
- 07/11: gnu: xorg-server: Update to 1.19.1., Marius Bakke, 2017/02/21
- 11/11: gnu: mesa: Update to 13.0.5., Marius Bakke, 2017/02/21
- 10/11: gnu: xf86-input-wacom: Fix compatibility with xorg ABI 25.,
Marius Bakke <=
- 03/11: gnu: cmake: Remove bundled software., Marius Bakke, 2017/02/21