X Strike Force X.Org X11 SVN commit: r1551 - in trunk/debian: . patches/general
Author: dnusinow
Date: 2006-04-02 23:16:31 -0500 (Sun, 02 Apr 2006)
New Revision: 1551
Modified:
trunk/debian/changelog
trunk/debian/patches/general/033_evdev_rewrite.diff
Log:
* Have evdev.h include unistd.h to prevent FTBFS on mipsen. Thanks Ryan
Murray. (closes: #360540)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-03-28 20:54:35 UTC (rev 1550)
+++ trunk/debian/changelog 2006-04-03 04:16:31 UTC (rev 1551)
@@ -1,3 +1,10 @@
+xorg-x11 (6.9.0.dfsg.1-6) unstable; urgency=low
+
+ * Have evdev.h include unistd.h to prevent FTBFS on mipsen. Thanks Ryan
+ Murray. (closes: #360540)
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 3 Apr 2006 00:15:44 -0400
+
xorg-x11 (6.9.0.dfsg.1-5) unstable; urgency=high
[ David Martínez Moreno ]
Modified: trunk/debian/patches/general/033_evdev_rewrite.diff
===================================================================
--- trunk/debian/patches/general/033_evdev_rewrite.diff 2006-03-28 20:54:35 UTC (rev 1550)
+++ trunk/debian/patches/general/033_evdev_rewrite.diff 2006-04-03 04:16:31 UTC (rev 1551)
@@ -1,7 +1,7 @@
-Index: xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile
+Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile
===================================================================
---- xorg-x11-6.9.0.dfsg.1.orig/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 2006-01-26 11:49:59.000000000 -0500
-+++ xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 2006-01-26 11:53:01.000000000 -0500
+--- trunk.orig/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 2006-04-03 00:11:02.000000000 -0400
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 2006-04-03 00:12:15.000000000 -0400
@@ -1,14 +1,16 @@
#define IHaveModules
#include <Server.tmpl>
@@ -32,10 +32,10 @@
DependTarget()
InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input)
-Index: xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c
+Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c
===================================================================
---- xorg-x11-6.9.0.dfsg.1.orig/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c 2006-01-26 11:49:59.000000000 -0500
-+++ xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c 2006-01-26 11:53:01.000000000 -0500
+--- trunk.orig/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c 2006-04-03 00:11:02.000000000 -0400
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c 2006-04-03 00:12:15.000000000 -0400
@@ -1,4 +1,34 @@
/*
+ * Copyright © 2006 Zephaniah E. Hull
@@ -909,10 +909,10 @@
NULL,
NULL,
0
-Index: xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.man
+Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.man
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.man 2006-01-26 11:53:01.000000000 -0500
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.man 2006-04-03 00:12:15.000000000 -0400
@@ -0,0 +1,151 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
@@ -1065,10 +1065,10 @@
+.SH "SEE ALSO"
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
+README.mouse.
-Index: xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_brain.c
+Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_brain.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_brain.c 2006-01-26 11:53:01.000000000 -0500
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_brain.c 2006-04-03 00:12:15.000000000 -0400
@@ -0,0 +1,284 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
@@ -1354,10 +1354,10 @@
+ driver->configured = TRUE;
+ return TRUE;
+}
-Index: xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_btn.c
+Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_btn.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_btn.c 2006-01-26 11:53:01.000000000 -0500
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_btn.c 2006-04-03 00:12:15.000000000 -0400
@@ -0,0 +1,229 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
@@ -1588,10 +1588,10 @@
+ /* FIXME: Handle the non-mouse case. */
+ }
+}
-Index: xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_key.c
+Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_key.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_key.c 2006-01-26 11:53:01.000000000 -0500
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_key.c 2006-04-03 00:12:15.000000000 -0400
@@ -0,0 +1,433 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
@@ -2026,10 +2026,10 @@
+
+ xf86PostKeyboardEvent(pInfo->dev, keycode, ev->value);
+}
-Index: xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_rel.c
+Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_rel.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_rel.c 2006-01-31 14:57:39.000000000 -0500
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_rel.c 2006-04-03 00:12:15.000000000 -0400
@@ -0,0 +1,268 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
@@ -2299,11 +2299,11 @@
+
+ return Success;
+}
-Index: xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.h
+Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.h 2006-01-26 11:53:01.000000000 -0500
-@@ -0,0 +1,189 @@
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.h 2006-04-03 00:12:43.000000000 -0400
+@@ -0,0 +1,190 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
+ *
@@ -2364,6 +2364,7 @@
+
+#include <linux/input.h>
+#include "xf86Xinput.h"
++#include <unistd.h>
+
+#define BITS_PER_LONG (sizeof(long) * 8)
+#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
Reply to: