X Strike Force SVN commit: rev 231 - in branches/4.3.0/sid/debian: . patches
Author: daniel
Date: 2003-06-22 03:28:31 -0500 (Sun, 22 Jun 2003)
New Revision: 231
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 #003, #004, changelog: fix weak deps in libGLU, and all through xlibs.
Modified: branches/4.3.0/sid/debian/changelog
==============================================================================
--- branches/4.3.0/sid/debian/changelog 2003-06-22 08:24:51 UTC (rev 230)
+++ branches/4.3.0/sid/debian/changelog 2003-06-22 08:28:31 UTC (rev 231)
@@ -44,6 +44,10 @@
+ new 'Option "ForceInit"' for forcing full initilization of consoles.
(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.
+
* 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:24:51 UTC (rev 230)
+++ branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-22 08:28:31 UTC (rev 231)
@@ -77,7 +77,7 @@
# define XF86SetupUsesStaticTcl NO
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-@@ -146,14 +152,59 @@
+@@ -146,14 +152,64 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
# define BuildRman NO
# define BuildHtmlManPages NO
@@ -114,6 +114,11 @@
+# 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
@@ -141,7 +146,7 @@
# define HasXdmAuth YES
# define HasLatex YES
/* at present, glide2 only works on i386 */
-@@ -701,7 +752,7 @@
+@@ -701,7 +757,7 @@
#if UseElfFormat
# ifndef DoLoadableServer
@@ -150,7 +155,7 @@
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
-@@ -746,7 +797,7 @@
+@@ -746,7 +802,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -159,7 +164,7 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -759,7 +810,7 @@
+@@ -759,7 +815,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -168,7 +173,7 @@
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -767,7 +818,7 @@
+@@ -767,7 +823,7 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -177,7 +182,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -775,7 +826,7 @@
+@@ -775,7 +831,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -186,7 +191,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -784,7 +835,7 @@
+@@ -784,7 +840,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -195,7 +200,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -793,7 +844,7 @@
+@@ -793,7 +849,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -204,7 +209,7 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -802,7 +853,7 @@
+@@ -802,7 +858,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
@@ -213,7 +218,7 @@
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -812,7 +863,7 @@
+@@ -812,7 +868,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -222,7 +227,7 @@
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -821,7 +872,7 @@
+@@ -821,7 +877,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -231,7 +236,7 @@
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -829,16 +880,17 @@
+@@ -829,16 +885,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -255,7 +260,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -869,7 +921,7 @@
+@@ -869,7 +926,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:24:51 UTC (rev 230)
+++ branches/4.3.0/sid/debian/patches/004_imake_manpage_handling_overhaul.diff 2003-06-22 08:28:31 UTC (rev 231)
@@ -305,7 +305,7 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -971,26 +972,6 @@
+@@ -976,26 +977,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Reply to: