rev 11319 - in branches/kde4/packages/kdelibs/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Sat Jul 5 08:10:50 UTC 2008
Author: ana
Date: 2008-07-05 08:10:49 +0000 (Sat, 05 Jul 2008)
New Revision: 11319
Added:
branches/kde4/packages/kdelibs/debian/patches/90_reduced_linking.diff
Removed:
branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff
branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff
Modified:
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/patches/series
Log:
* Update 98_link_interface_libraries.diff (coming soon)
* Remove patches 97_use_imported_targets_with_cmake26.diff and
99_more_implicit_link_libs.diff
* Add 90_reduce_linking.diff by A. Neundorf.
No patches were harmed during the making of this commit.
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2008-07-05 02:00:19 UTC (rev 11318)
+++ branches/kde4/packages/kdelibs/debian/changelog 2008-07-05 08:10:49 UTC (rev 11319)
@@ -1,17 +1,19 @@
-kde4libs (4:4.0.84+svn828171-1) UNRELEASED; urgency=low
+kde4libs (4:4.0.84+svn828257-1) UNRELEASED; urgency=low
* New upstream development snapshot.
+++ Changes by Ana Beatriz Guerrero Lopez:
- * Update 98_link_interface_libraries.diff
- * Commented out 99_ for now.
+ * Update 98_link_interface_libraries.diff (coming soon)
+ * Remove patches 97_use_imported_targets_with_cmake26.diff and
+ 99_more_implicit_link_libs.diff
+ * Add 90_reduce_linking.diff by A. Neundorf.
+++ Changes by Armin Berres:
* Disable debug output of KMail by default.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 05 Jul 2008 00:41:22 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 05 Jul 2008 10:15:54 +0200
kde4libs (4:4.0.84-1) experimental; urgency=low
Added: branches/kde4/packages/kdelibs/debian/patches/90_reduced_linking.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/90_reduced_linking.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/90_reduced_linking.diff 2008-07-05 08:10:49 UTC (rev 11319)
@@ -0,0 +1,110 @@
+--- kde4libs-4.0.84+svn828171.orig/khtml/CMakeLists.txt
++++ kde4libs-4.0.84+svn828171/khtml/CMakeLists.txt
+@@ -336,7 +336,8 @@
+ target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} ${X11_LIBRARIES})
+
+ set_target_properties(khtml PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+- SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
++ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
++ LINK_INTERFACE_LIBRARIES "kparts;kjs;kio;kdeui;kdecore")
+
+
+ set(CREATE_HASH_TABLE ${CMAKE_SOURCE_DIR}/kjs/create_hash_table )
+--- kde4libs-4.0.84+svn828171.orig/kde3support/CMakeLists.txt
++++ kde4libs-4.0.84+svn828171/kde3support/CMakeLists.txt
+@@ -81,7 +81,8 @@
+ target_link_libraries(kde3support ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS} ${X11_LIBRARIES})
+
+ set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+- SOVERSION ${GENERIC_LIB_SOVERSION} )
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ LINK_INTERFACE_LIBRARIES "kio;kdeui;kdecore;${QT_QT3SUPPORT_LIBRARY}")
+
+ install(TARGETS kde3support ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kde4libs-4.0.84+svn828171.orig/kfile/CMakeLists.txt
++++ kde4libs-4.0.84+svn828171/kfile/CMakeLists.txt
+@@ -40,7 +40,8 @@
+ )
+
+ set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+- SOVERSION ${GENERIC_LIB_SOVERSION} )
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ LINK_INTERFACE_LIBRARIES "kio;kdeui;kdecore")
+
+ install(TARGETS kfile ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kde4libs-4.0.84+svn828171.orig/kross/core/CMakeLists.txt
++++ kde4libs-4.0.84+svn828171/kross/core/CMakeLists.txt
+@@ -13,7 +13,8 @@
+ kde4_add_library(krosscore SHARED ${krosscore_LIB_SRCS})
+ target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTXML_LIBRARY})
+ set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+- SOVERSION ${GENERIC_LIB_SOVERSION} )
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ LINK_INTERFACE_LIBRARIES "kdecore;${QT_QTSCRIPT_LIBRARY};${QT_QTXML_LIBRARY}")
+
+ install(TARGETS krosscore ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kde4libs-4.0.84+svn828171.orig/kross/ui/CMakeLists.txt
++++ kde4libs-4.0.84+svn828171/kross/ui/CMakeLists.txt
+@@ -16,7 +16,8 @@
+ kde4_add_library(krossui SHARED ${krossui_LIB_SRCS})
+ target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS})
+ set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+- SOVERSION ${GENERIC_LIB_SOVERSION} )
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ LINK_INTERFACE_LIBRARIES "krosscore")
+
+
+ install(TARGETS krossui ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs-4.0.84+svn828171.orig/kparts/CMakeLists.txt
++++ kde4libs-4.0.84+svn828171/kparts/CMakeLists.txt
+@@ -27,7 +27,8 @@
+ target_link_libraries(kparts ${KDE4_KDECORE_LIBS} kdeui kio)
+
+ set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+- SOVERSION ${GENERIC_LIB_SOVERSION} )
++ SOVERSION ${GENERIC_LIB_SOVERSION}
++ LINK_INTERFACE_LIBRARIES "kio;kdeui;kdecore")
+
+
+ install(TARGETS kparts ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs-4.0.84+svn828171.orig/kio/CMakeLists.txt
++++ kde4libs-4.0.84+svn828171/kio/CMakeLists.txt
+@@ -260,7 +260,8 @@
+ endif(X11_Xrender_FOUND)
+
+ set_target_properties(kio PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+- SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
++ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
++ LINK_INTERFACE_LIBRARIES "kdeui;kdecore;${QT_QTNETWORK_LIBRARY};${QT_QTXML_LIBRARY}")
+
+
+ ########### install files ###############
+--- kde4libs-4.0.84+svn828171.orig/kdeui/CMakeLists.txt
++++ kde4libs-4.0.84+svn828171/kdeui/CMakeLists.txt
+@@ -316,8 +316,9 @@
+ endif(X11_Xrender_FOUND)
+
+ set_target_properties(kdeui PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+- SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+-
++ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
++ LINK_INTERFACE_LIBRARIES "kdecore;${QT_QTSVG_LIBRARY};${QT_QTGUI_LIBRARY}"
++ )
+ install(TARGETS kdeui ${INSTALL_TARGETS_DEFAULT_ARGS})
+ ########### install files ###############
+
+--- kde4libs-4.0.84+svn828171.orig/kdecore/CMakeLists.txt
++++ kde4libs-4.0.84+svn828171/kdecore/CMakeLists.txt
+@@ -248,7 +248,8 @@
+
+ set_target_properties(kdecore PROPERTIES
+ VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+- SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
++ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
++ LINK_INTERFACE_LIBRARIES "${QT_QTDBUS_LIBRARY};${QT_QTCORE_LIBRARY}")
+
+ install(TARGETS kdecore ${INSTALL_TARGETS_DEFAULT_ARGS})
+
Deleted: branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff
Deleted: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
Deleted: branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2008-07-05 02:00:19 UTC (rev 11318)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2008-07-05 08:10:49 UTC (rev 11319)
@@ -9,6 +9,7 @@
19_findqt4_optional_x11_pthread.diff
20_use_dejavu_as_default_font.diff
22_hack_in_etc_kde4_in_kstandarddirs.diff
+90_reduced_linking.diff
#97_use_imported_targets_with_cmake26.diff
-98_link_interface_libraries.diff
+#98_link_interface_libraries.diff
#99_more_implicit_link_libs.diff
More information about the pkg-kde-commits
mailing list