[Pkg-kde-commits] rev 1881 - in branches/kde-3.4.0/packages/kdelibs/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-09-28 21:44:46 +0000 (Wed, 28 Sep 2005)
New Revision: 1881

Added:
   branches/kde-3.4.0/packages/kdelibs/debian/patches/24_libkdefakes_pic.diff
Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/changelog
   branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.install
Log:
libkdefakes_pic.a, as requested.


Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-09-28 20:23:17 UTC (rev 1880)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-09-28 21:44:46 UTC (rev 1881)
@@ -5,6 +5,11 @@
   * Tweak the rounded text selection patch to avoid it causing icon spacing
     issues in Konqueror. (Closes: #329404)
 
+  * Add a patch to generate a PIC static libkdefakes, libkdefakes_pic.a.
+    This will allow other libraries, such as mimelib, to use libkdefakes,
+    without acquiring non-PIC code or a dependency upon the full kdelibs.
+    (Closes: #326113)
+
   +++ Changes by Pierre Habouzit:
 
   * Add /usr/share/bug/$package/presubj for kdelibs{4c2,-bin,} kindly asking

Modified: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.install	2005-09-28 20:23:17 UTC (rev 1880)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs4-dev.install	2005-09-28 21:44:46 UTC (rev 1881)
@@ -712,6 +712,7 @@
 debian/tmp/usr/lib/libkdefakes.la
 debian/tmp/usr/lib/libkdefakes.so
 debian/tmp/usr/lib/libkdefakes_nonpic.a
+debian/tmp/usr/lib/libkdefakes_pic.a
 debian/tmp/usr/lib/libkdefx.la
 debian/tmp/usr/lib/libkdefx.so
 debian/tmp/usr/lib/libkdeinit_cupsdconf.la

Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/24_libkdefakes_pic.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/24_libkdefakes_pic.diff	2005-09-28 20:23:17 UTC (rev 1880)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/24_libkdefakes_pic.diff	2005-09-28 21:44:46 UTC (rev 1881)
@@ -0,0 +1,24 @@
+--- kde.orig/kdecore/Makefile.am
++++ kde.patched/kdecore/Makefile.am
+@@ -34,7 +34,7 @@
+ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+ 
+ lib_LTLIBRARIES = libkdefakes.la libkdecore.la
+-lib_LIBRARIES = libkdefakes_nonpic.a
++lib_LIBRARIES = libkdefakes_nonpic.a libkdefakes_pic.a
+ 
+ include_HEADERS = kconfig.h kconfigskeleton.h \
+ 	kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
+@@ -75,6 +75,12 @@
+ 	-rm -f vsnprintf_nonpic.c
+ 	$(LN_S) $(srcdir)/vsnprintf.c vsnprintf_nonpic.c
+ 
++libkdefakes_pic.a: libkdefakes.la
++	-rm -f libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
++	cp -f .libs/fakes.o fakes_pic.o; cp -f .libs/vsnprintf.o vsnprintf_pic.o
++	ar cru libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o
++	ranlib libkdefakes_pic.a
++
+ noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
+ 	kcompletion_private.h netwm_p.h \
+ 	kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \