rpms/xorg-x11-drv-synaptics/devel synaptics-1.1.0-synclient-64.patch, NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.26, 1.27

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10508

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	synaptics-1.1.0-synclient-64.patch 
Log Message:
* Tue Apr 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.0-2
- synaptics-1.1.0-synclient-64.patch: fix 64-bit integer issues with
  synclient (#494766) 



synaptics-1.1.0-synclient-64.patch:

--- NEW FILE synaptics-1.1.0-synclient-64.patch ---
>From 77d732035ae56cd19125f3a25127391dde42a1d6 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Tue, 14 Apr 2009 07:27:07 -0400
Subject: [PATCH] synclient: fix 32-bit integer handling on 64 bit machines.

libX11 actually expects longs for 32-bit values, even if they are 64 bits.

Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
---
 tools/synclient.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/synclient.c b/tools/synclient.c
index 82ce61b..39b3bf6 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -532,7 +532,7 @@ dp_set_variables(Display *dpy, XDevice* dev, int argc, char *argv[], int first_c
     unsigned long nitems, bytes_after;
 
     float *f;
-    int *n;
+    long *n;
     char *b;
 
     float_type = XInternAtom(dpy, XATOM_FLOAT, True);
@@ -573,7 +573,7 @@ dp_set_variables(Display *dpy, XDevice* dev, int argc, char *argv[], int first_c
 			    par->name, format);
 		    break;
 		}
-		n = (int*)data;
+		n = (long*)data;
 		n[par->prop_offset] = rint(val);
 		break;
 	    case 0: /* float */
@@ -607,7 +607,7 @@ dp_show_settings(Display *dpy, XDevice *dev)
     int len;
 
     float *f;
-    int *i;
+    long *i;
     char *b;
 
     float_type = XInternAtom(dpy, XATOM_FLOAT, True);
@@ -648,8 +648,8 @@ dp_show_settings(Display *dpy, XDevice *dev)
 		    break;
 		}
 
-		i = (int*)data;
-		printf("    %-23s = %d\n", par->name, i[par->prop_offset]);
+		i = (long*)data;
+		printf("    %-23s = %ld\n", par->name, i[par->prop_offset]);
 		break;
 	    case 0: /* Float */
 		if (!float_type)
-- 
1.6.2.2.447.g4afa7



Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-drv-synaptics.spec	9 Mar 2009 02:13:14 -0000	1.26
+++ xorg-x11-drv-synaptics.spec	14 Apr 2009 03:33:17 -0000	1.27
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -18,6 +18,8 @@
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
+Patch1:         synaptics-1.1.0-synclient-64.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -74,6 +76,8 @@
 %setup -q -n %{tarball}-%{version}
 #%setup -q -n %{tarball}-%{gitdate}
 
+%patch1 -p1
+
 %build
 autoreconf -v --install --force || exit 1
 %configure --disable-static
@@ -121,6 +125,10 @@
 
 
 %changelog
+* Tue Apr 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.0-2
+- synaptics-1.1.0-synclient-64.patch: fix 64-bit integer issues with
+  synclient (#494766) 
+
 * Mon Mar 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.0-1
 - synaptics 1.1