X Strike Force XFree86 SVN commit: rev 760 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-11-12 11:36:11 -0500 (Wed, 12 Nov 2003)
New Revision: 760
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
Log:
(cosmetic) Tweak changelog message for kernel-2.6-headers build problem.
(cosmetic) Add explanation of changes to lnx_{io,kbd}.c to header of
000_stolen_from_HEAD.diff.
- debian/changelog
- debian/patches/000_stolen_from_HEAD.diff
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-11-12 08:52:12 UTC (rev 759)
+++ branches/4.3.0/sid/debian/changelog 2003-11-12 16:36:11 UTC (rev 760)
@@ -86,11 +86,11 @@
- debian/control
[DROP THIS ENTRY WHEN 4.2.1-14 MERGED.]
- * Fix building on 2.6.x kernels by adding '#define rate period' where needed
- (thanks, Fabio di Nitto).
+ * Fix building against 2.6.x kernel headers by adding '#define rate period'
+ where needed. [Fabio Massimo Di Nitto, Daniel Stone]
- debian/patches/000_stolen_from_HEAD.diff
- -- Branden Robinson <branden@debian.org> Sat, 12 Nov 2003 02:27:58 -0500
+ -- Branden Robinson <branden@debian.org> Wed, 12 Nov 2003 11:32:37 -0500
xfree86 (4.3.0-0pre1v4) experimental; urgency=low
@@ -2448,7 +2448,7 @@
(Closes: #85365)
+ Sync with Type1 font rasterizer from HEAD:
- Some minor include cleanups. (David Dawes)
- - Avoid redefining abort(), a well known C library function. This can
+ - Avoid redefining abort(), a well known C library function. This can
cause errors when the abort() prototype from stdlib.h is included
later by Xos.h. (Matthieu Herrb)
- A "hammer" approach at ensuring font properties are freed properly.
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-11-12 08:52:12 UTC (rev 759)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-11-12 16:36:11 UTC (rev 760)
@@ -16,6 +16,11 @@
when calling a Xi function that calls XGetExtensionVersion() (Bugzilla
#260, Bastien Nocera, Owen Taylor).
+(xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,
+ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,):
+ Build fix when using Linux kernel 2.6 headers. (Marc La France, via
+ Michel Dänzer)
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
Reply to: