File r899971.diff of Package kdepim4
Subject: reduce linkage
From: wstephenson@suse.de
Bug:
Patch-upstream: 899971
--- kresources/egroupware/CMakeLists.txt (revision 899970)
+++ kresources/egroupware/CMakeLists.txt (revision 899971)
@@ -20,7 +20,7 @@ kde4_add_kcfg_files(kabc_xmlrpc_LIB_SRCS
kde4_add_library(kabc_xmlrpc SHARED ${kabc_xmlrpc_LIB_SRCS})
-target_link_libraries(kabc_xmlrpc ${KDE4_KIO_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KCAL_LIBS} kdepim kabcommon )
+target_link_libraries(kabc_xmlrpc ${KDE4_KIO_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KCAL_LIBS} kdepim kabcommon ${KDE4_KDE3SUPPORT_LIBS})
set_target_properties(kabc_xmlrpc PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kabc_xmlrpc DESTINATION ${LIB_INSTALL_DIR})
@@ -37,7 +37,7 @@ kde4_add_kcfg_files(kcal_xmlrpc_LIB_SRCS
kde4_add_library(kcal_xmlrpc SHARED ${kcal_xmlrpc_LIB_SRCS})
-target_link_libraries(kcal_xmlrpc ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} kdepim ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kcal_xmlrpc ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} kdepim ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
set_target_properties(kcal_xmlrpc PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kcal_xmlrpc DESTINATION ${LIB_INSTALL_DIR})
@@ -54,7 +54,7 @@ kde4_add_kcfg_files(knotes_xmlrpc_LIB_SR
kde4_add_library(knotes_xmlrpc SHARED ${knotes_xmlrpc_LIB_SRCS})
set_target_properties(knotes_xmlrpc PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-target_link_libraries(knotes_xmlrpc ${KDE4_KCAL_LIBS} kdepim ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(knotes_xmlrpc ${KDE4_KCAL_LIBS} kdepim ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
install(TARGETS knotes_xmlrpc DESTINATION ${LIB_INSTALL_DIR})
--- kresources/groupwise/CMakeLists.txt (revision 899970)
+++ kresources/groupwise/CMakeLists.txt (revision 899971)
@@ -30,7 +30,7 @@ set( kcal_groupwise_plugin_SRCS kcal_res
kde4_add_plugin(kcal_groupwise ${kcal_groupwise_plugin_SRCS})
-target_link_libraries(kcal_groupwise ${KDE4_KDECORE_LIBS} kcalgroupwise ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KRESOURCES_LIBS})
+target_link_libraries(kcal_groupwise ${KDE4_KDECORE_LIBS} kcalgroupwise ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KRESOURCES_LIBS})
install(TARGETS kcal_groupwise DESTINATION ${PLUGIN_INSTALL_DIR})
@@ -43,7 +43,7 @@ kde4_add_kcfg_files(kabc_groupwise_LIB_S
kde4_add_library(kabcgroupwise SHARED ${kabc_groupwise_LIB_SRCS})
-target_link_libraries(kabcgroupwise ${KDE4_KDECORE_LIBS} gwsoap ${KDE4_KCAL_LIBS} kdepim ${KDE4_KABC_LIBS} ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kabcgroupwise ${KDE4_KDECORE_LIBS} gwsoap ${KDE4_KCAL_LIBS} kdepim ${KDE4_KABC_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
set_target_properties(kabcgroupwise PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kabcgroupwise DESTINATION ${LIB_INSTALL_DIR})
@@ -55,7 +55,7 @@ set( kabc_groupwise_plugin_SRCS kabc_res
kde4_add_plugin(kabc_groupwise ${kabc_groupwise_plugin_SRCS})
-target_link_libraries(kabc_groupwise ${KDE4_KDECORE_LIBS} kabcgroupwise ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KRESOURCES_LIBS})
+target_link_libraries(kabc_groupwise ${KDE4_KDECORE_LIBS} kabcgroupwise ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KRESOURCES_LIBS})
install(TARGETS kabc_groupwise DESTINATION ${PLUGIN_INSTALL_DIR})
--- kresources/slox/CMakeLists.txt (revision 899970)
+++ kresources/slox/CMakeLists.txt (revision 899971)
@@ -19,7 +19,7 @@ set(kslox_LIB_SRCS
kde4_add_library(kslox SHARED ${kslox_LIB_SRCS})
-target_link_libraries(kslox ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} ${QT_QT3SUPPORT_LIBRARY} kdepim )
+target_link_libraries(kslox ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} kdepim )
set_target_properties(kslox PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kslox DESTINATION ${LIB_INSTALL_DIR})
--- kresources/lib/CMakeLists.txt (revision 899970)
+++ kresources/lib/CMakeLists.txt (revision 899971)
@@ -31,7 +31,7 @@ kde4_add_kcfg_files(kgroupwarebase_LIB_S
kde4_add_library(kgroupwarebase SHARED ${kgroupwarebase_LIB_SRCS})
-target_link_libraries(kgroupwarebase ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} ${QT_QT3SUPPORT_LIBRARY} kdepim )
+target_link_libraries(kgroupwarebase ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} kdepim )
set_target_properties(kgroupwarebase PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kgroupwarebase DESTINATION ${LIB_INSTALL_DIR})
--- kmail/CMakeLists.txt (revision 899970)
+++ kmail/CMakeLists.txt (revision 899971)
@@ -263,7 +263,7 @@ if(WIN32)
endif(WIN32)
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} ${KDE4_KIO_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KPIMUTILS_LIBS})
+kdepim4_link_unique_libraries(kmailprivate ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_KLDAP_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} ${KDE4_KIO_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KPIMUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS})
if(WIN32)
kdepim4_link_unique_libraries(kmailprivate ${SQLITE_LIBRARIES})
endif(WIN32)
@@ -300,7 +300,7 @@ qt4_add_dbus_interfaces( kmailpart_PART_
kde4_add_plugin(kmailpart ${kmailpart_PART_SRCS})
-kdepim4_link_unique_libraries(kmailpart ${KDE4_KDECORE_LIBS} kmailprivate ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} )
+kdepim4_link_unique_libraries(kmailpart ${KDE4_KDECORE_LIBS} kmailprivate ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${QT_QT3SUPPORT_LIBRARY})
install(TARGETS kmailpart DESTINATION ${PLUGIN_INSTALL_DIR})
--- kaddressbook/views/CMakeLists.txt (revision 899970)
+++ kaddressbook/views/CMakeLists.txt (revision 899971)
@@ -21,7 +21,7 @@ kde4_add_plugin(kaddrbk_cardview ${kaddr
-target_link_libraries(kaddrbk_cardview kaddressbookprivate kabcommon kdepim ${KDE4_KABC_LIBS} ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kaddrbk_cardview kaddressbookprivate kabcommon kdepim ${KDE4_KABC_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
install(TARGETS kaddrbk_cardview DESTINATION ${PLUGIN_INSTALL_DIR})
@@ -35,7 +35,7 @@ kde4_add_plugin(kaddrbk_iconview ${kaddr
-target_link_libraries(kaddrbk_iconview kaddressbookprivate kabcommon ${KDE4_KABC_LIBS} ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kaddrbk_iconview kaddressbookprivate kabcommon ${KDE4_KABC_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
install(TARGETS kaddrbk_iconview DESTINATION ${PLUGIN_INSTALL_DIR})
@@ -49,7 +49,7 @@ kde4_add_plugin(kaddrbk_tableview ${kadd
-target_link_libraries(kaddrbk_tableview kaddressbookprivate kabcommon kimproxy ${KDE4_KABC_LIBS} ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kaddrbk_tableview kaddressbookprivate kabcommon kimproxy ${KDE4_KABC_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
install(TARGETS kaddrbk_tableview DESTINATION ${PLUGIN_INSTALL_DIR})
--- kaddressbook/CMakeLists.txt (revision 899970)
+++ kaddressbook/CMakeLists.txt (revision 899971)
@@ -150,7 +150,7 @@ QT4_ADD_DBUS_INTERFACE(kaddressbook_LIB_
kde4_add_library(kaddressbookprivate SHARED ${kaddressbook_LIB_SRCS})
-kdepim4_link_unique_libraries(kaddressbookprivate ${KDE4_SYNDICATION_LIBS} kdepim ${KDE4_KCAL_LIBS} kabc_file_core ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} kabinterfaces kabcommon ${QT_QT3SUPPORT_LIBRARY} kimproxy)
+kdepim4_link_unique_libraries(kaddressbookprivate ${KDE4_SYNDICATION_LIBS} kdepim ${KDE4_KCAL_LIBS} ${KDE4_KLDAP_LIBS} ${KDE4_KPIMUTILS_LIBS} kabc_file_core ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} kabinterfaces kabcommon ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} kimproxy)
set_target_properties(kaddressbookprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kaddressbookprivate DESTINATION ${LIB_INSTALL_DIR})
--- plugins/kmail/bodypartformatter/CMakeLists.txt (revision 899970)
+++ plugins/kmail/bodypartformatter/CMakeLists.txt (revision 899971)
@@ -31,7 +31,7 @@ kde4_add_plugin(kmail_bodypartformatter_
-kdepim4_link_unique_libraries(kmail_bodypartformatter_text_calendar ${KDE4_KPIMUTILS_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} kmailprivate kdepim ${QT_QT3SUPPORT_LIBRARY})
+kdepim4_link_unique_libraries(kmail_bodypartformatter_text_calendar ${KDE4_KPIMUTILS_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} kmailprivate kdepim ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
install(TARGETS kmail_bodypartformatter_text_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
--- kitchensync/src/CMakeLists.txt (revision 899970)
+++ kitchensync/src/CMakeLists.txt (revision 899971)
@@ -71,7 +71,7 @@ KDE4_ADD_LIBRARY(kitchensyncprivate SHAR
TARGET_LINK_LIBRARIES(kitchensyncprivate ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY}
${KDE4_KDEKIO_LIBRARY} ${KDE4_KHTML_LIBRARY}
- kabc kcal kdepim qopensync )
+ kabc kcal kldap kdepim qopensync ${KDE4_KDE3SUPPORT_LIBS})
SET_TARGET_PROPERTIES(kitchensyncprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
INSTALL(TARGETS kitchensyncprivate DESTINATION ${LIB_INSTALL_DIR} )
--- kontact/plugins/knotes/CMakeLists.txt (revision 899970)
+++ kontact/plugins/knotes/CMakeLists.txt (revision 899971)
@@ -12,7 +12,7 @@ qt4_add_dbus_adaptor(kontact_knotesplugi
kde4_add_plugin(kontact_knotesplugin ${kontact_knotesplugin_PART_SRCS})
-kdepim4_link_unique_libraries(kontact_knotesplugin kontactinterfaces kdepim ${KDE4_KCAL_LIBS} ${KDE4_KRESOURCES_LIBS} ${KDE4_KDEPRINT_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KPARTS_LIBS})
+kdepim4_link_unique_libraries(kontact_knotesplugin kontactinterfaces kdepim ${KDE4_KCAL_LIBS} ${KDE4_KRESOURCES_LIBS} ${KDE4_KDEPRINT_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS})
########### install files ###############
--- korganizer/CMakeLists.txt (revision 899970)
+++ korganizer/CMakeLists.txt (revision 899971)
@@ -116,7 +116,7 @@ set(korganizer_calendar_LIB_SRCS stdcale
kde4_add_library(korganizer_calendar SHARED ${korganizer_calendar_LIB_SRCS})
-target_link_libraries(korganizer_calendar ${KDE4_KPARTS_LIBS} ${KDE4_KCAL_LIBS} kdepim)
+target_link_libraries(korganizer_calendar ${KDE4_KPARTS_LIBS} ${KDE4_KCAL_LIBS} kdepim ${KDE4_KDE3SUPPORT_LIBS})
set_target_properties(korganizer_calendar PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS korganizer_calendar DESTINATION ${LIB_INSTALL_DIR})
Index: kresources/egroupware/CMakeLists.txt
===================================================================
Index: kresources/groupwise/CMakeLists.txt
===================================================================
Index: kresources/slox/CMakeLists.txt
===================================================================
Index: kresources/lib/CMakeLists.txt
===================================================================
Index: kmail/CMakeLists.txt
===================================================================
Index: kaddressbook/views/CMakeLists.txt
===================================================================
Index: kaddressbook/CMakeLists.txt
===================================================================
Index: plugins/kmail/bodypartformatter/CMakeLists.txt
===================================================================
Index: kitchensync/src/CMakeLists.txt
===================================================================
Index: kontact/plugins/knotes/CMakeLists.txt
===================================================================
Index: korganizer/CMakeLists.txt
===================================================================
