X Strike Force X.Org X11 SVN commit: r1552 - in trunk/debian: . patches/general
Author: dnusinow
Date: 2006-04-02 23:23:15 -0500 (Sun, 02 Apr 2006)
New Revision: 1552
Modified:
trunk/debian/changelog
trunk/debian/patches/general/033_evdev_rewrite.diff
Log:
* Have evdev.h include errno.h to prevent FTBFS on mipsen. Thanks Ryan
Murray. (closes: #360540)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-04-03 04:16:31 UTC (rev 1551)
+++ trunk/debian/changelog 2006-04-03 04:23:15 UTC (rev 1552)
@@ -1,9 +1,9 @@
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)
+ * Have evdev.h include unistd.h and errno.h to prevent FTBFS on mipsen.
+ Thanks Ryan Murray. (closes: #360540)
- -- David Nusinow <dnusinow@debian.org> Mon, 3 Apr 2006 00:15:44 -0400
+ -- David Nusinow <dnusinow@debian.org> Mon, 3 Apr 2006 00:22:34 -0400
xorg-x11 (6.9.0.dfsg.1-5) unstable; urgency=high
Modified: trunk/debian/patches/general/033_evdev_rewrite.diff
===================================================================
--- trunk/debian/patches/general/033_evdev_rewrite.diff 2006-04-03 04:16:31 UTC (rev 1551)
+++ trunk/debian/patches/general/033_evdev_rewrite.diff 2006-04-03 04:23:15 UTC (rev 1552)
@@ -1,7 +1,7 @@
Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile
===================================================================
---- 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
+--- trunk.orig/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 2006-04-03 00:15:25.000000000 -0400
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 2006-04-03 00:20:08.000000000 -0400
@@ -1,14 +1,16 @@
#define IHaveModules
#include <Server.tmpl>
@@ -34,8 +34,8 @@
InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input)
Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c
===================================================================
---- 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
+--- trunk.orig/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c 2006-04-03 00:15:25.000000000 -0400
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c 2006-04-03 00:20:08.000000000 -0400
@@ -1,4 +1,34 @@
/*
+ * Copyright © 2006 Zephaniah E. Hull
@@ -912,7 +912,7 @@
Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.man
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.man 2006-04-03 00:12:15.000000000 -0400
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.man 2006-04-03 00:20:08.000000000 -0400
@@ -0,0 +1,151 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
@@ -1068,7 +1068,7 @@
Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_brain.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_brain.c 2006-04-03 00:12:15.000000000 -0400
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_brain.c 2006-04-03 00:20:08.000000000 -0400
@@ -0,0 +1,284 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
@@ -1357,7 +1357,7 @@
Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_btn.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_btn.c 2006-04-03 00:12:15.000000000 -0400
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_btn.c 2006-04-03 00:20:08.000000000 -0400
@@ -0,0 +1,229 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
@@ -1591,7 +1591,7 @@
Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_key.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_key.c 2006-04-03 00:12:15.000000000 -0400
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_key.c 2006-04-03 00:20:08.000000000 -0400
@@ -0,0 +1,433 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
@@ -2029,7 +2029,7 @@
Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_rel.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_rel.c 2006-04-03 00:12:15.000000000 -0400
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev_rel.c 2006-04-03 00:20:08.000000000 -0400
@@ -0,0 +1,268 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
@@ -2302,8 +2302,8 @@
Index: trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.h 2006-04-03 00:12:43.000000000 -0400
-@@ -0,0 +1,190 @@
++++ trunk/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.h 2006-04-03 00:21:20.000000000 -0400
+@@ -0,0 +1,191 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
+ *
@@ -2365,6 +2365,7 @@
+#include <linux/input.h>
+#include "xf86Xinput.h"
+#include <unistd.h>
++#include <errno.h>
+
+#define BITS_PER_LONG (sizeof(long) * 8)
+#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
Reply to: