Author: daniel Date: 2003-06-22 07:35:50 -0500 (Sun, 22 Jun 2003) New Revision: 232
Added: branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff 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 Log: patch #063: Implement Ishikawa's solution: modify X11.tmpl rather than linux.cf; thus revert effects of #231 on #003/#004. Modified: branches/4.3.0/sid/debian/changelog ============================================================================== --- branches/4.3.0/sid/debian/changelog 2003-06-22 08:28:31 UTC (rev 231) +++ branches/4.3.0/sid/debian/changelog 2003-06-22 12:35:50 UTC (rev 232) @@ -45,8 +45,7 @@ (closes: #117454, #129216) * fix weak deps (libGLU->libGL, many on X11/Xext in xlibs): - - patch #003: updated - set SharedFooReqs. (closes: #187365, #187374) - - patch #004: updated for offset from #003. + - patch #063: new. (closes: #187365, #187374) * eliminate TEXTREL section from libGL, making it PIC-compliant: + patch #062: new. (closes: #190323) 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-06-22 08:28:31 UTC (rev 231) +++ branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-22 12:35:50 UTC (rev 232) @@ -77,7 +77,7 @@ # define XF86SetupUsesStaticTcl NO /* un-comment this when it is un-broken */ /* # define JoystickSupport YES */ -@@ -146,14 +152,64 @@ +@@ -146,14 +152,59 @@ # define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm # define BuildRman NO # define BuildHtmlManPages NO @@ -114,11 +114,6 @@ +# define XftLibraryDir $(TOP)/../../debian/local/exports +# define XcursorLibraryDir $(TOP)/../../debian/local/exports +# endif -+# define SharedXpmReqs -L../X11 -lX11 -+# define SharedXpReqs -L../X11 -L../Xext -lX11 -lXext -+# define SharedXmuuReqs -L../X11 -lX11 -+# define SharedXrandrReqs -L../X11 -L../Xext -L$(TOP)/../../debian/local/exports/lib -lX11 -lXext -lXrender -+# define SharedGLUReqs -lGL /* we build-depend on libfreetype6-dev (FreeType 2.x) */ # define BuildFreetype2Library NO @@ -146,7 +141,7 @@ # define HasXdmAuth YES # define HasLatex YES /* at present, glide2 only works on i386 */ -@@ -701,7 +757,7 @@ +@@ -701,7 +752,7 @@ #if UseElfFormat # ifndef DoLoadableServer @@ -155,7 +150,7 @@ # define DoLoadableServer NO # else # define DoLoadableServer YES -@@ -746,7 +802,7 @@ +@@ -746,7 +797,7 @@ #ifdef AlphaArchitecture # ifndef OptimizedCDebugFlags @@ -164,7 +159,7 @@ # endif # define LinuxMachineDefines -D__alpha__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -@@ -759,7 +815,7 @@ +@@ -759,7 +810,7 @@ #ifdef Arm32Architecture # define DefaultCCOptions -fsigned-char # ifndef OptimizedCDebugFlags @@ -173,7 +168,7 @@ # endif # define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -@@ -767,7 +823,7 @@ +@@ -767,7 +818,7 @@ #endif /* Arm32Achitecture */ #ifdef HPArchitecture @@ -182,7 +177,7 @@ # define LinuxMachineDefines -D__hppa__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -@@ -775,7 +831,7 @@ +@@ -775,7 +826,7 @@ #ifdef i386Architecture # ifndef OptimizedCDebugFlags @@ -191,7 +186,7 @@ # endif # define LinuxMachineDefines -D__i386__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -@@ -784,7 +840,7 @@ +@@ -784,7 +835,7 @@ #ifdef ia64Architecture # ifndef OptimizedCDebugFlags @@ -200,7 +195,7 @@ # endif # define LinuxMachineDefines -D__ia64__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -@@ -793,7 +849,7 @@ +@@ -793,7 +844,7 @@ #ifdef Mc68020Architecture # ifndef OptimizedCDebugFlags @@ -209,7 +204,7 @@ # endif # define LinuxMachineDefines -D__mc68000__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -@@ -802,7 +858,7 @@ +@@ -802,7 +853,7 @@ #ifdef MipsArchitecture # ifndef OptimizedCDebugFlags @@ -218,7 +213,7 @@ # endif # define LinuxMachineDefines -D__mips__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -@@ -812,7 +868,7 @@ +@@ -812,7 +863,7 @@ #ifdef PpcArchitecture # define DefaultCCOptions -fsigned-char # ifndef OptimizedCDebugFlags @@ -227,7 +222,7 @@ # endif # define LinuxMachineDefines -D__powerpc__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -@@ -821,7 +877,7 @@ +@@ -821,7 +872,7 @@ #ifdef s390Architecture # ifndef OptimizedCDebugFlags @@ -236,7 +231,7 @@ # endif # define LinuxMachineDefines -D__s390__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -@@ -829,16 +885,17 @@ +@@ -829,16 +880,17 @@ #endif /* s390Architecture */ #ifdef s390xArchitecture @@ -260,7 +255,7 @@ # endif # define LinuxMachineDefines -D__sparc__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -@@ -869,7 +926,7 @@ +@@ -869,7 +921,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-06-22 08:28:31 UTC (rev 231) +++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-22 12:35:50 UTC (rev 232) @@ -305,7 +305,7 @@ /* The TT/Meltho fonts are all under non-free licenses. */ # define BuildTrueTypeFonts NO # define BuildBethMarduthoFonts NO -@@ -976,26 +977,6 @@ +@@ -971,26 +972,6 @@ # define ConnectionFlags -DUNIXCONN -DTCPCONN #endif Added: branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff ============================================================================== --- branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff 2003-06-22 08:28:31 UTC (rev 231) +++ branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff 2003-06-22 12:35:50 UTC (rev 232) @@ -0,0 +1,21 @@ +This patch fixes several 'weak' dependencies: + * libXpm: libX11 + * libXp: libX11, libXext + * libXmuu: libX11 + * libXrandr: libX11, libXext, libXrender + * libGLU: libGL + +--- xc/config/cf/lnxLib.tmpl.orig 2003-06-22 20:17:28.000000000 +0900 ++++ xc/config/cf/lnxLib.tmpl 2003-06-22 20:20:48.000000000 +0900 +@@ -32,6 +32,11 @@ + #define SharedXtstReqs $(LDPRELIB) $(XLIB) + #define SharedXieReqs $(LDPRELIB) $(XLIBONLY) + #define SharedSMReqs $(LDPRELIB) $(ICELIB) ++#define SharedXpmReqs $(LDPRELIB) $(XONLYLIB) ++#define SharedXpReqs $(LDPRELIB) $(EXTENSIONLIB) $(XONLYLIB) ++#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB) ++#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(EXTENSIONLIB) $(XONLYLIB) ++#define SharedGLUReqs $(LDPRELIB) $(GLXLIB) + + #if GlxUseBuiltInDRIDriver + #define ExtraSharedGLReqs /**/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]