X Strike Force XFree86 SVN commit: rev 761 - in trunk/debian: . patches
Author: branden
Date: 2003-11-12 11:55:19 -0500 (Wed, 12 Nov 2003)
New Revision: 761
Modified:
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Fix building against 2.6.x kernel headers by adding '#define rate period'
where needed; fixes FTBFS when linux-kernel-headers package installed.
(Closes: #219714)
- debian/patches/000_stolen_from_HEAD.diff
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-11-12 16:36:11 UTC (rev 760)
+++ trunk/debian/changelog 2003-11-12 16:55:19 UTC (rev 761)
@@ -1,5 +1,7 @@
-xfree86 (4.2.1-14) unstable; urgency=low
+xfree86 (4.2.1-14) unstable; urgency=medium
+ * Urgency due to fix for FTBFS triggered by linux-kernel-headers package.
+
* Make libxaw6-dev and libxaw7-dev conflict with and replace libxaw-dev (<<
4.0.3); the latter existed as a real package in pre-woody unstable, and
this permits smooth upgrades from such systems.
@@ -22,8 +24,13 @@
- debian/scripts/vars.powerpc
- debian/scripts/vars.sparc
- -- Branden Robinson <branden@debian.org> Mon, 3 Nov 2003 00:43:29 -0500
+ * Fix building against 2.6.x kernel headers by adding '#define rate period'
+ where needed; fixes FTBFS when linux-kernel-headers package installed.
+ (Closes: #219714)
+ - debian/patches/000_stolen_from_HEAD.diff
+ -- Branden Robinson <branden@debian.org> Wed, 12 Nov 2003 11:41:58 -0500
+
xfree86 (4.2.1-13) unstable; urgency=low
* Acknowledge bug fixed in NMU. Thanks, LaMont! (Closes: #213774)
@@ -2403,7 +2410,7 @@
* debian/xserver-xfree86.templates:
- clarify the circumstances under which advanced users can look for the
XKB directory (Closes: #140228)
- - clarify that the mouse questions don't support more than 5 buttons
+ - clarify that the mouse questions don't support more than 5 buttons
(see #141390)
-- Branden Robinson <branden@debian.org> Tue, 3 Sep 2002 01:04:23 -0500
@@ -2413,7 +2420,7 @@
* patch #000_post_xf-4_2_0:
- include DPMS fix for r128 driver (thanks to Stuart Anderson for pulling
the patch over to xf-4_2-branch)
- * patch #000_stolen_from_HEAD:
+ * patch #000_stolen_from_HEAD:
- Fix SEGV in 3dfx DRI driver. (Alan Hourihane)
- Fix enabling of i810 DRI when XvMC is disabled (#5208, Matthew Sottek,
Intel).
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2003-11-12 16:36:11 UTC (rev 760)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2003-11-12 16:55:19 UTC (rev 761)
@@ -271,6 +271,10 @@
Handle errors from pam_setcred(), reporting them with pam_strerror().
(Matthieu Herrb, Branden Robinson)
+(xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c):
+ Build fix when using Linux kernel 2.6 headers. (Marc La France, via
+ Michel D�er)
+
Index: xc/nls/XI18N_OBJS/Imakefile
===================================================================
RCS file: /cvs/xc/nls/XI18N_OBJS/Imakefile,v
@@ -3749,12 +3753,12 @@
- dirmode |= (devmode & S_IROTH) ? S_IXOTH : 0;
- dirmode |= devmode;
devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
- group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID;
+ group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID;
#endif
if (stat(DRM_DIR_NAME, &st)) {
if (!isroot) return DRM_ERR_NOT_ROOT;
-- remove(DRM_DIR_NAME);
+- remove(DRM_DIR_NAME);
- mkdir(DRM_DIR_NAME, dirmode);
+ mkdir(DRM_DIR_NAME, DRM_DEV_DIRMODE);
+ chown(DRM_DIR_NAME, 0, 0); /* root:root */
@@ -5450,3 +5454,14 @@
}
#endif
if (setuid(verify->uid) < 0)
+diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12 18:00:24.000000000 +1100
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-12 18:01:33.000000000 +1100
+@@ -67,6 +67,7 @@
+ * from util-linux-2.9t package */
+
+ #include <linux/kd.h>
++#include <linux/version.h>
+ #ifdef __sparc__
+ #include <asm/param.h>
+ #include <asm/kbio.h>
Reply to: