X Strike Force SVN commit: rev 552 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2003-09-18 12:53:20 -0500 (Thu, 18 Sep 2003)
New Revision: 552
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
branches/4.3.0/sid/debian/patches/303_arm_cache_flush.diff
branches/4.3.0/sid/debian/patches/452_ia64_smart_pci_rom_probe.diff
branches/4.3.0/sid/debian/patches/900_debian_config.diff
Log:
Fix offsets in several patches for pristine building.
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-09-18 17:06:46 UTC (rev 551)
+++ branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-09-18 17:53:20 UTC (rev 552)
@@ -2,9 +2,10 @@
Various Debian changes to xfree86.cf and linux.cf, including better
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.
+Originally by Branden Robinson. Forward-ported with a few updates by
+Daniel Stone.
+
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.
@@ -51,8 +52,8 @@
# endif
#endif
---- 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
+--- xc/config/cf/linux.cf~ 2003-09-18 12:47:09.000000000 -0500
++++ xc/config/cf/linux.cf 2003-09-18 12:47:13.000000000 -0500
@@ -87,17 +87,23 @@
XCOMM binutils: (LinuxBinUtilsMajorVersion)
@@ -143,7 +144,7 @@
# define HasXdmAuth YES
# define HasLatex YES
/* at present, glide2 only works on i386 */
-@@ -701,7 +752,7 @@
+@@ -694,7 +745,7 @@
#if UseElfFormat
# ifndef DoLoadableServer
@@ -152,7 +153,7 @@
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
-@@ -746,7 +797,7 @@
+@@ -739,7 +790,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -161,7 +162,7 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -759,7 +810,7 @@
+@@ -752,7 +803,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -170,7 +171,7 @@
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -767,7 +818,7 @@
+@@ -760,7 +811,7 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -179,7 +180,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -775,7 +826,7 @@
+@@ -768,7 +819,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -188,7 +189,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -784,7 +835,7 @@
+@@ -777,7 +828,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -197,7 +198,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -793,7 +844,7 @@
+@@ -786,7 +837,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -206,7 +207,7 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -802,7 +853,7 @@
+@@ -795,7 +846,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
@@ -215,7 +216,7 @@
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -812,7 +863,7 @@
+@@ -805,7 +856,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -224,7 +225,7 @@
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -821,7 +872,7 @@
+@@ -814,7 +865,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -233,7 +234,7 @@
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -829,16 +880,17 @@
+@@ -822,16 +873,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -257,7 +258,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -869,7 +921,7 @@
+@@ -862,7 +914,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 2003-09-18 17:06:46 UTC (rev 551)
+++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-09-18 17:53:20 UTC (rev 552)
@@ -1,8 +1,9 @@
$Id$
This patch is a complete overhaul of how Imake deals with X's manpages.
-Forward-port from 4.2.1. Originally by Branden Robinson.
+Originally by Branden Robinson. Forward-ported from 4.2.1 by Daniel Stone.
+
--- xc/config/cf/Imake.tmpl.orig Mon Jan 13 16:43:40 2003
+++ xc/config/cf/Imake.tmpl Mon Jan 13 17:22:07 2003
@@ -856,34 +856,79 @@
@@ -297,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~ 2003-06-14 04:54:12.000000000 -0500
-+++ xc/config/cf/linux.cf 2003-06-14 04:54:21.000000000 -0500
+--- xc/config/cf/linux.cf~ 2003-09-18 12:34:14.000000000 -0500
++++ xc/config/cf/linux.cf 2003-09-18 12:34:21.000000000 -0500
@@ -155,6 +155,7 @@
# define BuildHtmlManPages NO
# define StaticNeedsPicForShared NO /* we handle provide static libraries with PIC symbols using a different method */
@@ -307,7 +308,7 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -971,26 +972,6 @@
+@@ -964,26 +965,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Modified: branches/4.3.0/sid/debian/patches/303_arm_cache_flush.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/303_arm_cache_flush.diff 2003-09-18 17:06:46 UTC (rev 551)
+++ branches/4.3.0/sid/debian/patches/303_arm_cache_flush.diff 2003-09-18 17:53:20 UTC (rev 552)
@@ -3,9 +3,9 @@
This patch re-enables cache flushing on ARM. Which joker turned this
off?
---- xc/programs/Xserver/hw/xfree86/loader/elfloader.c 2003-01-24 17:26:35.000000000 +0000
-+++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c 2003-06-25 13:36:14.000000000 +0000
-@@ -2254,9 +2254,7 @@
+--- xc/programs/Xserver/hw/xfree86/loader/elfloader.c~ 2003-09-18 12:13:12.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c 2003-09-18 12:13:19.000000000 -0500
+@@ -2424,9 +2424,7 @@
val = symval - (unsigned long)dest32 + val;
val >>= 2;
*dest32 = (*dest32 & 0xff000000) | (val & 0x00ffffff);
Modified: branches/4.3.0/sid/debian/patches/452_ia64_smart_pci_rom_probe.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/452_ia64_smart_pci_rom_probe.diff 2003-09-18 17:06:46 UTC (rev 551)
+++ branches/4.3.0/sid/debian/patches/452_ia64_smart_pci_rom_probe.diff 2003-09-18 17:53:20 UTC (rev 552)
@@ -9,9 +9,9 @@
It works around an ATI expansion ROM problem that is fatal on HP McKinley
prototype systems.
---- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c~ 2002-08-29 00:53:05.000000000 +0900
-+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c 2002-08-29 00:54:21.000000000 +0900
-@@ -1138,14 +1138,30 @@
+--- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c~ 2003-09-18 12:14:27.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c 2003-09-18 12:14:37.000000000 -0500
+@@ -1146,14 +1146,30 @@
for (i = ROM_BASE_PRESET; i <= ROM_BASE_FIND; i++) {
memType savebase = 0, newbase, romaddr;
Modified: branches/4.3.0/sid/debian/patches/900_debian_config.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/900_debian_config.diff 2003-09-18 17:06:46 UTC (rev 551)
+++ branches/4.3.0/sid/debian/patches/900_debian_config.diff 2003-09-18 17:53:20 UTC (rev 552)
@@ -1,8 +1,8 @@
$Id$
---- xc/config/cf/linux.cf.orig Fri Nov 22 17:12:38 2002
-+++ xc/config/cf/linux.cf Fri Nov 22 17:13:43 2002
-@@ -127,13 +127,7 @@
+--- xc/config/cf/linux.cf~ 2003-09-18 12:11:37.000000000 -0500
++++ xc/config/cf/linux.cf 2003-09-18 12:11:43.000000000 -0500
+@@ -130,13 +130,7 @@
# define NormalLibGlu YES
# define FSUseSyslog YES
Reply to: