X Strike Force XFree86 SVN commit: rev 836 - people/wt/4.4.0/patches-needing-update
Author: wt
Date: 2003-12-10 06:19:38 -0500 (Wed, 10 Dec 2003)
New Revision: 836
Removed:
people/wt/4.4.0/patches-needing-update/908_debian_exclude_non-free_fonts_and_docs.diff
people/wt/4.4.0/patches-needing-update/909_debian_piclib_support.diff
Modified:
people/wt/4.4.0/patches-needing-update/001_kernel_version_in_banner.diff
Log:
* getting rid of 908 & 909 that are already in patches
* updating 001
Modified: people/wt/4.4.0/patches-needing-update/001_kernel_version_in_banner.diff
===================================================================
--- people/wt/4.4.0/patches-needing-update/001_kernel_version_in_banner.diff 2003-12-10 07:37:38 UTC (rev 835)
+++ people/wt/4.4.0/patches-needing-update/001_kernel_version_in_banner.diff 2003-12-10 11:19:38 UTC (rev 836)
@@ -6,7 +6,7 @@
--- xc/programs/Xserver/hw/xfree86/common/Imakefile.orig Fri Jan 10 19:19:19 2003
+++ xc/programs/Xserver/hw/xfree86/common/Imakefile Fri Jan 10 19:21:34 2003
-@@ -183,6 +183,9 @@
+@@ -188,6 +188,9 @@
CUSTOMVERSION = XFree86CustomVersion
CUSTOMVERDEF = -DXF86_CUSTOM_VERSION='$(CUSTOMVERSION)'
#endif
@@ -16,7 +16,7 @@
#if defined(BuilderString)
BUILDERSTRING = BuilderString
BUILDERMSG = -DBUILDERSTRING='$(BUILDERSTRING)'
-@@ -208,7 +211,7 @@
+@@ -211,7 +214,7 @@
AllTarget($(OFILES))
SpecialCObjectRule(xf86Bus,NullParameter,$(BUGMSG) $(VGAINCLUDES))
@@ -24,10 +24,10 @@
+SpecialCObjectRule(xf86Init,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(BUGMSG) $(CUSTOMVERDEF) $(XORGREL_DEF) $(EXT_DEFINES) $(BETADEFS) $(MDEBUGDEFS) $(KERNELVER))
SpecialCObjectRule(xf86Events,$(ICONFIGFILES),$(EXT_DEFINES) $(MDEBUGDEFS))
SpecialCObjectRule(xf86Globals,$(ICONFIGFILES),$(EXT_DEFINES) $(MODPATHDEFINES) $(LOGDEFINES))
- SpecialCObjectRule(xf86Config,$(ICONFIGFILES),$(XCONFIGDEFINES))
+ SpecialCObjectRule(xf86AutoConfig,$(ICONFIGFILES),$(XCONFIGDEFINES))
--- xc/programs/Xserver/hw/xfree86/common/xf86Init.c.orig Fri Jan 10 19:10:13 2003
+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c Fri Jan 10 19:21:09 2003
-@@ -66,6 +66,9 @@
+@@ -99,6 +99,9 @@
static void xf86PrintBanner(void);
static void xf86PrintMarkers(void);
static void xf86RunVtInit(void);
@@ -37,7 +37,7 @@
#ifdef DO_CHECK_BETA
static int extraDays = 0;
-@@ -116,6 +119,40 @@
+@@ -149,6 +152,40 @@
0
};
@@ -78,7 +78,7 @@
static Bool
xf86CreateRootWindow(WindowPtr pWin)
{
-@@ -1681,6 +1718,9 @@
+@@ -1773,6 +1810,9 @@
#ifdef XFree86LOADER
ErrorF("Module Loader present\n");
#endif
Deleted: people/wt/4.4.0/patches-needing-update/908_debian_exclude_non-free_fonts_and_docs.diff
===================================================================
--- people/wt/4.4.0/patches-needing-update/908_debian_exclude_non-free_fonts_and_docs.diff 2003-12-10 07:37:38 UTC (rev 835)
+++ people/wt/4.4.0/patches-needing-update/908_debian_exclude_non-free_fonts_and_docs.diff 2003-12-10 11:19:38 UTC (rev 836)
@@ -1,142 +0,0 @@
-$Id$
-
-Eliminate the building of non-capital-F-Free fonts and docs;
-debian/prune-non-free.sh also assists by excising these same fonts and docs
-from the tree, so you can generate your .orig.tar.gz's in peace. This
-patch originally by Branden Robinson, subsequently forward-ported and updated
-by Warren Turkal and Daniel Stone.
-
---- xc/fonts/scaled/Type1/Imakefile.orig Fri Jan 10 18:55:55 2003
-+++ xc/fonts/scaled/Type1/Imakefile Fri Jan 10 18:57:00 2003
-@@ -8,25 +8,14 @@
-
- #define PassCDebugFlags /* as nothing */
-
--FONTS = UTRG____.pfa UTB_____.pfa UTBI____.pfa UTI_____.pfa \
-- cour.pfa courb.pfa courbi.pfa couri.pfa \
-- c0648bt_.pfb c0649bt_.pfb c0632bt_.pfb c0633bt_.pfb \
-+FONTS = c0648bt_.pfb c0649bt_.pfb c0632bt_.pfb c0633bt_.pfb \
- c0419bt_.pfb c0582bt_.pfb c0583bt_.pfb c0611bt_.pfb cursor.pfa
-
--AFMS = UTRG____.afm UTB_____.afm UTBI____.afm UTI_____.afm \
-- cour.afm courb.afm courbi.afm couri.afm \
-- c0648bt_.afm c0649bt_.afm c0632bt_.afm c0633bt_.afm \
-+AFMS = c0648bt_.afm c0649bt_.afm c0632bt_.afm c0633bt_.afm \
- c0419bt_.afm c0582bt_.afm c0583bt_.afm c0611bt_.afm
-
--BHFONTS = l047013t.pfa l047036t.pfa l048033t.pfa l049016t.pfa \
-- l047016t.pfa l048013t.pfa l048036t.pfa l049033t.pfa \
-- l047033t.pfa l048016t.pfa l049013t.pfa l049036t.pfa
-
--BHAFMS = l047013t.afm l047036t.afm l048033t.afm l049016t.afm \
-- l047016t.afm l048013t.afm l048036t.afm l049033t.afm \
-- l047033t.afm l048016t.afm l049013t.afm l049036t.afm
--
--OBJS = $(FONTS) $(BHFONTS) $(AFMS) $(BHAFMS)
-+OBJS = $(FONTS) $(AFMS)
-
- FONTINSTDIR = $(FONTDIR)/Type1
-
---- xc/fonts/scaled/Type1/fonts.scale.orig Fri Jan 10 18:57:10 2003
-+++ xc/fonts/scaled/Type1/fonts.scale Fri Jan 10 18:58:22 2003
-@@ -1,24 +1,4 @@
--89
--UTRG____.pfa -adobe-utopia-medium-r-normal--0-0-0-0-p-0-iso8859-1
--UTI_____.pfa -adobe-utopia-medium-i-normal--0-0-0-0-p-0-iso8859-1
--UTB_____.pfa -adobe-utopia-bold-r-normal--0-0-0-0-p-0-iso8859-1
--UTBI____.pfa -adobe-utopia-bold-i-normal--0-0-0-0-p-0-iso8859-1
--cour.pfa -adobe-courier-medium-r-normal--0-0-0-0-m-0-iso8859-1
--cour.pfa -adobe-courier-medium-r-normal--0-0-0-0-m-0-iso8859-2
--cour.pfa -adobe-courier-medium-r-normal--0-0-0-0-m-0-iso8859-3
--cour.pfa -adobe-courier-medium-r-normal--0-0-0-0-m-0-iso8859-9
--couri.pfa -adobe-courier-medium-i-normal--0-0-0-0-m-0-iso8859-1
--couri.pfa -adobe-courier-medium-i-normal--0-0-0-0-m-0-iso8859-2
--couri.pfa -adobe-courier-medium-i-normal--0-0-0-0-m-0-iso8859-3
--couri.pfa -adobe-courier-medium-i-normal--0-0-0-0-m-0-iso8859-9
--courb.pfa -adobe-courier-bold-r-normal--0-0-0-0-m-0-iso8859-1
--courb.pfa -adobe-courier-bold-r-normal--0-0-0-0-m-0-iso8859-2
--courb.pfa -adobe-courier-bold-r-normal--0-0-0-0-m-0-iso8859-3
--courb.pfa -adobe-courier-bold-r-normal--0-0-0-0-m-0-iso8859-9
--courbi.pfa -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-1
--courbi.pfa -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-2
--courbi.pfa -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-3
--courbi.pfa -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-9
-+9
- c0648bt_.pfb -bitstream-charter-medium-r-normal--0-0-0-0-p-0-iso8859-1
- c0649bt_.pfb -bitstream-charter-medium-i-normal--0-0-0-0-p-0-iso8859-1
- c0632bt_.pfb -bitstream-charter-bold-r-normal--0-0-0-0-p-0-iso8859-1
-@@ -28,63 +8,3 @@
- c0583bt_.pfb -bitstream-courier-bold-r-normal--0-0-0-0-m-0-iso8859-1
- c0611bt_.pfb -bitstream-courier-bold-i-normal--0-0-0-0-m-0-iso8859-1
- cursor.pfa -xfree86-cursor-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific
--l047013t.pfa -b&h-Luxi Mono-medium-r-normal--0-0-0-0-m-0-iso8859-1
--l047013t.pfa -b&h-Luxi Mono-medium-r-normal--0-0-0-0-m-0-iso8859-2
--l047013t.pfa -b&h-Luxi Mono-medium-r-normal--0-0-0-0-m-0-iso8859-9
--l047013t.pfa -b&h-Luxi Mono-medium-r-normal--0-0-0-0-m-0-iso8859-15
--l047013t.pfa -b&h-Luxi Mono-medium-r-normal--0-0-0-0-m-0-adobe-standard
--l047016t.pfa -b&h-Luxi Mono-bold-r-normal--0-0-0-0-m-0-iso8859-1
--l047016t.pfa -b&h-Luxi Mono-bold-r-normal--0-0-0-0-m-0-iso8859-2
--l047016t.pfa -b&h-Luxi Mono-bold-r-normal--0-0-0-0-m-0-iso8859-9
--l047016t.pfa -b&h-Luxi Mono-bold-r-normal--0-0-0-0-m-0-iso8859-15
--l047016t.pfa -b&h-Luxi Mono-bold-r-normal--0-0-0-0-m-0-adobe-standard
--l047033t.pfa -b&h-Luxi Mono-medium-i-normal--0-0-0-0-m-0-iso8859-1
--l047033t.pfa -b&h-Luxi Mono-medium-i-normal--0-0-0-0-m-0-iso8859-2
--l047033t.pfa -b&h-Luxi Mono-medium-i-normal--0-0-0-0-m-0-iso8859-9
--l047033t.pfa -b&h-Luxi Mono-medium-i-normal--0-0-0-0-m-0-iso8859-15
--l047033t.pfa -b&h-Luxi Mono-medium-i-normal--0-0-0-0-m-0-adobe-standard
--l047036t.pfa -b&h-Luxi Mono-bold-i-normal--0-0-0-0-m-0-iso8859-1
--l047036t.pfa -b&h-Luxi Mono-bold-i-normal--0-0-0-0-m-0-iso8859-2
--l047036t.pfa -b&h-Luxi Mono-bold-i-normal--0-0-0-0-m-0-iso8859-9
--l047036t.pfa -b&h-Luxi Mono-bold-i-normal--0-0-0-0-m-0-iso8859-15
--l047036t.pfa -b&h-Luxi Mono-bold-i-normal--0-0-0-0-m-0-adobe-standard
--l048013t.pfa -b&h-Luxi Sans-medium-r-normal--0-0-0-0-p-0-iso8859-1
--l048013t.pfa -b&h-Luxi Sans-medium-r-normal--0-0-0-0-p-0-iso8859-2
--l048013t.pfa -b&h-Luxi Sans-medium-r-normal--0-0-0-0-p-0-iso8859-9
--l048013t.pfa -b&h-Luxi Sans-medium-r-normal--0-0-0-0-p-0-iso8859-15
--l048013t.pfa -b&h-Luxi Sans-medium-r-normal--0-0-0-0-p-0-adobe-standard
--l048016t.pfa -b&h-Luxi Sans-bold-r-normal--0-0-0-0-p-0-iso8859-1
--l048016t.pfa -b&h-Luxi Sans-bold-r-normal--0-0-0-0-p-0-iso8859-2
--l048016t.pfa -b&h-Luxi Sans-bold-r-normal--0-0-0-0-p-0-iso8859-9
--l048016t.pfa -b&h-Luxi Sans-bold-r-normal--0-0-0-0-p-0-iso8859-15
--l048016t.pfa -b&h-Luxi Sans-bold-r-normal--0-0-0-0-p-0-adobe-standard
--l048033t.pfa -b&h-Luxi Sans-medium-i-normal--0-0-0-0-p-0-iso8859-1
--l048033t.pfa -b&h-Luxi Sans-medium-i-normal--0-0-0-0-p-0-iso8859-2
--l048033t.pfa -b&h-Luxi Sans-medium-i-normal--0-0-0-0-p-0-iso8859-9
--l048033t.pfa -b&h-Luxi Sans-medium-i-normal--0-0-0-0-p-0-iso8859-15
--l048033t.pfa -b&h-Luxi Sans-medium-i-normal--0-0-0-0-p-0-adobe-standard
--l048036t.pfa -b&h-Luxi Sans-bold-i-normal--0-0-0-0-p-0-iso8859-1
--l048036t.pfa -b&h-Luxi Sans-bold-i-normal--0-0-0-0-p-0-iso8859-2
--l048036t.pfa -b&h-Luxi Sans-bold-i-normal--0-0-0-0-p-0-iso8859-9
--l048036t.pfa -b&h-Luxi Sans-bold-i-normal--0-0-0-0-p-0-iso8859-15
--l048036t.pfa -b&h-Luxi Sans-bold-i-normal--0-0-0-0-p-0-adobe-standard
--l049013t.pfa -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-iso8859-1
--l049013t.pfa -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-iso8859-2
--l049013t.pfa -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-iso8859-9
--l049013t.pfa -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-iso8859-15
--l049013t.pfa -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-adobe-standard
--l049016t.pfa -b&h-Luxi Serif-bold-r-normal--0-0-0-0-p-0-iso8859-1
--l049016t.pfa -b&h-Luxi Serif-bold-r-normal--0-0-0-0-p-0-iso8859-2
--l049016t.pfa -b&h-Luxi Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9
--l049016t.pfa -b&h-Luxi Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15
--l049016t.pfa -b&h-Luxi Serif-bold-r-normal--0-0-0-0-p-0-adobe-standard
--l049033t.pfa -b&h-Luxi Serif-medium-i-normal--0-0-0-0-p-0-iso8859-1
--l049033t.pfa -b&h-Luxi Serif-medium-i-normal--0-0-0-0-p-0-iso8859-2
--l049033t.pfa -b&h-Luxi Serif-medium-i-normal--0-0-0-0-p-0-iso8859-9
--l049033t.pfa -b&h-Luxi Serif-medium-i-normal--0-0-0-0-p-0-iso8859-15
--l049033t.pfa -b&h-Luxi Serif-medium-i-normal--0-0-0-0-p-0-adobe-standard
--l049036t.pfa -b&h-Luxi Serif-bold-i-normal--0-0-0-0-p-0-iso8859-1
--l049036t.pfa -b&h-Luxi Serif-bold-i-normal--0-0-0-0-p-0-iso8859-2
--l049036t.pfa -b&h-Luxi Serif-bold-i-normal--0-0-0-0-p-0-iso8859-9
--l049036t.pfa -b&h-Luxi Serif-bold-i-normal--0-0-0-0-p-0-iso8859-15
--l049036t.pfa -b&h-Luxi Serif-bold-i-normal--0-0-0-0-p-0-adobe-standard
---- xc/programs/Xserver/hw/xfree86/doc/Imakefile.orig Wed Feb 26 12:18:43 2003
-+++ xc/programs/Xserver/hw/xfree86/doc/Imakefile Wed Feb 26 12:18:51 2003
-@@ -57,8 +57,6 @@
- OTHERDOCS = \
- ReadmeFile(fonts) \
- ReadmeFile(mouse) \
-- ReadmeFile(DRI) \
-- ReadmeFile(DRIcomp) \
- ReadmeFile(dps) \
- ReadmeFile(XKB-Config) \
- ReadmeFile(XKB-Enhancing)
Deleted: people/wt/4.4.0/patches-needing-update/909_debian_piclib_support.diff
===================================================================
--- people/wt/4.4.0/patches-needing-update/909_debian_piclib_support.diff 2003-12-10 07:37:38 UTC (rev 835)
+++ people/wt/4.4.0/patches-needing-update/909_debian_piclib_support.diff 2003-12-10 11:19:38 UTC (rev 836)
@@ -1,147 +0,0 @@
-$Id$
-
-This patch by Matthieu Herrb, Branden Robinson, ISHIKAWA Mutsumi, and
-LaMont Jones.
-
-An earlier version was submitted as #5381. Apparently rejected.
-
-Defines a new macro, PicLibraryTarget, which creates static objects with
-PIC info, used for objects with special requirements.
-
-By default, only libraries without a shared version build static-PIC
-versions, and then only on architectures where PIC info is not included in
-static ("normal") libraries by default.
-
-diff -urN xc.orig/config/cf/Imake.rules xc/config/cf/Imake.rules
---- xc.orig/config/cf/Imake.rules 2003-06-12 20:08:46.000000000 +0900
-+++ xc/config/cf/Imake.rules 2003-06-12 20:14:17.000000000 +0900
-@@ -2608,6 +2608,20 @@
-
-
- /*
-+ * Rule to build libXXX_pic.a from PIC objects for a library
-+ */
-+#ifndef PicLibraryTarget
-+#define PicLibraryTarget(libname,objlist) @@\
-+AllTarget(LibraryTargetNameSuffix(libname,_pic)) @@\
-+ @@\
-+LibraryTargetNameSuffix(libname,_pic): objlist $(EXTRALIBRARYDEPS) @@\
-+ RemoveFile($@) @@\
-+ MakeLibrary($@,objlist) @@\
-+ RanLibrary($@) @@\
-+ _LinkBuildLibrary($@)
-+#endif /* PicLibraryTarget */
-+
-+/*
- * SubdirLibraryRule -
- */
- #ifndef SubdirLibraryRule
---- xc/config/cf/Library.tmpl~ 2003-06-14 05:23:52.000000000 -0500
-+++ xc/config/cf/Library.tmpl 2003-06-14 05:33:43.000000000 -0500
-@@ -37,6 +37,14 @@
- #define DoExtraLib NO
- #endif
-
-+#ifndef DoPicLib
-+# if DoNormalLib && !DoSharedLib && !StaticNeedsPicForShared
-+# define DoPicLib YES
-+# else
-+# define DoPicLib NO
-+# endif
-+#endif
-+
- #ifndef HasSharedData
- #define HasSharedData NO
- #endif
-@@ -53,7 +60,7 @@
- #endif
-
- #ifndef LibraryCplusplusOptions
--# if DoSharedLib && defined(SharedLibraryCplusplusOptions)
-+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions)
- # define LibraryCplusplusOptions SharedLibraryCplusplusOptions
- # else
- # define LibraryCplusplusOptions DefaultCplusplusOptions
-@@ -85,14 +93,14 @@
-
- #ifndef CplusplusSource
- # ifndef LibraryCcCmd
--# if DoSharedLib && defined(SharedLibraryCcCmd)
-+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCcCmd)
- # define LibraryCcCmd SharedLibraryCcCmd
- # else
- # define LibraryCcCmd CcCmd
- # endif
- # endif
- # ifndef LibraryCCOptions
--# if DoSharedLib && defined(SharedLibraryCCOptions)
-+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCCOptions)
- # define LibraryCCOptions SharedLibraryCCOptions
- # else
- # define LibraryCCOptions DefaultCCOptions
-@@ -121,7 +129,7 @@
- #else
- # ifndef CrossCompileDir
- # ifndef LibraryCplusplusCmd
--# if DoSharedLib && defined(SharedLibraryCplusplusCmd)
-+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd)
- # define LibraryCplusplusCmd SharedLibraryCplusplusCmd
- # else
- # define LibraryCplusplusCmd CplusplusCmd
-@@ -129,7 +137,7 @@
- # endif
- # else
- # ifndef CrossLibraryCplusplusCmd
--# if DoSharedLib && defined(SharedLibraryCplusplusCmd)
-+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd)
- # define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(SharedLibraryCplusplusCmd))
- # else
- # define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(CplusplusCmd))
-@@ -138,7 +146,7 @@
- # endif
-
- # ifndef LibraryCplusplusOptions
--# if DoSharedLib && defined(SharedLibraryCplusplusOptions)
-+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions)
- # define LibraryCplusplusOptions SharedLibraryCplusplusOptions
- # else
- # define LibraryCplusplusOptions DefaultCplusplusOptions
-@@ -202,14 +210,14 @@
- # define _NormalObjCplusplusCompile(options) $(_NULLCMD_)
- # define _NormalCleanDir() $(_NULLCMD_)
- #else
--# if DoSharedLib && SeparateSharedCompile
-+# if (DoSharedLib || DoPicLib) && SeparateSharedCompile
- # define _NormalLibMkdir() _LibMkdir(unshared)
- # define _NormalObjCompile(options) UnsharedLibObjCompile(options)
- # define _NormalObjCplusplusCompile(options) UnsharedLibObjCplusplusCompile(options)
- # define _NormalCleanDir() LibCleanDir(unshared)
- # else
- # define _NormalLibMkdir() $(_NULLCMD_)
--# if !DoSharedLib && defined(IncludeSharedObjectInNormalLib)
-+# if (!DoSharedLib && !DoPicLib) && defined(IncludeSharedObjectInNormalLib)
- # define _NormalObjCompile(options) NormalRelocLibObjCompile(options)
- # else
- # define _NormalObjCompile(options) NormalLibObjCompile(options)
-@@ -219,7 +227,7 @@
- # endif
- #endif
-
--#if !DoSharedLib || (DoNormalLib && !SeparateSharedCompile)
-+#if !DoSharedLib && !DoPicLib || (DoNormalLib && !SeparateSharedCompile)
- # define _SharedObjCompile(options) $(_NULLCMD_)
- # define _SharedObjCplusplusCompile(options) $(_NULLCMD_)
- #else
-@@ -501,6 +509,12 @@
- InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
- # endif
- # endif
-+# if DoPicLib
-+PicLibraryTarget($(LIBNAME),$(OBJS))
-+# if !defined(LibInstall) || LibInstall
-+InstallLibrary($(LIBNAME)_pic,$(USRLIBDIR))
-+# endif
-+# endif
- # if DoExtraLib && defined(ExtraLibRules)
- ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS))
- # if !defined(LibInstall) || LibInstall
Reply to: