rpms/linuxwacom/devel linuxwacom-8.2.2.2-buttonnumber.patch, NONE, 1.1 linuxwacom-8.2.2.2-xorg17-nokeysending.patch, NONE, 1.1 linuxwacom.spec, 1.81, 1.82

Peter Hutterer whot at fedoraproject.org
Thu Sep 17 01:28:03 UTC 2009


Author: whot

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9559

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-8.2.2.2-buttonnumber.patch 
	linuxwacom-8.2.2.2-xorg17-nokeysending.patch 
Log Message:
* Wed Sep 16 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-14
- linuxwacom-8.2.2.2-xorg17-nokeysending.patch: disable keysending, it's
  broken as-is.
- linuxwacom-8.2.2.2-buttonnumber.patch: don't increase the button number,
  the priv->button array is zero-indexed.


linuxwacom-8.2.2.2-buttonnumber.patch:
 wcmCommon.c |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE linuxwacom-8.2.2.2-buttonnumber.patch ---
>From 6094d946798cc7f97c128c66b364e9d98ace5685 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Wed, 16 Sep 2009 17:15:16 +1000
Subject: [PATCH] Dont inc. the button number.

priv->button is zero-indexed, but has the right mappings.
---
 src/xdrv/wcmCommon.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/xdrv/wcmCommon.c b/src/xdrv/wcmCommon.c
index 91bda74..1e1bd12 100644
--- a/src/xdrv/wcmCommon.c
+++ b/src/xdrv/wcmCommon.c
@@ -506,9 +506,6 @@ static void sendAButton(LocalDevicePtr local, int button, int mask,
 #endif
 	int naxes = priv->naxes;
 
-        /* Fix for current X servers, they start button mappings with 1, not
-         * with 0. */
-	button++;
 	if (!priv->button[button])  /* ignore this button event */
 		return;
 
-- 
1.6.3.rc1.2.g0164.dirty


linuxwacom-8.2.2.2-xorg17-nokeysending.patch:
 xf86Wacom.h |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE linuxwacom-8.2.2.2-xorg17-nokeysending.patch ---
>From 5cc0f164ba7766cac746ffb4e8be49325c1ea19a Mon Sep 17 00:00:00 2001
From: whot <whot at distributions-rawhide.(none)>
Date: Tue, 15 Sep 2009 16:02:18 +1000
Subject: [PATCH] undef keysending support

---
 src/xdrv/xf86Wacom.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/xdrv/xf86Wacom.h b/src/xdrv/xf86Wacom.h
index f302c73..ba26998 100644
--- a/src/xdrv/xf86Wacom.h
+++ b/src/xdrv/xf86Wacom.h
@@ -26,11 +26,16 @@
 #ifdef WCM_XORG
    #include <xorg-server.h>
    #include <xorgVersion.h>
+   #include <xf86Module.h>
 #else
    #include <xf86Version.h>
 #endif
 #include "../include/Xwacom.h"
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+#undef WCM_KEY_SENDING_SUPPORT
+#endif
+
 /*****************************************************************************
  * Linux Input Support
  ****************************************************************************/
-- 
1.6.4.2



Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- linuxwacom.spec	14 Aug 2009 14:46:59 -0000	1.81
+++ linuxwacom.spec	17 Sep 2009 01:28:02 -0000	1.82
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.2.2
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -35,6 +35,12 @@ Patch10:	linuxwacom-0.8.2.2-intuos4-supp
 # patch up for new Xorg API changes, extracted from linuxwacom-devel list
 # https://sourceforge.net/mailarchive/forum.php?thread_name=200906181709.56283.neitzke%40physics.harvard.edu&forum_name=linuxwacom-devel
 Patch11:	linuxwacom-0.8.2.2-xorg17-buildfix.patch
+# Patch11 is broken, assigning some non-existing struct to the new pointer
+# (which is of a different type). Undef keysending altogether, it's not working
+# with 1.7 as-is.
+Patch12:	linuxwacom-8.2.2.2-xorg17-nokeysending.patch
+Patch13:	linuxwacom-8.2.2.2-buttonnumber.patch
+
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
@@ -72,6 +78,8 @@ compiling applications for manipulating 
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 
@@ -134,6 +142,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Wed Sep 16 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-14
+- linuxwacom-8.2.2.2-xorg17-nokeysending.patch: disable keysending, it's
+  broken as-is.
+- linuxwacom-8.2.2.2-buttonnumber.patch: don't increase the button number,
+  the priv->button array is zero-indexed.
+
 * Tue Jul 21 2009 Jarod Wilson <jarod at redhat.com> 0.8.2.2-13
 - Patch up build for xorg 1.7 API changes
 




More information about the fedora-extras-commits mailing list