rev 16818 - in trunk/packages/kdelibs/debian: . patches

Modestas Vainius modax at alioth.debian.org
Sun Feb 7 09:48:34 UTC 2010


Author: modax
Date: 2010-02-07 09:48:33 +0000 (Sun, 07 Feb 2010)
New Revision: 16818

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff
Log:
Do not export libQtUiTools.a symbols in kjsembed library
(25_ld_exclude_libs_qtuitools.diff).

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-02-06 22:33:16 UTC (rev 16817)
+++ trunk/packages/kdelibs/debian/changelog	2010-02-07 09:48:33 UTC (rev 16818)
@@ -6,6 +6,8 @@
   * Change my email address to modax at debian.org in Uploaders field.
   * Fix Vcs-Browser URL.
   * Drop obsolete presubj.
+  * Do not export libQtUiTools.a symbols in kjsembed library
+    (25_ld_exclude_libs_qtuitools.diff).
 
   [ Kai Wasserbäch ]
   * Synced to latest upstream SVN revision of the 4.4 branch (r1083043).

Modified: trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff	2010-02-06 22:33:16 UTC (rev 16817)
+++ trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff	2010-02-07 09:48:33 UTC (rev 16818)
@@ -1,12 +1,11 @@
-Exclude QtUiTools symbols from libplasma dynamic symbols table.
+From: Modestas Vainius <modax at debian.org>
+Subject: Exclude QtUiTools symbols from public libraries
+ Currently, libplasma and libkjsembed are affected.
+Forwarded: not-needed
 
----
- plasma/CMakeLists.txt |    3 +++
- 1 file changed, 3 insertions(+)
-
 --- a/plasma/CMakeLists.txt
 +++ b/plasma/CMakeLists.txt
-@@ -212,6 +212,9 @@ target_link_libraries(plasma ${KDE4_KIO_
+@@ -212,6 +212,9 @@
                               ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
                               kdnssd threadweaver ${KDE4_SOLID_LIBS} )
  
@@ -16,3 +15,15 @@
  if(QCA2_FOUND)
     target_link_libraries(plasma ${QCA2_LIBRARIES})
  endif(QCA2_FOUND)
+--- a/kjsembed/kjsembed/CMakeLists.txt
++++ b/kjsembed/kjsembed/CMakeLists.txt
+@@ -71,7 +71,8 @@
+ set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS ${KJSEMBEDLIBNAME} EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-
++# Do not export QtUiTools internal symbols
++set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES LINK_FLAGS_DEBIAN "-Wl,--exclude-libs -Wl,libQtUiTools.a")
+ 
+ 
+ 




More information about the pkg-kde-commits mailing list