X Strike Force X.Org X11 SVN commit: r220 - in trunk/debian: . patches
Author: branden
Date: 2005-06-15 00:50:28 -0500 (Wed, 15 Jun 2005)
New Revision: 220
Added:
trunk/debian/patches/099za_fix_XOrgManDefs.diff
Removed:
trunk/debian/patches/060_fix_XOrgManDefs.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
trunk/debian/patches/060_external_XrenderXftXcursor_lib.diff
trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
trunk/debian/patches/600_amd64_support.diff
Log:
Fix build failure: Update patch #003 to turn off "building" of RENDER
protocol extension headers on Debian systems. Update patch #060 to not
attempt to install the headers if they're not being "built". Resync
patches #004, #099c, and #600.
Update patch annotations.
Give Fabio's "fix XOrgManDefs" patch a unique identifier, 099za, since 060
is already in use. (There are "lower" available identifiers, but this avoids
overlap with Debian xfree86 SVN trunk patch identifiers, and the patch
audit isn't complete yet, so we don't know what numbers will be freed up.
Or maybe we can switch to quilt soon and this numbering silliness can
stop.)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-15 05:43:27 UTC (rev 219)
+++ trunk/debian/changelog 2005-06-15 05:50:28 UTC (rev 220)
@@ -171,8 +171,13 @@
* Document DFSG-non-freeness of PolyglotMan ("rman") in debian/copyright.
- -- Branden Robinson <branden@debian.org> Tue, 14 Jun 2005 17:06:33 -0500
+ * Update patch #003 to turn off "building" of RENDER protocol extension
+ headers on Debian systems. Update patch #060 to not attempt to install
+ the headers if they're not being "built". Resync patches #004, #099c,
+ and #600.
+ -- Branden Robinson <branden@debian.org> Wed, 15 Jun 2005 00:43:52 -0500
+
xfree86 (4.3.0.dfsg.1-14) unstable; urgency=high
Urgency set to high due to fix for security flaw (see below).
Modified: trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
===================================================================
--- trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2005-06-15 05:43:27 UTC (rev 219)
+++ trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2005-06-15 05:50:28 UTC (rev 220)
@@ -1,7 +1,7 @@
$Id$
-Various Debian changes to xfree86.cf and linux.cf, including better
-support for GCC flags, including tweakability of optimization level.
+Various Debian changes to xfree86.cf, xorg.cf, and linux.cf, including
+better support for GCC flags, including tweakability of optimization level.
Support building with fonts and specs docs turned off (for
architecture-specific-only package builds).
@@ -9,7 +9,7 @@
This patch mostly by Branden Robinson.
FontLibSharedFreeType disabled by ISHIKAWA Mutsumi; this change should be
-dropped when we can build the module-loading XFree86 X server linked
+dropped when we can build the module-loading Xorg X server linked
against an external FreeType2 library.
External Xrender, Xft and Xcursor support by ISHIKAWA Mutsumi.
@@ -22,9 +22,8 @@
as they had no place in the upstream tree, per the policy of not placing
debian/ and the like in upstream trees. Due to be maintained externally.
-diff -urN xc/config/cf~/linux.cf xc/config/cf/linux.cf
---- xc/config/cf~/linux.cf 2005-06-13 19:41:23.384951000 -0500
-+++ xc/config/cf/linux.cf 2005-06-13 19:42:04.195129471 -0500
+--- xc/config/cf/linux.cf~ 2005-06-14 17:50:47.907861000 -0500
++++ xc/config/cf/linux.cf 2005-06-14 17:51:22.662659864 -0500
@@ -101,12 +101,22 @@
#endif
@@ -64,7 +63,7 @@
# define FSUseSyslog YES
# define DriverManSuffix 4x
-@@ -142,53 +150,120 @@
+@@ -142,53 +150,121 @@
*/
# ifdef DebianMaintainer
@@ -164,6 +163,7 @@
+# define BuildFontconfigLibrary NO
+# define HasFontconfig YES
+# define UseFontconfig YES
++# define BuildRender NO
+# define BuildRenderLibrary NO
+# define HasRenderLibrary YES
+# define BuildXcursorLibrary NO
@@ -217,7 +217,7 @@
# endif /* DebianMaintainer */
#endif /* LinuxDebian */
-@@ -675,10 +750,10 @@
+@@ -675,10 +751,10 @@
# if UseElfFormat
# ifdef AlphaArchitecture
# define CcCmd gcc -b alpha-linux
@@ -229,7 +229,7 @@
# endif /* AlphaArchitecture */
# ifdef HPArchitecture
# define CcCmd gcc
-@@ -690,10 +765,10 @@
+@@ -690,10 +766,10 @@
# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
@@ -241,7 +241,7 @@
# endif /* i386Architecture */
# ifdef ia64Architecture
# define CcCmd gcc
-@@ -704,10 +779,10 @@
+@@ -704,10 +780,10 @@
# endif /* ia64Architecture */
# ifdef Mc68020Architecture
# define CcCmd gcc -b m68k-linux
@@ -253,7 +253,7 @@
# endif /* Mc68020Architecture */
# ifdef AMD64Architecture
# define CcCmd gcc
-@@ -720,13 +795,14 @@
+@@ -720,13 +796,14 @@
# define CcCmd gcc
# define AsCmd CcCmd -c -x assembler
# define LdCmd CcCmd -nostdlib
@@ -270,7 +270,7 @@
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
-@@ -793,7 +869,7 @@
+@@ -793,7 +870,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -279,7 +279,7 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -806,7 +882,7 @@
+@@ -806,7 +883,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -288,7 +288,7 @@
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -814,7 +890,9 @@
+@@ -814,7 +891,9 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -299,7 +299,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -822,7 +900,7 @@
+@@ -822,7 +901,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -308,7 +308,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -831,7 +909,7 @@
+@@ -831,7 +910,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -317,7 +317,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -840,7 +918,7 @@
+@@ -840,7 +919,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -326,7 +326,7 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -849,7 +927,7 @@
+@@ -849,7 +928,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
@@ -335,7 +335,7 @@
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -859,7 +937,7 @@
+@@ -859,7 +938,7 @@
#ifdef Ppc64Architecture
# define DefaultCCOptions -fsigned-char -mminimal-toc
# ifndef OptimizedCDebugFlags
@@ -344,7 +344,7 @@
# endif
# define LinuxMachineDefines -D__powerpc64__ -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -869,7 +947,7 @@
+@@ -869,7 +948,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -353,7 +353,7 @@
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -878,7 +956,7 @@
+@@ -878,7 +957,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -362,7 +362,7 @@
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -886,16 +964,17 @@
+@@ -886,16 +965,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -384,7 +384,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -926,7 +1005,7 @@
+@@ -926,7 +1006,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
@@ -393,7 +393,7 @@
# endif
# define LinuxMachineDefines -D__sh__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -938,7 +1017,7 @@
+@@ -938,7 +1018,7 @@
#ifdef AMD64Architecture
# ifndef OptimizedCDebugFlags
Modified: trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
===================================================================
--- trunk/debian/patches/004_imake_manpage_handling_overhaul.diff 2005-06-15 05:43:27 UTC (rev 219)
+++ trunk/debian/patches/004_imake_manpage_handling_overhaul.diff 2005-06-15 05:50:28 UTC (rev 220)
@@ -1,4 +1,4 @@
-$Id: 004_imake_manpage_handling_overhaul.diff 55 2004-10-19 12:38:54Z fabbione $
+$Id$
This patch is a complete overhaul of how Imake deals with X's manpages.
@@ -6,6 +6,8 @@
Forward-ported from 4.2.1 to 4.3.0 by Daniel Stone.
Forward-ported from 4.3.0 to 6.8.1 by Fabio M. Di Nitto.
+Not submitted upstream.
+
diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
--- xc.orig/config/cf/Imake.tmpl 2005-02-02 00:17:15.186147368 +1100
+++ xc/config/cf/Imake.tmpl 2005-02-02 00:20:07.980878576 +1100
@@ -261,7 +263,7 @@
/*
*
*
-@@ -1054,26 +1056,6 @@
+@@ -1055,26 +1057,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Modified: trunk/debian/patches/060_external_XrenderXftXcursor_lib.diff
===================================================================
--- trunk/debian/patches/060_external_XrenderXftXcursor_lib.diff 2005-06-15 05:43:27 UTC (rev 219)
+++ trunk/debian/patches/060_external_XrenderXftXcursor_lib.diff 2005-06-15 05:50:28 UTC (rev 220)
@@ -1,17 +1,29 @@
$Id$
-patch to be able to use external Xrender/Xft/Xcursor libraries
+This patch enables the use of external Xcursor, Xft, and Xrender libraries.
- * namespace conflicts in xc/lib/Imakefile fix
- * namespace conflicts in xc/lib/Xft1/Imakefile fix
- * check Has{Render,Xft,Xcursor}Library to use them
- * some INCLUDES added to be able to refer external
- Xrender,Xft,Xcursor libraries' header
-
- This patch contains xc/lib/*/Imakefile parts
+* Only install renderproto.h as part of the SDK if we're building the
+ extension.
+* Resolve namespace conflicts in xc/lib/Imakefile.
+* Resolve namespace conflicts in xc/lib/Xft1/Imakefile.
+* Update Imakefiles to support external Xrender headers.
-ISHIKAWA Mutsumi <ishikawa@debian.org>
+This patch by ISHIKAWA Mutsumi and Branden Robinson.
+Not submitted upstram.
+
+--- xc/include/extensions/Imakefile~ 2005-06-14 17:47:53.185848707 -0500
++++ xc/include/extensions/Imakefile 2005-06-14 17:48:57.272320612 -0500
+@@ -118,7 +118,9 @@
+ InstallDriverSDKNonExecFile(xf86misc.h,$(DRIVERSDKINCLUDEDIR)/extensions)
+ InstallDriverSDKNonExecFile(xf86rush.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(xf86rushstr.h,$(DRIVERSDKINCLUDEDIR))
++#if BuildRender
+ InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR))
++#endif
+ InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
+ InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR))
+ InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/extensions)
diff -ruN xc-old/lib/Imakefile xc/lib/Imakefile
--- xc-old/lib/Imakefile 2004-09-02 01:10:28.000000000 +0000
+++ xc/lib/Imakefile 2004-10-26 10:44:00.107145664 +0000
Deleted: trunk/debian/patches/060_fix_XOrgManDefs.diff
===================================================================
--- trunk/debian/patches/060_fix_XOrgManDefs.diff 2005-06-15 05:43:27 UTC (rev 219)
+++ trunk/debian/patches/060_fix_XOrgManDefs.diff 2005-06-15 05:50:28 UTC (rev 220)
@@ -1,22 +0,0 @@
-$Id: 060_fix_XOrgManDefs.diff 55 2004-10-19 12:38:54Z fabbione $
-
-Fix XOrgManDefs to include proper information when building man pages.
-
-This patch by Fabio M. Di Nitto.
-
-diff -ruN xc-old/config/cf/X11.tmpl xc/config/cf/X11.tmpl
---- xc-old/config/cf/X11.tmpl 2004-10-19 14:01:31.339626000 +0200
-+++ xc/config/cf/X11.tmpl 2004-10-19 14:22:53.225749960 +0200
-@@ -65,8 +65,11 @@
- # define XOrgWebSupportAddress http://wiki.X.Org
- #endif
-
-+XORGRELSTRING = XorgVersionString
-+ XORGMANNAME = XOrgManNameString
-+
- #ifndef XOrgManDefs
--#define XOrgManDefs -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"'
-+#define XOrgManDefs -D__xorgversion__="$(XORGRELSTRING) Release"' "$(XORGMANNAME)"'
- #endif
-
- #ifndef XVendorManNameString
Modified: trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2005-06-15 05:43:27 UTC (rev 219)
+++ trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2005-06-15 05:50:28 UTC (rev 220)
@@ -1,4 +1,4 @@
-$Id: 099c_support_loadable_external_Xcursor_lib.diff 1679 2004-07-21 07:52:26Z branden $
+$Id$
Dynamic loading of Xcursor by Xlib wasn't working when an external Xcursor
library was available during the build; Xlib was being told that the name
@@ -13,7 +13,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-27 08:40:39.015486000 +0000
+++ xc/config/cf/linux.cf 2004-10-27 08:41:15.188986920 +0000
-@@ -228,6 +228,8 @@
+@@ -229,6 +229,8 @@
# define HasRenderLibrary YES
# define BuildXcursorLibrary NO
# define HasXcursorLibrary YES
Copied: trunk/debian/patches/099za_fix_XOrgManDefs.diff (from rev 196, trunk/debian/patches/060_fix_XOrgManDefs.diff)
===================================================================
--- trunk/debian/patches/060_fix_XOrgManDefs.diff 2005-06-13 18:00:49 UTC (rev 196)
+++ trunk/debian/patches/099za_fix_XOrgManDefs.diff 2005-06-15 05:50:28 UTC (rev 220)
@@ -0,0 +1,22 @@
+$Id$
+
+Fix XOrgManDefs to include proper information when building man pages.
+
+This patch by Fabio M. Di Nitto.
+
+diff -ruN xc-old/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc-old/config/cf/X11.tmpl 2004-10-19 14:01:31.339626000 +0200
++++ xc/config/cf/X11.tmpl 2004-10-19 14:22:53.225749960 +0200
+@@ -65,8 +65,11 @@
+ # define XOrgWebSupportAddress http://wiki.X.Org
+ #endif
+
++XORGRELSTRING = XorgVersionString
++ XORGMANNAME = XOrgManNameString
++
+ #ifndef XOrgManDefs
+-#define XOrgManDefs -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"'
++#define XOrgManDefs -D__xorgversion__="$(XORGRELSTRING) Release"' "$(XORGMANNAME)"'
+ #endif
+
+ #ifndef XVendorManNameString
Modified: trunk/debian/patches/600_amd64_support.diff
===================================================================
--- trunk/debian/patches/600_amd64_support.diff 2005-06-15 05:43:27 UTC (rev 219)
+++ trunk/debian/patches/600_amd64_support.diff 2005-06-15 05:50:28 UTC (rev 220)
@@ -1,16 +1,17 @@
-$Id: 600_amd64_support.diff 55 2004-10-19 12:38:54Z fabbione $
+$Id$
-AMD64 is not a "bi-width" architecture in Debian at present; instead it is
-a pure 64-bit environment, so do not define "HaveLib64" as "YES".
+AMD64 and PPC64 are not "bi-width" architectures in Debian at present;
+instead, they are pure 64-bit environments, so do not define "HaveLib64" as
+"YES".
This patch by Andreas Jochens and Branden Robinson.
-Not submitted to XFree86.
+Not submitted upstream.
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 14:39:52.737468000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 14:41:57.429512384 +0200
-@@ -631,7 +631,7 @@
+@@ -632,7 +632,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
Reply to: