rev 10368 - in branches/kde4/packages/kdepim/debian: . patches

Armin Berres trigger-guest at alioth.debian.org
Tue Apr 29 11:20:30 UTC 2008 

Author: trigger-guest
Date: 2008-04-29 11:20:30 +0000 (Tue, 29 Apr 2008)
New Revision: 10368

Added:
   branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
Modified:
   branches/kde4/packages/kdepim/debian/changelog
Log:
and for sure we have a patch 97 here

Modified: branches/kde4/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4/packages/kdepim/debian/changelog	2008-04-29 11:16:23 UTC (rev 10367)
+++ branches/kde4/packages/kdepim/debian/changelog	2008-04-29 11:20:30 UTC (rev 10368)
@@ -1,4 +1,4 @@
-kdepim (4:4.0.68+svn794641-1) experimental; urgency=low
+kdepim (4:4.0.71+svn802208-1~pre1) experimental; urgency=low
 
   * First KDE 4.1 snapshot packaged.
 
@@ -16,6 +16,8 @@
   * Remove all development packages with include files and .so links.
     Everything which should be used by external programms belongs into
     kdepimlibs according to upstream.
+  * Add 97_fix_target_link_libraries.diff which fixes linkage problems with
+    recent kdelibs5.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 Apr 2008 11:14:37 +0000
 

Added: branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	                        (rev 0)
+++ branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	2008-04-29 11:20:30 UTC (rev 10368)
@@ -0,0 +1,118 @@
+--- a/kode/schema/CMakeLists.txt
++++ b/kode/schema/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ 
+ kde4_add_library(schema SHARED ${schema_LIB_SRCS})
+ 
+-target_link_libraries(schema  ${KDE4_KIO_LIBS} kxmlcommon )
++target_link_libraries(schema  ${KDE4_KIO_LIBS} kxmlcommon ${QT_QTXML_LIBRARY} )
+ 
+ set_target_properties(schema PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS schema  DESTINATION ${LIB_INSTALL_DIR})
+--- a/libkdepim/CMakeLists.txt
++++ b/libkdepim/CMakeLists.txt
+@@ -93,7 +93,7 @@
+ 
+ kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS})
+ 
+-target_link_libraries(kdepim  ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDESIGNER_LIBRARY} ${KDE4_KRESOURCES_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KCAL_LIBS}  kimproxy ${KDE4_KPIMUTILS_LIBS} ${KDE4_KLDAP_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} ${KDE4_KPARTS_LIBRARY})
++target_link_libraries(kdepim  ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDESIGNER_LIBRARY} ${KDE4_KRESOURCES_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KCAL_LIBS}  kimproxy ${KDE4_KPIMUTILS_LIBS} ${KDE4_KLDAP_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} ${KDE4_KPARTS_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY})
+ 
+ set_target_properties(kdepim PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS kdepim  DESTINATION ${LIB_INSTALL_DIR})
+--- a/akonadi/plugins/CMakeLists.txt
++++ b/akonadi/plugins/CMakeLists.txt
+@@ -24,7 +24,7 @@
+ 
+ set(akonadi_serializer_bookmark_SRCS akonadi_serializer_bookmark.cpp)
+ kde4_add_plugin(akonadi_serializer_bookmark ${akonadi_serializer_bookmark_SRCS})
+-target_link_libraries(akonadi_serializer_bookmark ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_AKONADI_LIBS})
++target_link_libraries(akonadi_serializer_bookmark ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_AKONADI_LIBS} ${QT_QTXML_LIBRARY})
+ install(TARGETS akonadi_serializer_bookmark DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+ ########### install files ###############
+--- a/akonadi/resources/imap/CMakeLists.txt
++++ b/akonadi/resources/imap/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ 
+ kde4_add_library(imap SHARED ${imap_LIB_SRCS})
+ 
+-target_link_libraries(imap ${QT_AND_KDECORE_LIBS} ${QT_QTSQL_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIMAP_LIBS})
++target_link_libraries(imap ${QT_AND_KDECORE_LIBS} ${QT_QTSQL_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIMAP_LIBS} ${QT_QTNETWORK_LIBRARY})
+ 
+ set_target_properties(imap PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS imap DESTINATION ${LIB_INSTALL_DIR})
+--- a/libkleo/CMakeLists.txt
++++ b/libkleo/CMakeLists.txt
+@@ -104,7 +104,7 @@
+ if(WIN32)
+ target_link_libraries(kleo ${kleo_LIB_LIBS}  ${GPGME_VANILLA_LIBRARIES} )
+ else(WIN32)
+-target_link_libraries(kleo ${kleo_LIB_LIBS} )
++target_link_libraries(kleo ${kleo_LIB_LIBS} ${QT_QTDBUS_LIBRARY} )
+ endif(WIN32)
+ set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kleo DESTINATION ${LIB_INSTALL_DIR})
+--- a/kmail/CMakeLists.txt
++++ b/kmail/CMakeLists.txt
+@@ -250,7 +250,7 @@
+ 
+ kde4_add_library(kmailprivate SHARED ${kmailprivate_LIB_SRCS})
+ 
+-kdepim4_link_unique_libraries(kmailprivate ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_PHONON_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KTNEF_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_MAILTRANSPORT_LIBRARY} ${KDE4_KIMAP_LIBRARY} ${KDE4_KPARTS_LIBRARY} kleo ${QGPGME_LIBRARIES} mimelib ksieve kpgp kdepim ${QT_QT3SUPPORT_LIBRARY})
++kdepim4_link_unique_libraries(kmailprivate ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_PHONON_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KTNEF_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_MAILTRANSPORT_LIBRARY} ${KDE4_KIMAP_LIBRARY} ${KDE4_KPARTS_LIBRARY} kleo ${QGPGME_LIBRARIES} mimelib ksieve kpgp kdepim ${QT_QT3SUPPORT_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
+ 
+ if(Nepomuk_FOUND)
+    kdepim4_link_unique_libraries(kmailprivate ${NEPOMUK_LIBRARIES} )
+--- a/kmobiletools/kmobiletools/libkmobiletools/CMakeLists.txt
++++ b/kmobiletools/kmobiletools/libkmobiletools/CMakeLists.txt
+@@ -93,6 +93,7 @@
+ kde4_add_library(kmobiletoolslib SHARED ${kmobiletoolslib_LIB_SRCS})
+ 
+ kdepim4_link_unique_libraries(kmobiletoolslib
++${QT_QTDBUS_LIBRARY}
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KIO_LIBS}  
+--- a/kontact/plugins/kmail/CMakeLists.txt
++++ b/kontact/plugins/kmail/CMakeLists.txt
+@@ -36,7 +36,7 @@
+ kde4_add_plugin(kcm_kmailsummary ${kcm_kmailsummary_PART_SRCS})
+ 
+ 
+-kdepim4_link_unique_libraries(kcm_kmailsummary  ${KDE4_KDEUI_LIBS})
++kdepim4_link_unique_libraries(kcm_kmailsummary  ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY})
+ 
+ install(TARGETS kcm_kmailsummary  DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+--- a/kontact/plugins/newsticker/CMakeLists.txt
++++ b/kontact/plugins/newsticker/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ 
+ 
+ 
+-kdepim4_link_unique_libraries(kcm_kontactknt  ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS})
++kdepim4_link_unique_libraries(kcm_kontactknt  ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDBUS_LIBRARY})
+ 
+ install(TARGETS kcm_kontactknt  DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+--- a/kpilot/conduits/base/CMakeLists.txt
++++ b/kpilot/conduits/base/CMakeLists.txt
+@@ -32,6 +32,6 @@
+ 
+ kde4_add_kcfg_files(conduit_base_SRCS ${conduit_base_KCFGS})
+ kde4_add_library(kpilot_conduit_base SHARED ${conduit_base_SRCS})
+-target_link_libraries(kpilot_conduit_base ${QT_LIBRARIES} kpilot)
++target_link_libraries(kpilot_conduit_base ${QT_LIBRARIES} kpilot ${QT_QTXML_LIBRARY})
+ 
+ install(TARGETS kpilot_conduit_base LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+--- a/kpilot/kpilot/CMakeLists.txt
++++ b/kpilot/kpilot/CMakeLists.txt
+@@ -47,6 +47,7 @@
+ kde4_add_plugin(kcm_kpilot ${kcmpilot_SRCS})
+ 
+ target_link_libraries(kcm_kpilot
++${QT_QTDBUS_LIBRARY}
+ 	kpilot
+ 	${KDE4_KDEUI_LIBS}
+ )

More information about the pkg-kde-commits mailing list