X Strike Force XFree86 SVN commit: r1161 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2004-03-18 10:40:35 -0500 (Thu, 18 Mar 2004)
New Revision: 1161
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
branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
branches/4.3.0/sid/debian/patches/800_gnu_config.diff
branches/4.3.0/sid/debian/patches/820_gnu-freebsd_config.diff
Log:
Merge r1160 from trunk.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-03-17 18:43:31 UTC (rev 1160)
+++ branches/4.3.0/sid/debian/changelog 2004-03-18 15:40:35 UTC (rev 1161)
@@ -1,3 +1,21 @@
+xfree86 (4.3.0-7) unstable; urgency=medium
+
+ * Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
+
+ * Fix default library build defines to not build the (X)Render, Xft, Xft1,
+ or Xcursor libraries if BuildLibraries is not "YES". This prevents
+ gratuitous library builds when, e.g., BuildServersOnly is set to YES.
+ Clarify and improve related patch annotation. Also, fix the Imake
+ configuration for Debian GNU/Linux, the Hurd, and GNU/FreeBSD to not force
+ BuildXft1Library to YES unconditionally. These changes resolve a FTBFS in
+ environments where libext-dev is not installed, since the Xft1 library was
+ getting gratuitously built during the debugging server build, and couldn't
+ find the Xext library to link against. As a minor bonus, this should
+ speed the build up a little, since a library that isn't needed is no
+ longer being built.
+
+ -- Branden Robinson <branden@debian.org> Wed, 17 Mar 2004 13:13:31 -0500
+
xfree86 (4.3.0-6) unstable; urgency=medium
* Urgency due to fix for FTBFS on SPARC.
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 2004-03-17 18:43:31 UTC (rev 1160)
+++ branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2004-03-18 15:40:35 UTC (rev 1161)
@@ -80,7 +80,7 @@
# define XF86SetupUsesStaticTcl NO
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-@@ -152,33 +158,82 @@
+@@ -152,33 +158,81 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
# define BuildRman NO
# define BuildHtmlManPages NO
@@ -113,7 +113,6 @@
+# define IconDir Concat(ProjectRoot,/lib/X11/icons)
+# define BuildXftLibrary NO
+# define HasXftLibrary YES
-+# define BuildXft1Library YES
+
+# ifdef UseInstalled
+# define RenderLibraryDir /usr
@@ -176,7 +175,7 @@
# endif /* i386Architecture */
# endif /* DebianMaintainer */
#endif /* LinuxDebian */
-@@ -649,10 +704,10 @@
+@@ -649,10 +703,10 @@
# if UseElfFormat
# ifdef AlphaArchitecture
# define CcCmd gcc -b alpha-linux
@@ -188,7 +187,7 @@
# endif /* AlphaArchitecture */
# ifdef HPArchitecture
# define CcCmd gcc
-@@ -664,10 +719,10 @@
+@@ -664,10 +718,10 @@
# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
@@ -200,7 +199,7 @@
# endif /* i386Architecture */
# ifdef ia64Architecture
# define CcCmd gcc
-@@ -678,29 +733,30 @@
+@@ -678,29 +732,30 @@
# endif /* ia64Architecture */
# ifdef Mc68020Architecture
# define CcCmd gcc -b m68k-linux
@@ -239,7 +238,7 @@
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
-@@ -745,7 +801,7 @@
+@@ -745,7 +800,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -248,7 +247,7 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -758,7 +814,7 @@
+@@ -758,7 +813,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -257,7 +256,7 @@
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -766,7 +822,9 @@
+@@ -766,7 +821,9 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -268,7 +267,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -774,7 +832,7 @@
+@@ -774,7 +831,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -277,7 +276,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -783,7 +841,7 @@
+@@ -783,7 +840,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -286,7 +285,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -792,7 +850,7 @@
+@@ -792,7 +849,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -295,7 +294,7 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -801,7 +859,7 @@
+@@ -801,7 +858,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
@@ -304,7 +303,7 @@
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -811,7 +869,7 @@
+@@ -811,7 +868,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -313,7 +312,7 @@
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -820,7 +878,7 @@
+@@ -820,7 +877,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -322,7 +321,7 @@
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -828,16 +886,17 @@
+@@ -828,16 +885,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -346,7 +345,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -859,7 +918,7 @@
+@@ -859,7 +917,7 @@
# else
# define SuperHArchOptFlags -m3
# endif
@@ -355,7 +354,7 @@
# ifndef SuperHebArchitecture
# ifdef SuperHebArchitecture
# define SuperHEndianFlags -mb
-@@ -868,7 +927,7 @@
+@@ -868,7 +926,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
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 2004-03-17 18:43:31 UTC (rev 1160)
+++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2004-03-18 15:40:35 UTC (rev 1161)
@@ -298,8 +298,8 @@
#ifndef StaticLibrary
#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
---- xc/config/cf/linux.cf.orig 2004-01-20 00:53:26.000000000 -0500
-+++ xc/config/cf/linux.cf 2004-01-20 00:53:58.000000000 -0500
+--- xc/config/cf/linux.cf~ 2004-03-17 13:06:13.000000000 -0500
++++ xc/config/cf/linux.cf 2004-03-17 13:06:18.000000000 -0500
@@ -164,6 +164,7 @@
*/
# define StaticNeedsPicForShared NO
@@ -308,7 +308,7 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -976,26 +977,6 @@
+@@ -975,26 +976,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Modified: branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff 2004-03-17 18:43:31 UTC (rev 1160)
+++ branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff 2004-03-18 15:40:35 UTC (rev 1161)
@@ -1,19 +1,22 @@
$Id$
-patch to be able to use external Xrender/Xft/Xcursor libraries
+This patch enables the usage of external Xrender, Xft, and Xcursor libraries.
- * add Has{Render,Xft,Xcursor}Library defines
- * Some defines related {Render,Xft,Xcursor}Library are changed
- to be able to use external Xrender,Xft,Xcursor libraries
- (likes freetype2, expat, libz etc...)
+ * Add Has{Render,Xft,Xcursor}Library defines.
+ * Render, Xft, and Xcursor library defines are changed to be able to use
+ external libraries, consistent with the existing logic for the
+ FreeType2, Expat, and Z compression libraries.
- This patch contains X11.tmpl part only (some xc/lib/*/Imakefile
-and xc/programs/*/Imakefile should adapt this change)
-
ISHIKAWA Mutsumi <ishikawa@debian.org>
+Updated by Branden Robinson to not build libraries if BuildLibraries is not
+set. This prevents gratuitous library builds when, e.g., BuildServersOnly is
+set to YES.
+
+Not submitted upstream to XFree86.
+
--- xc/config/cf/X11.tmpl~ 2003-10-11 01:02:15.000000000 -0500
-+++ xc/config/cf/X11.tmpl 2003-10-11 01:02:24.000000000 -0500
++++ xc/config/cf/X11.tmpl 2004-03-17 12:42:38.000000000 -0500
@@ -567,23 +567,29 @@
#ifndef BuildRender
#define BuildRender YES
@@ -23,18 +26,18 @@
+#endif
#ifndef BuildRenderLibrary
-#define BuildRenderLibrary !BuildServersOnly
-+#define BuildRenderLibrary (!BuildServersOnly && !HasRenderLibrary)
++#define BuildRenderLibrary (!HasRenderLibrary && BuildLibraries)
+#endif
+#ifndef HasXftLibrary
+#define HasXftLibrary NO
#endif
#ifndef BuildXftLibrary
-#define BuildXftLibrary BuildRenderLibrary
-+#define BuildXftLibrary ((BuildRenderLibrary || HasRenderLibrary) && !HasXftLibrary)
++#define BuildXftLibrary ((BuildRenderLibrary || HasRenderLibrary) && !HasXftLibrary && BuildLibraries)
#endif
#ifndef BuildXft1Library
-#define BuildXft1Library BuildRenderLibrary
-+#define BuildXft1Library (BuildRenderLibrary || HasRenderLibrary)
++#define BuildXft1Library ((BuildRenderLibrary || HasRenderLibrary) && BuildLibraries)
#endif
#ifndef UseFontconfig
-#define UseFontconfig BuildXftLibrary
@@ -58,7 +61,7 @@
+#endif
#ifndef BuildXcursorLibrary
-#define BuildXcursorLibrary BuildRenderLibrary
-+#define BuildXcursorLibrary ((BuildRenderLibrary || HasRenderLibrary) && !HasXcursorLibrary)
++#define BuildXcursorLibrary ((BuildRenderLibrary || HasRenderLibrary) && !HasXcursorLibrary && BuildLibraries)
#endif
#ifndef BuildXcursorgen
Modified: branches/4.3.0/sid/debian/patches/800_gnu_config.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/800_gnu_config.diff 2004-03-17 18:43:31 UTC (rev 1160)
+++ branches/4.3.0/sid/debian/patches/800_gnu_config.diff 2004-03-18 15:40:35 UTC (rev 1161)
@@ -10,7 +10,7 @@
--- xc/config/cf/gnu.cf.orig Fri Aug 24 04:16:54 2001
+++ xc/config/cf/gnu.cf Sun Apr 13 11:19:47 2003
-@@ -18,6 +18,76 @@
+@@ -18,6 +18,75 @@
#endif
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
@@ -50,7 +50,6 @@
+#define UseFontconfig YES
+#define FontconfigIncDir /usr/include/fontconfig
+#define BuildXftLibrary NO
-+#define BuildXft1Library YES
+#define XAppLoadDir EtcX11Directory/app-defaults
+#define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
+/* the relative symlink created by this rule causes problems for us */
Modified: branches/4.3.0/sid/debian/patches/820_gnu-freebsd_config.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/820_gnu-freebsd_config.diff 2004-03-17 18:43:31 UTC (rev 1160)
+++ branches/4.3.0/sid/debian/patches/820_gnu-freebsd_config.diff 2004-03-18 15:40:35 UTC (rev 1161)
@@ -1,6 +1,5 @@
$Id$
-
adds GNU/FreeBSD build defines to xc/config/cf. they're basicaly
copied and adapted from the defines for GNU OS.
@@ -249,7 +248,7 @@
diff -Nur xc/config/cf.old/gnu-freebsd.cf xc/config/cf/gnu-freebsd.cf
--- xc/config/cf.old/gnu-freebsd.cf 1970-01-01 01:00:00.000000000 +0100
+++ xc/config/cf/gnu-freebsd.cf 2003-05-31 15:01:56.000000000 +0200
-@@ -0,0 +1,236 @@
+@@ -0,0 +1,235 @@
+XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.11 2001/02/28 18:58:49 dawes Exp $
+
+#ifndef OSName
@@ -306,7 +305,6 @@
+#define UseFontconfig YES
+#define FontconfigIncDir /usr/include/fontconfig
+#define BuildXftLibrary NO
-+#define BuildXft1Library YES
+#define XAppLoadDir EtcX11Directory/app-defaults
+#define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
+/* the relative symlink created by this rule causes problems for us */
Reply to: