X Strike Force SVN commit: rev 201 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2003-06-14 04:59:42 -0500 (Sat, 14 Jun 2003)
New Revision: 201
Modified:
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:
debian/patches/003_linux.cf_and_xfree86.cf.diff: cosmetic cleanups
debian/patches/004_imake_manpage_handling_overhaul.diff: update offsets
relative to changes in patch 003
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-14 08:37:00 UTC (rev 200)
+++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-14 09:59:42 UTC (rev 201)
@@ -295,17 +295,17 @@
#ifndef StaticLibrary
#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
---- xc/config/cf/linux.cf.orig Mon Jan 13 17:22:59 2003
-+++ xc/config/cf/linux.cf Mon Jan 13 17:23:31 2003
+--- xc/config/cf/linux.cf~ 2003-06-14 04:54:12.000000000 -0500
++++ xc/config/cf/linux.cf 2003-06-14 04:54:21.000000000 -0500
@@ -155,6 +155,7 @@
# define BuildHtmlManPages NO
- # define StaticNeedsPicForShared NO /* We provides PIC static libraries by other way */
+ # define StaticNeedsPicForShared NO /* we handle provide static libraries with PIC symbols using a different method */
# define KernelVersionInBanner YES
+# define ProjectManSuffix x
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -968,26 +969,6 @@
+@@ -971,26 +972,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-14 08:37:00 UTC (rev 200)
+++ branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-14 09:59:42 UTC (rev 201)
@@ -1,11 +1,11 @@
Various Debian changes to xfree86.cf and linux.cf, including better
-support for gcc flags. Forward-ported with some updates from 4.2.1.
+support for gcc flags. Forward-ported with some updates from 4.2.1.
This patch originally by Branden Robinson, forward-ported with a few
updates by Daniel Stone.
-Disable FontLibSharedFreeType is added by ISHIKAWA Mutsumi, this
-change should drop when we can build the loader server liked
-against external FreeType2 library.
+FontLibSharedFreeType disabled by ISHIKAWA Mutsumi; this change should be
+dropped when we can build the module-loading XFree86 X server liked against
+an external FreeType2 library.
Build with external Xrender, Xft and Xcursor by ISHIKAWA Mutsumi.
@@ -20,7 +20,7 @@
+# define DefaultGcc2OptimizeOpt -O2
+# endif
+#endif
-+
++
#if HasGcc2 && defined(i386Architecture)
# ifndef DefaultGcc2i386Opt
-# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs
@@ -77,11 +77,11 @@
# define XF86SetupUsesStaticTcl NO
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-@@ -146,14 +152,56 @@
+@@ -146,14 +152,59 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
# define BuildRman NO
# define BuildHtmlManPages NO
-+# define StaticNeedsPicForShared NO /* We provides PIC static libraries by other way */
++# define StaticNeedsPicForShared NO /* we handle provide static libraries with PIC symbols using a different method */
+# define KernelVersionInBanner YES
+/* The TT/Meltho fonts are all under non-free licenses. */
+# define BuildTrueTypeFonts NO
@@ -124,13 +124,16 @@
-# endif
+
+/*
-+ We need to build both XFree86 server (loader server) and XFree86-dbg
-+ server (static server for debug) with same FreeType2 code.
-+ Currently Lodaer Server can not build with external Shared FreeType2
-+ library. So we will not use external FreeType2 library to build
-+ Xserver's Font Library. In the furture, Loader Server becomes to be able
-+ to build with external FreeType2 Shared library, we will drop the
-+ define bellow:
++ We want to be sure that the normal XFree86 X server and the debugging X
++ server use the same FreeType2 library. We'd *like* it if we could achieve
++ this by both packages dynamically linking against the system's FreeType2
++ library; however, the normal X server package (xserver-xfree86) *cannot* be
++ built dynamically linked against the FreeType2 library when the module
++ loader is enabled because of code/design issues. Therefore, we encapsulate
++ XFree86's internal "fork" of the FreeType2 library into *both*
++ xserver-xfree86 and xserver-xfree86-dbg. When it becomes possible to build
++ the module-loading server against an external FreeType2 shared library, we
++ can drop this define:
+*/
+# define FontLibSharedFreeType NO
+
@@ -138,7 +141,7 @@
# define HasXdmAuth YES
# define HasLatex YES
/* at present, glide2 only works on i386 */
-@@ -701,7 +749,7 @@
+@@ -701,7 +752,7 @@
#if UseElfFormat
# ifndef DoLoadableServer
@@ -147,7 +150,7 @@
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
-@@ -746,7 +794,7 @@
+@@ -746,7 +797,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -156,16 +159,16 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -759,7 +807,7 @@
+@@ -759,7 +810,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O3
-+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -767,7 +815,7 @@
+@@ -767,7 +818,7 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -174,7 +177,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -775,7 +823,7 @@
+@@ -775,7 +826,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -183,7 +186,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -784,7 +832,7 @@
+@@ -784,7 +835,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -192,7 +195,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -793,7 +841,7 @@
+@@ -793,7 +844,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -201,7 +204,7 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -802,7 +850,7 @@
+@@ -802,7 +853,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
@@ -210,7 +213,7 @@
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -812,7 +860,7 @@
+@@ -812,7 +863,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -219,7 +222,7 @@
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -821,7 +869,7 @@
+@@ -821,7 +872,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -228,7 +231,7 @@
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -829,16 +877,17 @@
+@@ -829,16 +880,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -252,12 +255,12 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -869,7 +918,7 @@
+@@ -869,7 +921,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs
-+# define OptimizedCDebugFlags DefaultGcc2OptimizeOpt DefaultGcc2DebugOpt SuperHArchOptFlags SuperHEndianFlags
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt SuperHArchOptFlags SuperHEndianFlags
# endif
# define LinuxMachineDefines -D__sh__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
Reply to: