X Strike Force SVN commit: rev 177 - in branches/4.3.0/sid/debian: . patches
Author: ishikawa
Date: 2003-06-11 10:29:35 -0500 (Wed, 11 Jun 2003)
New Revision: 177
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
Log:
remove special-case logic in linux.cf that defined "HasLinuxInput"
to "NO" for Mc68020Architecture
(sync with svn trunk/debian revision 176)
#003_linux.cf_and_xfree86.cf.diff:
- remove special-case logic in linux.cf that defined
"HasLinuxInput" to "NO" for Mc68020Architecture; m68k is now
supported by the Linux 2.4.20 kernel (at least in Debian), so we let
this symbol be defined to "YES" just like all the other
architectures. This only really affects the Wacom input driver and
should not cause any regressions.
(thanks to James Troup for pointing out this no-longer-needed conditional)
#004_imake_manpage_handling_overhaul.diff:
- line offset adjust with #003 change
Modified: branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-11 04:43:13 UTC (rev 176)
+++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-11 15:29:35 UTC (rev 177)
@@ -305,7 +305,7 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -971,26 +971,6 @@
+@@ -968,26 +968,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Modified: branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-11 04:43:13 UTC (rev 176)
+++ branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-11 15:29:35 UTC (rev 177)
@@ -49,8 +49,8 @@
# endif
#endif
---- xc/config/cf/linux.cf.orig Fri Jan 3 11:54:53 2003
-+++ xc/config/cf/linux.cf Fri Jan 3 11:56:08 2003
+--- xc/config/cf/linux.cf.orig 2003-06-11 23:55:12.000000000 +0900
++++ xc/config/cf/linux.cf 2003-06-12 00:01:31.000000000 +0900
@@ -87,17 +87,23 @@
XCOMM binutils: (LinuxBinUtilsMajorVersion)
@@ -77,7 +77,7 @@
# define XF86SetupUsesStaticTcl NO
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-@@ -146,10 +152,55 @@
+@@ -146,14 +152,56 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
# define BuildRman NO
# define BuildHtmlManPages NO
@@ -118,6 +118,10 @@
/* we build-depend on libfreetype6-dev (FreeType 2.x) */
# define BuildFreetype2Library NO
# define HasFreetype2 YES
+-/* m68k has no 2.4 kernel yet */
+-# ifndef Mc68020Architecture
+-# define HasLinuxInput YES
+-# endif
+
+/*
+ We need to build both XFree86 server (loader server) and XFree86-dbg
@@ -130,10 +134,11 @@
+*/
+# define FontLibSharedFreeType NO
+
- /* m68k has no 2.4 kernel yet */
- # ifndef Mc68020Architecture
- # define HasLinuxInput YES
-@@ -701,7 +714,7 @@
++# define HasLinuxInput YES
+ # define HasXdmAuth YES
+ # define HasLatex YES
+ /* at present, glide2 only works on i386 */
+@@ -701,7 +749,7 @@
#if UseElfFormat
# ifndef DoLoadableServer
@@ -142,7 +147,7 @@
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
-@@ -746,7 +759,7 @@
+@@ -746,7 +794,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -151,7 +156,7 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -759,7 +772,7 @@
+@@ -759,7 +807,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -160,7 +165,7 @@
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -767,7 +780,7 @@
+@@ -767,7 +815,7 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -169,7 +174,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -775,7 +788,7 @@
+@@ -775,7 +823,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -178,7 +183,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -784,7 +797,7 @@
+@@ -784,7 +832,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -187,7 +192,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -793,7 +806,7 @@
+@@ -793,7 +841,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -196,7 +201,7 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -802,7 +815,7 @@
+@@ -802,7 +850,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
@@ -205,7 +210,7 @@
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -812,7 +825,7 @@
+@@ -812,7 +860,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -214,7 +219,7 @@
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -821,7 +834,7 @@
+@@ -821,7 +869,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -223,7 +228,7 @@
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -829,16 +842,17 @@
+@@ -829,16 +877,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -247,7 +252,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -869,7 +883,7 @@
+@@ -869,7 +918,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
Modified: branches/4.3.0/sid/debian/changelog
==============================================================================
--- branches/4.3.0/sid/debian/changelog 2003-06-11 04:43:13 UTC (rev 176)
+++ branches/4.3.0/sid/debian/changelog 2003-06-11 15:29:35 UTC (rev 177)
@@ -9,13 +9,24 @@
entry for this release may not be possible even if God Himself grabbed my
keyboard away from me.
- * #003_linux.cf_and_xfree86.cf.diff:
- - Always disable `FontLibSharedFreeType' for compatiblity between
- normal XFree86 server and XFree86-dbg server.
- We should drop this change, when we can build the Loader Server
+ * remove special-case logic in linux.cf that defined "HasLinuxInput" to
+ "NO" for Mc68020Architecture;
+ - m68k is now supported by the Linux 2.4.20 kernel (at least in
+ Debian), so we let this symbol be defined to "YES" just like all the
+ other architectures. This only really affects the Wacom input driver
+ and should not cause any regressions.
+ (thanks to James Troup for pointing out this no-longer-needed conditional)
+ - patch #003 update
+ - sync with trunk/debian svn revision 176
+
+ * Always disable `FontLibSharedFreeType' for compatiblity between normal
+ XFree86 server and XFree86-dbg server;
+ - patch #003 update
+ - We should drop this change, when we can build the Loader Server
liked against external FreeType2 [ISHIKAWA Mutsimi]
- * #057_X11.tmpl_warning_fix.diff: Imake warning fix patch [ISHIKAWA Mutsumi]
+ * Imake warning fix patch;
+ - patch #057_X11.tmpl_warning_fix.diff: new; ISHIKAWA Mutsumi]
* Use external Xft, Xrender and Xcursor libraries [ISHIKAWA Mutsumi]
- patch #058, #059, #060: new;
Reply to: