rev 11461 - in branches/kde4/packages/kdenetwork/debian: . patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Thu Jul 10 23:13:14 UTC 2008


Author: ana
Date: 2008-07-10 23:13:14 +0000 (Thu, 10 Jul 2008)
New Revision: 11461

Modified:
   branches/kde4/packages/kdenetwork/debian/changelog
   branches/kde4/packages/kdenetwork/debian/patches/97_fix_target_link_libraries.diff
Log:
more updates on kdenetwork


Modified: branches/kde4/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde4/packages/kdenetwork/debian/changelog	2008-07-10 22:31:20 UTC (rev 11460)
+++ branches/kde4/packages/kdenetwork/debian/changelog	2008-07-10 23:13:14 UTC (rev 11461)
@@ -1,6 +1,7 @@
-kdenetwork (4:4.0.98-0) experimental; urgency=low
+kdenetwork (4:4.0.98-0) UNRELEASED; urgency=low
 
   * New upstream release, Release Candidate 1.
+  * Update 97_fix_target_link_libraries.diff
 
  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 10 Jul 2008 02:32:24 +0200
 

Modified: branches/kde4/packages/kdenetwork/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdenetwork/debian/patches/97_fix_target_link_libraries.diff	2008-07-10 22:31:20 UTC (rev 11460)
+++ branches/kde4/packages/kdenetwork/debian/patches/97_fix_target_link_libraries.diff	2008-07-10 23:13:14 UTC (rev 11461)
@@ -1,31 +1,14 @@
-Index: b/kget/CMakeLists.txt
-===================================================================
---- a/kget/CMakeLists.txt
-+++ b/kget/CMakeLists.txt
-@@ -71,7 +71,7 @@
+--- a/kopete/libkopete/CMakeLists.txt
++++ b/kopete/libkopete/CMakeLists.txt
+@@ -131,7 +131,7 @@
  
- kde4_add_library(kgetcore SHARED ${kgetcore_SRCS})
+ kde4_add_library(kopete SHARED ${kopete_LIB_SRCS})
  
--target_link_libraries(kgetcore ${KDE4_KIO_LIBS})
-+target_link_libraries(kgetcore ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY})
- 
- if (HAVE_NEPOMUK)
-   target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
-Index: b/kget/extensions/konqueror/CMakeLists.txt
-===================================================================
---- a/kget/extensions/konqueror/CMakeLists.txt
-+++ b/kget/extensions/konqueror/CMakeLists.txt
-@@ -22,7 +22,7 @@
- 
- kde4_add_plugin(khtml_kget ${khtml_kget_SRCS})
- 
--target_link_libraries(khtml_kget ${KDE4_KHTML_LIBS})
-+target_link_libraries(khtml_kget ${KDE4_KHTML_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTCORE_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KPARTS_LIBRARY} ${KDE4_KIO_LIBRARY})
- 
- if( WEBKITKDE_FOUND)
-     target_link_libraries(khtml_kget ${WEBKITKDE_LIBRARIES} ${QT_QTWEBKIT_LIBRARY})
-Index: b/kopete/kopete/chatwindow/CMakeLists.txt
-===================================================================
+-target_link_libraries(kopete ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KABC_LIBS})
++target_link_libraries(kopete ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KABC_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB})
+ if(Q_WS_X11 AND X11_Xss_FOUND)
+    target_link_libraries(kopete ${X11_Xss_LIB})
+ endif(Q_WS_X11 AND X11_Xss_FOUND)
 --- a/kopete/kopete/chatwindow/CMakeLists.txt
 +++ b/kopete/kopete/chatwindow/CMakeLists.txt
 @@ -32,7 +32,7 @@
@@ -37,21 +20,6 @@
  
  install(TARGETS krichtexteditpart  DESTINATION ${PLUGIN_INSTALL_DIR})
  
-Index: b/kopete/plugins/highlight/CMakeLists.txt
-===================================================================
---- a/kopete/plugins/highlight/CMakeLists.txt
-+++ b/kopete/plugins/highlight/CMakeLists.txt
-@@ -28,7 +28,7 @@
- kde4_add_plugin(kcm_kopete_highlight ${kcm_kopete_highlight_PART_SRCS})
- 
- 
--target_link_libraries(kcm_kopete_highlight ${KDE4_KUTILS_LIBS}  ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
-+target_link_libraries(kcm_kopete_highlight ${KDE4_KUTILS_LIBS}  ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTXML_LIBRARY} )
- 
- install(TARGETS kcm_kopete_highlight  DESTINATION ${PLUGIN_INSTALL_DIR})
- 
-Index: b/kopete/plugins/latex/CMakeLists.txt
-===================================================================
 --- a/kopete/plugins/latex/CMakeLists.txt
 +++ b/kopete/plugins/latex/CMakeLists.txt
 @@ -32,7 +32,7 @@
@@ -63,55 +31,23 @@
  
  install(TARGETS kcm_kopete_latex  DESTINATION ${PLUGIN_INSTALL_DIR})
  
-Index: b/kdnssd/kdedmodule/CMakeLists.txt
-===================================================================
---- a/kdnssd/kdedmodule/CMakeLists.txt
-+++ b/kdnssd/kdedmodule/CMakeLists.txt
-@@ -8,7 +8,7 @@
+--- a/kopete/plugins/highlight/CMakeLists.txt
++++ b/kopete/plugins/highlight/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ kde4_add_plugin(kopete_highlight ${kopete_highlight_PART_SRCS})
  
- kde4_add_plugin(kded_dnssdwatcher ${kded_dnssdwatcher_PART_SRCS})
  
--target_link_libraries(kded_dnssdwatcher  ${KDE4_KIO_LIBS} ${KDE4_KDNSSD_LIBS} )
-+target_link_libraries(kded_dnssdwatcher  ${KDE4_KIO_LIBS} ${KDE4_KDNSSD_LIBS} ${QT_QTDBUS_LIBRARY} )
+-target_link_libraries(kopete_highlight  ${KDE4_KDECORE_LIBS} kopete )
++target_link_libraries(kopete_highlight  ${KDE4_KDECORE_LIBS} kopete ${KDE4_KDEUI_LIBRARY})
  
- install(TARGETS kded_dnssdwatcher  DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(TARGETS kopete_highlight  DESTINATION ${PLUGIN_INSTALL_DIR})
  
-Index: b/kget/plasma/engine/CMakeLists.txt
-===================================================================
---- a/kget/plasma/engine/CMakeLists.txt
-+++ b/kget/plasma/engine/CMakeLists.txt
-@@ -7,7 +7,7 @@
- qt4_add_dbus_interface(kget_engine_SRCS ../../../kget/org.kde.kget.xml kget_interface)
+@@ -28,7 +28,7 @@
+ kde4_add_plugin(kcm_kopete_highlight ${kcm_kopete_highlight_PART_SRCS})
  
- kde4_add_plugin(plasma_engine_kget ${kget_engine_SRCS})
--target_link_libraries(plasma_engine_kget ${KDE4_KDECORE_LIBS} ${PLASMA_LIBS})
-+target_link_libraries(plasma_engine_kget ${KDE4_KDECORE_LIBS} ${PLASMA_LIBS} ${QT_QTDBUS_LIBRARY})
  
- install(TARGETS plasma_engine_kget DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES plasma-engine-kget.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-Index: b/kget/transfer-plugins/bittorrent/CMakeLists.txt
-===================================================================
---- a/kget/transfer-plugins/bittorrent/CMakeLists.txt
-+++ b/kget/transfer-plugins/bittorrent/CMakeLists.txt
-@@ -238,7 +238,7 @@
- if (GMP_FOUND AND QCA2_FOUND AND ENABLE_EMBEDDED_TORRENT_SUPPORT)
-     kde4_add_kcfg_files(kget_bittorrentfactory_PART_SRCS bittorrentsettings.kcfgc)
-     kde4_add_plugin(kget_bittorrentfactory ${kget_bittorrentfactory_PART_SRCS} ${libbtcore_SRC})
--    target_link_libraries(kget_bittorrentfactory ${KDE4_KDEUI_LIBS} ${GMP_LIBRARIES} ${QCA2_LIBRARIES} kgetcore)
-+    target_link_libraries(kget_bittorrentfactory ${KDE4_KDEUI_LIBS} ${GMP_LIBRARIES} ${QCA2_LIBRARIES} kgetcore ${QT_QTNETWORK_LIBRARY})
-     install(TARGETS kget_bittorrentfactory DESTINATION  ${PLUGIN_INSTALL_DIR})
-     install(FILES kget_bittorrentfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- else (GMP_FOUND AND QCA2_FOUND AND ENABLE_EMBEDDED_TORRENT_SUPPORT)
-Index: b/kopete/libkopete/CMakeLists.txt
-===================================================================
---- a/kopete/libkopete/CMakeLists.txt
-+++ b/kopete/libkopete/CMakeLists.txt
-@@ -131,7 +131,7 @@
+-target_link_libraries(kcm_kopete_highlight ${KDE4_KUTILS_LIBS}  ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
++target_link_libraries(kcm_kopete_highlight ${KDE4_KUTILS_LIBS}  ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KDEUI_LIBS})
  
- kde4_add_library(kopete SHARED ${kopete_LIB_SRCS})
+ install(TARGETS kcm_kopete_highlight  DESTINATION ${PLUGIN_INSTALL_DIR})
  
--target_link_libraries(kopete ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KABC_LIBS})
-+target_link_libraries(kopete ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KABC_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB})
- if(Q_WS_X11 AND X11_Xss_FOUND)
-    target_link_libraries(kopete ${X11_Xss_LIB})
- endif(Q_WS_X11 AND X11_Xss_FOUND)




More information about the pkg-kde-commits mailing list