mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
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.
This commit is contained in:
parent
008dfa23d4
commit
f12def72ae
3 changed files with 50 additions and 1 deletions
|
@ -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 \
|
||||
|
|
46
gnu/packages/patches/xf86-input-wacom-xorg-abi-25.patch
Normal file
46
gnu/packages/patches/xf86-input-wacom-xorg-abi-25.patch
Normal file
|
@ -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 <killertofu@gmail.com>
|
||||
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
|
||||
|
|
@ -796,7 +796,9 @@ (define-public xf86-input-wacom
|
|||
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="
|
||||
|
|
Loading…
Reference in a new issue