Author: branden
Date: 2003-05-25 03:43:11 -0500 (Sun, 25 May 2003)
New Revision: 42
Modified:
trunk/MANIFEST.alpha
trunk/MANIFEST.arm
trunk/MANIFEST.hppa
trunk/MANIFEST.hurd-i386
trunk/MANIFEST.i386
trunk/MANIFEST.ia64
trunk/MANIFEST.m68k
trunk/MANIFEST.mips
trunk/MANIFEST.mipsel
trunk/MANIFEST.netbsd-i386
trunk/MANIFEST.powerpc
trunk/MANIFEST.s390
trunk/MANIFEST.sh3
trunk/MANIFEST.sh4
trunk/MANIFEST.sparc
trunk/changelog
trunk/patches/046_piclib_support.diff
Log:
patch #046 updated courtesy of LaMont Jones to create static PIC version of
libxkbfile.a; MANIFEST files updated accordingly
Modified: trunk/MANIFEST.arm
==============================================================================
--- trunk/MANIFEST.arm 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.arm 2003-05-25 08:43:11 UTC (rev 42)
@@ -5601,6 +5601,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/lib/modules/codeconv/libARABIC.a
Modified: trunk/MANIFEST.netbsd-i386
==============================================================================
--- trunk/MANIFEST.netbsd-i386 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.netbsd-i386 2003-05-25 08:43:11 UTC (rev 42)
@@ -5597,6 +5597,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/lib/modules/codeconv/libARABIC.a
Modified: trunk/MANIFEST.ia64
==============================================================================
--- trunk/MANIFEST.ia64 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.ia64 2003-05-25 08:43:11 UTC (rev 42)
@@ -5604,6 +5604,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/lib/modules/codeconv/libARABIC.a
Modified: trunk/MANIFEST.mipsel
==============================================================================
--- trunk/MANIFEST.mipsel 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.mipsel 2003-05-25 08:43:11 UTC (rev 42)
@@ -5602,6 +5602,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/man/man1/XFree86.1x
Modified: trunk/MANIFEST.hurd-i386
==============================================================================
--- trunk/MANIFEST.hurd-i386 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.hurd-i386 2003-05-25 08:43:11 UTC (rev 42)
@@ -5486,6 +5486,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/lib/modules/codeconv/libARABIC.a
Modified: trunk/MANIFEST.s390
==============================================================================
--- trunk/MANIFEST.s390 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.s390 2003-05-25 08:43:11 UTC (rev 42)
@@ -5539,6 +5539,7 @@
usr/X11R6/lib/libpsres.a
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/man/man1/Xmark.1x
Modified: trunk/MANIFEST.powerpc
==============================================================================
--- trunk/MANIFEST.powerpc 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.powerpc 2003-05-25 08:43:11 UTC (rev 42)
@@ -5602,6 +5602,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/lib/modules/codeconv/libARABIC.a
Modified: trunk/patches/046_piclib_support.diff
==============================================================================
--- trunk/patches/046_piclib_support.diff 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/patches/046_piclib_support.diff 2003-05-25 08:43:11 UTC (rev 42)
@@ -1,7 +1,8 @@
-This patch by Matthieu Herrb, Branden Robinson, and ISHIKAWA Mutsumi.
+This patch by Matthieu Herrb, Branden Robinson, ISHIKAWA Mutsumi, and
+LaMont Jones.
Submitted as #5381. Apparently rejected. Edited since then to PICify
-Xinerama as well.
+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
@@ -86,6 +87,16 @@
#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 @@
Modified: trunk/MANIFEST.i386
==============================================================================
--- trunk/MANIFEST.i386 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.i386 2003-05-25 08:43:11 UTC (rev 42)
@@ -5604,6 +5604,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/lib/modules/codeconv/libARABIC.a
Modified: trunk/MANIFEST.sh3
==============================================================================
--- trunk/MANIFEST.sh3 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.sh3 2003-05-25 08:43:11 UTC (rev 42)
@@ -5601,6 +5601,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/man/man1/XFree86.1x
Modified: trunk/MANIFEST.sh4
==============================================================================
--- trunk/MANIFEST.sh4 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.sh4 2003-05-25 08:43:11 UTC (rev 42)
@@ -5601,6 +5601,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/man/man1/XFree86.1x
Modified: trunk/changelog
==============================================================================
--- trunk/changelog 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/changelog 2003-05-25 08:43:11 UTC (rev 42)
@@ -66,6 +66,8 @@
* patch #032: uh, actually define a ComplexCplusplusProgramTargetNoMan()
rule, instead of redefining ComplexCplusplusProgramTarget() (thanks, Colin
Watson) (Closes: #186321)
+ * patch #046: updated to create static PIC version of libxkbfile.a as well;
+ fixes FTBFS of certain KDE packages (thanks, LaMont Jones)
* patch #049: new; remove duplicate XShmGetEventBase() prototype from XShm.h
(Closes: #182727)
* patch #052: new; have Xinerama header file #include Xlib header file,
@@ -83,6 +85,7 @@
* patch #910: new; change X server's "can't find default font" and "can't
find cursor font" error messages to whack users with a big fat clue
+ * debian/MANIFEST.*: updated to reflect new libxkbfile_pic.a object
* debian/*.conffiles: deleted; generation of these files is now handled
automatically by dh_installdeb when DH_COMPAT >= 4
* debian/*.debugfiles: renamed to *.install
Modified: trunk/MANIFEST.m68k
==============================================================================
--- trunk/MANIFEST.m68k 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.m68k 2003-05-25 08:43:11 UTC (rev 42)
@@ -5600,6 +5600,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/lib/modules/codeconv/libARABIC.a
Modified: trunk/MANIFEST.alpha
==============================================================================
--- trunk/MANIFEST.alpha 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.alpha 2003-05-25 08:43:11 UTC (rev 42)
@@ -5603,6 +5603,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/lib/modules/codeconv/libARABIC.a
Modified: trunk/MANIFEST.hppa
==============================================================================
--- trunk/MANIFEST.hppa 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.hppa 2003-05-25 08:43:11 UTC (rev 42)
@@ -5601,6 +5601,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/man/man1/XFree86.1x
Modified: trunk/MANIFEST.sparc
==============================================================================
--- trunk/MANIFEST.sparc 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.sparc 2003-05-25 08:43:11 UTC (rev 42)
@@ -5603,6 +5603,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/lib/modules/codeconv/libARABIC.a
Modified: trunk/MANIFEST.mips
==============================================================================
--- trunk/MANIFEST.mips 2003-05-25 08:27:50 UTC (rev 41)
+++ trunk/MANIFEST.mips 2003-05-25 08:43:11 UTC (rev 42)
@@ -5602,6 +5602,7 @@
usr/X11R6/lib/libpsres.so.1.0
usr/X11R6/lib/libxf86config.a
usr/X11R6/lib/libxkbfile.a
+usr/X11R6/lib/libxkbfile_pic.a
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxrx.so.6.3
usr/X11R6/man/man1/XFree86.1x
