rev 11317 - branches/kde4/packages/kdelibs/debian/patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Sat Jul 5 01:15:01 UTC 2008


Author: ana
Date: 2008-07-05 01:15:01 +0000 (Sat, 05 Jul 2008)
New Revision: 11317

Modified:
   branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
Log:
revert, redoing better


Modified: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-07-05 01:03:55 UTC (rev 11316)
+++ branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-07-05 01:15:01 UTC (rev 11317)
@@ -59,11 +59,26 @@
  kde4_add_plugin(katepart ${katepart_PART_SRCS})
  
  # linking
--target_link_libraries(katepart ${KDE4_KDECORE_LIBS} kparts kutils ktexteditor kde3support ${QT_QTSCRIPT_LIBRARY})
-+target_link_libraries(katepart ${KDE4_KDECORE_LIBS} kparts kutils ktexteditor kde3support ${QT_QTSCRIPT_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} )
+-target_link_libraries(katepart ${KDE4_KDECORE_LIBS} kutils ktexteditor kde3support ${QT_QTSCRIPT_LIBRARY})
++target_link_libraries(katepart ${KDE4_KDECORE_LIBS} kutils ktexteditor kde3support ${QT_QTSCRIPT_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} )
  
  if(KDE4_ENABLE_FINAL)
  	macro_add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/katepart_final_cpp.cpp )
+Index: b/kde3support/CMakeLists.txt
+===================================================================
+--- a/kde3support/CMakeLists.txt
++++ b/kde3support/CMakeLists.txt
+@@ -78,7 +78,9 @@
+ 
+ kde4_add_library(kde3support SHARED ${kde3support_LIB_SRCS})
+ 
+-target_link_libraries(kde3support  ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS})
++target_link_libraries(kde3support  ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY}
++   ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS} ${X11_X11_LIB} )
++set_target_properties(kde3support PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kdeui;${QT_QTGUI_LIBRARY};kio;${QT_QT3SUPPORT_LIBRARY}")
+ 
+ set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kde3support ${INSTALL_TARGETS_DEFAULT_ARGS})
 Index: b/kdecore/CMakeLists.txt
 ===================================================================
 --- a/kdecore/CMakeLists.txt
@@ -92,8 +107,8 @@
  
  kde4_add_kdeinit_executable(kded4  ${kded_KDEINIT_SRCS})
  
--target_link_libraries(kdeinit_kded4  ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
-+target_link_libraries(kdeinit_kded4  ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${QT_QTDBUS_LIBRARY} )
+-target_link_libraries(kdeinit_kded4  ${KDE4_KIO_LIBS} )
++target_link_libraries(kdeinit_kded4  ${KDE4_KIO_LIBS} ${X11_X11_LIB} ${QT_QTDBUS_LIBRARY} )
  
  install(TARGETS kdeinit_kded4 ${INSTALL_TARGETS_DEFAULT_ARGS})
  
@@ -132,12 +147,23 @@
  
  if(MINGW)
     target_link_libraries(kdeui gdi32)
+@@ -315,6 +316,10 @@
+    target_link_libraries(kdeui ${X11_Xrender_LIB})
+ endif(X11_Xrender_FOUND)
+ 
++if (X11_ICE_FOUND)
++   target_link_libraries(kdeui ${X11_X_PRE_LIBS} ${X11_ICE_LIB})
++endif(X11_ICE_FOUND)
++
+ set_target_properties(kdeui PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+ install(TARGETS kdeui ${INSTALL_TARGETS_DEFAULT_ARGS})
+ ########### install files ###############
 @@ -548,7 +553,7 @@
  endif ( Q_WS_QWS )
  
  kde4_add_plugin( kded_globalaccel ${kded_globalaccel_SRCS} )
--target_link_libraries(kded_globalaccel ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
-+target_link_libraries(kded_globalaccel ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${QT_QTDBUS_LIBRARY})
+-target_link_libraries(kded_globalaccel ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kded_globalaccel ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${X11_X11_LIB} ${QT_QTDBUS_LIBRARY})
  
  install( TARGETS kded_globalaccel DESTINATION ${PLUGIN_INSTALL_DIR} )
  
@@ -163,8 +189,8 @@
  
  kde4_add_library(khtml SHARED ${khtml_LIB_SRCS})
  
--target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} ${X11_LIBRARIES})
-+target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${X11_LIBRARIES}
+-target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} )
++target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${X11_X11_LIB}
 +   ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES}
 +   ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY}
 +   )
@@ -194,6 +220,19 @@
  
  install(TARGETS kjavaappletviewer  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
+Index: b/khtml/kmultipart/CMakeLists.txt
+===================================================================
+--- a/khtml/kmultipart/CMakeLists.txt
++++ b/khtml/kmultipart/CMakeLists.txt
+@@ -9,7 +9,7 @@
+ 
+ kde4_add_plugin(kmultipart WITH_PREFIX ${kmultipart_PART_SRCS})
+ 
+-target_link_libraries(kmultipart  ${KDE4_KPARTS_LIBS} )
++target_link_libraries(kmultipart  ${KDE4_KPARTS_LIBS} ${ZLIB_LIBRARY} )
+ 
+ install(TARGETS kmultipart  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
 Index: b/kinit/CMakeLists.txt
 ===================================================================
 --- a/kinit/CMakeLists.txt
@@ -202,11 +241,27 @@
  kde4_add_kdeinit_executable( klauncher NOGUI ${klauncher_KDEINIT_SRCS})
  set_target_properties(kdeinit_klauncher PROPERTIES DEFINE_SYMBOL MAKE_KLAUNCHER)
  
--target_link_libraries(kdeinit_klauncher  ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
-+target_link_libraries(kdeinit_klauncher  ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${QT_QTDBUS_LIBRARY} )
+-target_link_libraries(kdeinit_klauncher  ${KDE4_KIO_LIBS} )
++target_link_libraries(kdeinit_klauncher  ${KDE4_KIO_LIBS} ${X11_X11_LIB} ${QT_QTDBUS_LIBRARY} )
  
  install(TARGETS kdeinit_klauncher ${INSTALL_TARGETS_DEFAULT_ARGS})
  
+Index: b/kio/CMakeLists.txt
+===================================================================
+--- a/kio/CMakeLists.txt
++++ b/kio/CMakeLists.txt
+@@ -236,7 +236,10 @@
+ 
+ kde4_add_library(kio SHARED ${kio_LIB_SRCS})
+ 
+-target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${ZLIB_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY} ${KDE4_SOLID_LIBS})
++target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${QT_QTNETWORK_LIBRARY} ${X11_X11_LIB}
++  ${ZLIB_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_SOLID_LIBS}
++  ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} )
++set_target_properties(kio PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};kdecore;kdeui")
+ 
+ 
+ set(SYS_INOTIFY_H_FOUND 0)
 Index: b/kio/misc/kpac/CMakeLists.txt
 ===================================================================
 --- a/kio/misc/kpac/CMakeLists.txt
@@ -254,7 +309,7 @@
  
  kde4_add_kdeinit_executable( kio_http_cache_cleaner NOGUI ${kio_http_cache_cleaner_KDEINIT_SRCS})
  
--target_link_libraries(kdeinit_kio_http_cache_cleaner  ${KDE4_KIO_LIBS} ${ZLIB_LIBRARY})
+-target_link_libraries(kdeinit_kio_http_cache_cleaner  ${KDE4_KIO_LIBS} )
 +target_link_libraries(kdeinit_kio_http_cache_cleaner  ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} ${ZLIB_LIBRARY} )
  
  install(TARGETS kdeinit_kio_http_cache_cleaner ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -263,7 +318,7 @@
  
  kde4_add_plugin(kio_http ${kio_http_PART_SRCS})
  
--target_link_libraries(kio_http ${KDE4_KIO_LIBS} kntlm ${ZLIB_LIBRARY} )
+-target_link_libraries(kio_http ${KDE4_KIO_LIBS} kntlm )
 +target_link_libraries(kio_http ${KDE4_KIO_LIBS} kntlm ${ZLIB_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY})
  if(GSSAPI_FOUND)
    target_link_libraries(kio_http ${GSSAPI_LIBS} )
@@ -285,8 +340,8 @@
  
  kde4_add_plugin(kded_kcookiejar ${kded_kcookiejar_PART_SRCS})
  
--target_link_libraries(kded_kcookiejar  ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
-+target_link_libraries(kded_kcookiejar  ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES} ${QT_QTDBUS_LIBRARY} )
+-target_link_libraries(kded_kcookiejar  ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
++target_link_libraries(kded_kcookiejar  ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${X11_X11_LIB} ${QT_QTDBUS_LIBRARY} )
  
  install(TARGETS kded_kcookiejar  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
@@ -354,6 +409,20 @@
  
  set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kpty ${INSTALL_TARGETS_DEFAULT_ARGS})
+Index: b/kross/core/CMakeLists.txt
+===================================================================
+--- a/kross/core/CMakeLists.txt
++++ b/kross/core/CMakeLists.txt
+@@ -11,7 +11,8 @@
+ )
+ 
+ kde4_add_library(krosscore SHARED ${krosscore_LIB_SRCS})
+-target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY})
++target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTXML_LIBRARY})
++set_target_properties(krosscore PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTSCRIPT_LIBRARY};${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY}")
+ set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS krosscore ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
 Index: b/kross/modules/CMakeLists.txt
 ===================================================================
 --- a/kross/modules/CMakeLists.txt
@@ -378,6 +447,20 @@
  set_target_properties(krossqtsplugin PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
  install(TARGETS krossqtsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/script)
  
+Index: b/kross/ui/CMakeLists.txt
+===================================================================
+--- a/kross/ui/CMakeLists.txt
++++ b/kross/ui/CMakeLists.txt
+@@ -14,7 +14,8 @@
+    )
+ 
+ kde4_add_library(krossui SHARED ${krossui_LIB_SRCS})
+-target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS})
++target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY})
++set_target_properties(krossui PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY};kparts")
+ set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS krossui ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
 Index: b/kutils/CMakeLists.txt
 ===================================================================
 --- a/kutils/CMakeLists.txt




More information about the pkg-kde-commits mailing list