Author: ishikawa Date: 2003-06-12 12:15:16 -0500 (Thu, 12 Jun 2003) New Revision: 186
Modified: people/ishikawa/debian/patches/003_linux.cf_and_xfree86.cf.diff people/ishikawa/debian/patches/004_imake_manpage_handling_overhaul.diff people/ishikawa/debian/patches/909_debian_piclib_support.diff Log: update patches to integrate xlibs-pic Modified: people/ishikawa/debian/patches/909_debian_piclib_support.diff ============================================================================== --- people/ishikawa/debian/patches/909_debian_piclib_support.diff 2003-06-12 14:13:57 UTC (rev 185) +++ people/ishikawa/debian/patches/909_debian_piclib_support.diff 2003-06-12 17:15:16 UTC (rev 186) @@ -4,9 +4,12 @@ Submitted as #5381. Apparently rejected. Edited since then to PICify Xinerama and libxkbfile as well. ---- xc/config/cf/Imake.rules~ Sat Oct 27 05:56:26 2001 -+++ xc/config/cf/Imake.rules Tue Oct 30 13:15:49 2001 -@@ -2579,6 +2579,20 @@ +(Updated for XFree86 4.3.0 at Jun, 12 2003) + +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 @@ /* @@ -27,130 +30,9 @@ * SubdirLibraryRule - */ #ifndef SubdirLibraryRule ---- xc/lib/Xinerama/Imakefile~ 2003-02-23 20:50:38.000000000 -0500 -+++ xc/lib/Xinerama/Imakefile 2003-02-23 20:50:56.000000000 -0500 -@@ -4,6 +4,7 @@ - #define DoSharedLib SharedLibXinerama - #define DoDebugLib DebugLibXinerama - #define DoProfileLib ProfileLibXinerama -+#define DoPicLib PicLibXinerama - #define LibName Xinerama - #define SoRev SOXINERAMAREV - #define LibHeaders NO ---- xc/lib/Xv/Imakefile~ Tue Oct 30 13:21:16 2001 -+++ xc/lib/Xv/Imakefile Tue Oct 30 13:21:41 2001 -@@ -4,6 +4,7 @@ - #define DoSharedLib SharedLibXv - #define DoDebugLib DebugLibXv - #define DoProfileLib ProfileLibXv -+#define DoPicLib PicLibXv - #define LibName Xv - #define SoRev SOXVREV - #define LibHeaders NO ---- xc/lib/XvMC/Imakefile~ Wed Jun 12 01:04:05 2002 -+++ xc/lib/XvMC/Imakefile Wed Jun 12 01:04:23 2002 -@@ -4,6 +4,7 @@ - #define DoSharedLib SharedLibXvMC - #define DoDebugLib DebugLibXvMC - #define DoProfileLib ProfileLibXvMC -+#define DoPicLib PicLibXvMC - #define LibName XvMC - #define SoRev SOXVMCREV - #define LibHeaders NO ---- xc/lib/XvMC/hw/i810/Imakefile~ Wed Jun 12 01:04:35 2002 -+++ xc/lib/XvMC/hw/i810/Imakefile Wed Jun 12 01:04:47 2002 -@@ -3,6 +3,7 @@ - #define DoSharedLib SharedLibXvMC - #define DoDebugLib DebugLibXvMC - #define DoProfileLib ProfileLibXvMC -+#define DoPicLib PicLibXvMC - #define LibName I810XvMC - #define SoRev SOXVMCREV - #define LibHeaders NO ---- xc/lib/Xxf86dga/Imakefile~ Tue Oct 30 13:20:50 2001 -+++ xc/lib/Xxf86dga/Imakefile Tue Oct 30 13:21:06 2001 -@@ -4,6 +4,7 @@ - #define DoExtraLib SharedLibXxf86dga - #define DoDebugLib DebugLibXxf86dga - #define DoProfileLib ProfileLibXxf86dga -+#define DoPicLib PicLibXxf86dga - #define LibName Xxf86dga - #define SoRev SOXXF86DGAREV - #define LibHeaders NO ---- xc/lib/Xxf86vm/Imakefile~ Tue Oct 30 13:21:47 2001 -+++ xc/lib/Xxf86vm/Imakefile Tue Oct 30 13:21:58 2001 -@@ -4,6 +4,7 @@ - #define DoExtraLib SharedLibXxf86vm - #define DoDebugLib DebugLibXxf86vm - #define DoProfileLib ProfileLibXxf86vm -+#define DoPicLib PicLibXxf86vm - #define LibName Xxf86vm - #define SoRev SOXXF86VMREV - #define LibHeaders NO ---- xc/lib/xkbfile/Imakefile~ 2003-05-22 16:07:17.000000000 -0600 -+++ xc/lib/xkbfile/Imakefile 2003-05-22 16:09:21.000000000 -0600 -@@ -10,6 +10,7 @@ - #define DoExtraLib NO - #define DoDebugLib NO - #define DoProfileLib NO -+#define DoPicLib YES - #define HasSharedData NO - #define LibName xkbfile - #define SoRev SOXKBFILEREV ---- xc/config/cf/X11.tmpl.orig 2003-02-23 20:56:56.000000000 -0500 -+++ xc/config/cf/X11.tmpl 2003-02-23 20:56:58.000000000 -0500 -@@ -1646,6 +1646,9 @@ - #ifndef ProfileLibXxf86vm - #define ProfileLibXxf86vm NO - #endif -+#ifndef PicLibXxf86vm -+#define PicLibXxf86vm YES -+#endif - #endif - - #if BuildXF86DGALibrary -@@ -1661,6 +1664,9 @@ - #ifndef ProfileLibXxf86dga - #define ProfileLibXxf86dga NO - #endif -+#ifndef PicLibXxf86dga -+#define PicLibXxf86dga YES -+#endif - #endif - - #if BuildXF86RushLibrary -@@ -1691,6 +1697,9 @@ - #ifndef ProfileLibXv - #define ProfileLibXv NO - #endif -+#ifndef PicLibXv -+#define PicLibXv YES -+#endif - #endif - - #if BuildXvMCLibrary -@@ -1706,6 +1715,9 @@ - #ifndef ProfileLibXvMC - #define ProfileLibXvMC NO - #endif -+#ifndef PicLibXvMC -+#define PicLibXvMC YES -+#endif - #endif - - #if BuildXineramaLibrary -@@ -1721,6 +1733,9 @@ - #ifndef ProfileLibXinerama - #define ProfileLibXinerama NO - #endif -+#ifndef PicLibXinerama -+#define PicLibXinerama YES -+#endif - #endif - - ---- xc/config/cf/Library.tmpl~ 2003-02-18 21:41:20.000000000 -0500 -+++ xc/config/cf/Library.tmpl 2003-02-18 21:42:00.000000000 -0500 +diff -urN xc.orig/config/cf/Library.tmpl xc/config/cf/Library.tmpl +--- xc.orig/config/cf/Library.tmpl 2003-02-21 14:30:20.000000000 +0900 ++++ xc/config/cf/Library.tmpl 2003-06-12 20:17:02.000000000 +0900 @@ -3,7 +3,7 @@ * that Imakefiles in the various library subtrees will need. * @@ -160,10 +42,10 @@ * * To get automatic generation of standard rules, also set the variables: * LibName, SoRev, HasSharedData, and optionally HugeLibrary and IncSubdir. -@@ -21,8 +21,15 @@ +@@ -52,8 +52,15 @@ + SHLIBGLOBALSFLAGS = ShlibGlobalsFlags + #endif - XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.15 2001/08/27 17:40:55 dawes Exp $ - +/* + * Some libraries may not define DoPicLib + */ @@ -177,7 +59,7 @@ # define LibraryCplusplusOptions SharedLibraryCplusplusOptions # else # define LibraryCplusplusOptions DefaultCplusplusOptions -@@ -48,14 +55,14 @@ +@@ -85,14 +92,14 @@ #ifndef CplusplusSource # ifndef LibraryCcCmd @@ -194,24 +76,34 @@ # define LibraryCCOptions SharedLibraryCCOptions # else # define LibraryCCOptions DefaultCCOptions -@@ -73,14 +80,14 @@ - # endif +@@ -121,7 +128,7 @@ #else - # ifndef LibraryCplusplusCmd --# if DoSharedLib && defined(SharedLibraryCplusplusCmd) -+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd) - # define LibraryCplusplusCmd SharedLibraryCplusplusCmd - # else - # define LibraryCplusplusCmd CplusplusCmd + # ifndef CrossCompileDir + # ifndef LibraryCplusplusCmd +-# if DoSharedLib && defined(SharedLibraryCplusplusCmd) ++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd) + # define LibraryCplusplusCmd SharedLibraryCplusplusCmd + # else + # define LibraryCplusplusCmd CplusplusCmd +@@ -129,7 +136,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 +145,7 @@ # endif + # ifndef LibraryCplusplusOptions -# if DoSharedLib && defined(SharedLibraryCplusplusOptions) +# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions) # define LibraryCplusplusOptions SharedLibraryCplusplusOptions # else # define LibraryCplusplusOptions DefaultCplusplusOptions -@@ -140,7 +147,7 @@ +@@ -202,14 +209,14 @@ # define _NormalObjCplusplusCompile(options) $(_NULLCMD_) # define _NormalCleanDir() $(_NULLCMD_) #else @@ -220,7 +112,15 @@ # define _NormalLibMkdir() _LibMkdir(unshared) # define _NormalObjCompile(options) UnsharedLibObjCompile(options) # define _NormalObjCplusplusCompile(options) UnsharedLibObjCplusplusCompile(options) -@@ -153,7 +160,7 @@ + # 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 +226,7 @@ # endif #endif @@ -229,7 +129,7 @@ # define _SharedObjCompile(options) $(_NULLCMD_) # define _SharedObjCplusplusCompile(options) $(_NULLCMD_) #else -@@ -439,6 +446,12 @@ +@@ -501,6 +508,12 @@ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) # endif # endif @@ -242,3 +142,126 @@ # if DoExtraLib && defined(ExtraLibRules) ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS)) # if !defined(LibInstall) || LibInstall +diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl +--- xc.orig/config/cf/X11.tmpl 2003-06-12 20:08:48.000000000 +0900 ++++ xc/config/cf/X11.tmpl 2003-06-12 20:14:17.000000000 +0900 +@@ -1652,6 +1652,9 @@ + #ifndef BuildLibPathVar + #define BuildLibPathVar LD_LIBRARY_PATH + #endif ++#ifndef PicLibXxf86vm ++#define PicLibXxf86vm YES ++#endif + #endif + #endif + #ifdef BuildLibPathVar +@@ -2533,6 +2536,12 @@ + #else + ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) + #endif ++#ifndef PicLibXxf86dga ++#define PicLibXxf86dga YES ++#endif ++#ifndef PicLibXv ++#define PicLibXv YES ++#endif + #endif + + #ifndef SharedLibXdmcp +@@ -2559,6 +2568,9 @@ + #else + ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) + #endif ++#ifndef PicLibXvMC ++#define PicLibXvMC YES ++#endif + #endif + + #ifndef SharedLibXmu +@@ -2745,6 +2757,9 @@ + #else + ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) + #endif ++#ifndef PicLibXinerama ++#define PicLibXinerama YES ++#endif + #endif + + #ifndef SharedLibXi +diff -urN xc.orig/lib/Xinerama/Imakefile xc/lib/Xinerama/Imakefile +--- xc.orig/lib/Xinerama/Imakefile 2003-01-04 11:48:24.000000000 +0900 ++++ xc/lib/Xinerama/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -4,6 +4,7 @@ + #define DoSharedLib SharedLibXinerama + #define DoDebugLib DebugLibXinerama + #define DoProfileLib ProfileLibXinerama ++#define DoPicLib PicLibXinerama + #define LibName Xinerama + #define SoRev SOXINERAMAREV + #define LibHeaders NO +diff -urN xc.orig/lib/Xv/Imakefile xc/lib/Xv/Imakefile +--- xc.orig/lib/Xv/Imakefile 2003-01-04 11:48:24.000000000 +0900 ++++ xc/lib/Xv/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -4,6 +4,7 @@ + #define DoSharedLib SharedLibXv + #define DoDebugLib DebugLibXv + #define DoProfileLib ProfileLibXv ++#define DoPicLib PicLibXv + #define LibName Xv + #define SoRev SOXVREV + #define LibHeaders NO +diff -urN xc.orig/lib/XvMC/Imakefile xc/lib/XvMC/Imakefile +--- xc.orig/lib/XvMC/Imakefile 2002-10-16 09:37:33.000000000 +0900 ++++ xc/lib/XvMC/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -4,6 +4,7 @@ + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC ++#define DoPicLib PicLibXvMC + #define LibName XvMC + #define SoRev SOXVMCREV + #define LibHeaders NO +diff -urN xc.orig/lib/XvMC/hw/i810/Imakefile xc/lib/XvMC/hw/i810/Imakefile +--- xc.orig/lib/XvMC/hw/i810/Imakefile 2002-10-31 03:42:57.000000000 +0900 ++++ xc/lib/XvMC/hw/i810/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -3,6 +3,7 @@ + #define DoSharedLib SharedLibXvMC + #define DoDebugLib DebugLibXvMC + #define DoProfileLib ProfileLibXvMC ++#define DoPicLib PicLibXvMC + #define LibName I810XvMC + #define SoRev SOXVMCREV + #define LibHeaders NO +diff -urN xc.orig/lib/Xxf86dga/Imakefile xc/lib/Xxf86dga/Imakefile +--- xc.orig/lib/Xxf86dga/Imakefile 2003-01-04 11:48:25.000000000 +0900 ++++ xc/lib/Xxf86dga/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -4,6 +4,7 @@ + #define DoExtraLib SharedLibXxf86dga + #define DoDebugLib DebugLibXxf86dga + #define DoProfileLib ProfileLibXxf86dga ++#define DoPicLib PicLibXxf86dga + #define LibName Xxf86dga + #define SoRev SOXXF86DGAREV + #define LibHeaders NO +diff -urN xc.orig/lib/Xxf86vm/Imakefile xc/lib/Xxf86vm/Imakefile +--- xc.orig/lib/Xxf86vm/Imakefile 2003-01-04 11:48:25.000000000 +0900 ++++ xc/lib/Xxf86vm/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -4,6 +4,7 @@ + #define DoExtraLib SharedLibXxf86vm + #define DoDebugLib DebugLibXxf86vm + #define DoProfileLib ProfileLibXxf86vm ++#define DoPicLib PicLibXxf86vm + #define LibName Xxf86vm + #define SoRev SOXXF86VMREV + #define LibHeaders NO +diff -urN xc.orig/lib/xkbfile/Imakefile xc/lib/xkbfile/Imakefile +--- xc.orig/lib/xkbfile/Imakefile 2001-08-28 02:40:59.000000000 +0900 ++++ xc/lib/xkbfile/Imakefile 2003-06-12 20:14:17.000000000 +0900 +@@ -10,6 +10,7 @@ + #define DoExtraLib NO + #define DoDebugLib NO + #define DoProfileLib NO ++#define DoPicLib YES + #define HasSharedData NO + #define LibName xkbfile + #define SoRev SOXKBFILEREV Modified: people/ishikawa/debian/patches/004_imake_manpage_handling_overhaul.diff ============================================================================== --- people/ishikawa/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-12 14:13:57 UTC (rev 185) +++ people/ishikawa/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-12 17:15:16 UTC (rev 186) @@ -299,13 +299,13 @@ +++ xc/config/cf/linux.cf Mon Jan 13 17:23:31 2003 @@ -155,6 +155,7 @@ # define BuildHtmlManPages NO - # define StaticNeedsPicForShared YES + # define StaticNeedsPicForShared NO /* We provides PIC static libraries by other way */ # define KernelVersionInBanner YES +# define ProjectManSuffix x /* The TT/Meltho fonts are all under non-free licenses. */ # define BuildTrueTypeFonts NO # define BuildBethMarduthoFonts NO -@@ -968,26 +968,6 @@ +@@ -968,26 +969,6 @@ # define ConnectionFlags -DUNIXCONN -DTCPCONN #endif Modified: people/ishikawa/debian/patches/003_linux.cf_and_xfree86.cf.diff ============================================================================== --- people/ishikawa/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-12 14:13:57 UTC (rev 185) +++ people/ishikawa/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-12 17:15:16 UTC (rev 186) @@ -81,7 +81,7 @@ # define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm # define BuildRman NO # define BuildHtmlManPages NO -+# define StaticNeedsPicForShared NO /* We provides PIC Static libraries other way */ ++# define StaticNeedsPicForShared NO /* We provides PIC static libraries by other way */ +# define KernelVersionInBanner YES +/* The TT/Meltho fonts are all under non-free licenses. */ +# define BuildTrueTypeFonts NO
