rev 11178 - in branches/kde4/packages/kdebase/debian: . patches
Sune Vuorela
pusling-guest at alioth.debian.org
Sat Jun 28 20:07:56 UTC 2008
Author: pusling-guest
Date: 2008-06-28 20:07:56 +0000 (Sat, 28 Jun 2008)
New Revision: 11178
Modified:
branches/kde4/packages/kdebase/debian/changelog
branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff
Log:
kdebase4.0.84 - a bit of reworking of target_link_library patch was needed
Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog 2008-06-28 20:05:20 UTC (rev 11177)
+++ branches/kde4/packages/kdebase/debian/changelog 2008-06-28 20:07:56 UTC (rev 11178)
@@ -1,3 +1,9 @@
+kdebase (4:4.0.84-1) experimental; urgency=low
+
+ * New upstream snapshot
+
+ -- Sune Vuorela <debian at pusling.com> Sat, 28 Jun 2008 19:21:30 +0000
+
kdebase (4:4.0.82+svn819867-1) experimental; urgency=low
* New upstream development snapshot.
Modified: branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff 2008-06-28 20:05:20 UTC (rev 11177)
+++ branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff 2008-06-28 20:07:56 UTC (rev 11178)
@@ -1,3 +1,5 @@
+Index: b/apps/konqueror/src/CMakeLists.txt
+===================================================================
--- a/apps/konqueror/src/CMakeLists.txt
+++ b/apps/konqueror/src/CMakeLists.txt
@@ -13,6 +13,7 @@
@@ -12,20 +14,13 @@
qt4_add_dbus_adaptor(konquerorprivate_SRCS org.kde.Konqueror.HistoryManager.xml konqhistorymanager.h KonqHistoryManager konqhistorymanageradaptor KonqHistoryManagerAdaptor)
kde4_add_library(konquerorprivate SHARED ${konquerorprivate_SRCS})
--target_link_libraries(konquerorprivate ${KDE4_KPARTS_LIBS})
+-target_link_libraries(konquerorprivate ${KDE4_KPARTS_LIBS} ${ZLIB_LIBRARY})
+target_link_libraries(konquerorprivate ${KDE4_KPARTS_LIBS} ${QT_QTDBUS_LIBRARY} ${ZLIB_LIBRARY})
set_target_properties(konquerorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS konquerorprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
-@@ -83,7 +84,7 @@
- kde4_add_app_icon(konqueror_KDEINIT_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps
- /konqueror.png")
- kde4_add_kdeinit_executable(konqueror ${konqueror_KDEINIT_SRCS} konqmain.cpp)
--target_link_libraries(kdeinit_konqueror konquerorprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS})
-+target_link_libraries(kdeinit_konqueror konquerorprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${X11_X11_LIB})
-
- if (NOT WIN32)
- install(TARGETS kdeinit_konqueror ${INSTALL_TARGETS_DEFAULT_ARGS} )
+Index: b/apps/lib/konq/CMakeLists.txt
+===================================================================
--- a/apps/lib/konq/CMakeLists.txt
+++ b/apps/lib/konq/CMakeLists.txt
@@ -23,7 +23,7 @@
@@ -35,8 +30,10 @@
-target_link_libraries(konq ${KDE4_KPARTS_LIBS})
+target_link_libraries(konq ${KDE4_KPARTS_LIBS} ${QT_QTDBUS_LIBRARY})
- set_target_properties(konq PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
- install(TARGETS konq ${INSTALL_TARGETS_DEFAULT_ARGS})
+ set_target_properties(konq PROPERTIES
+ VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+Index: b/apps/lib/konq/favicons/CMakeLists.txt
+===================================================================
--- a/apps/lib/konq/favicons/CMakeLists.txt
+++ b/apps/lib/konq/favicons/CMakeLists.txt
@@ -4,7 +4,7 @@
@@ -48,17 +45,21 @@
install(TARGETS kded_favicons DESTINATION ${PLUGIN_INSTALL_DIR} )
+Index: b/apps/konqueror/client/CMakeLists.txt
+===================================================================
--- a/apps/konqueror/client/CMakeLists.txt
+++ b/apps/konqueror/client/CMakeLists.txt
@@ -16,7 +16,7 @@
target_link_libraries(kfmclient ${KDE4_KIO_LIBS} )
else (WIN32)
kde4_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS})
-- target_link_libraries(kdeinit_kfmclient ${KDE4_KIO_LIBS} )
+- target_link_libraries(kdeinit_kfmclient ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
+target_link_libraries(kdeinit_kfmclient ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} )
install(TARGETS kdeinit_kfmclient ${INSTALL_TARGETS_DEFAULT_ARGS} )
endif (WIN32)
+Index: b/apps/konqueror/preloader/CMakeLists.txt
+===================================================================
--- a/apps/konqueror/preloader/CMakeLists.txt
+++ b/apps/konqueror/preloader/CMakeLists.txt
@@ -13,7 +13,7 @@
@@ -70,6 +71,8 @@
install(TARGETS kded_konqy_preloader DESTINATION ${PLUGIN_INSTALL_DIR})
+Index: b/apps/konqueror/settings/kio/CMakeLists.txt
+===================================================================
--- a/apps/konqueror/settings/kio/CMakeLists.txt
+++ b/apps/konqueror/settings/kio/CMakeLists.txt
@@ -31,7 +31,7 @@
@@ -81,6 +84,8 @@
install(TARGETS kcm_kio DESTINATION ${PLUGIN_INSTALL_DIR} )
+Index: b/apps/konqueror/settings/konq/CMakeLists.txt
+===================================================================
--- a/apps/konqueror/settings/konq/CMakeLists.txt
+++ b/apps/konqueror/settings/konq/CMakeLists.txt
@@ -22,7 +22,7 @@
@@ -92,6 +97,8 @@
install(TARGETS kcm_konq DESTINATION ${PLUGIN_INSTALL_DIR} )
+Index: b/apps/konqueror/settings/konqhtml/CMakeLists.txt
+===================================================================
--- a/apps/konqueror/settings/konqhtml/CMakeLists.txt
+++ b/apps/konqueror/settings/konqhtml/CMakeLists.txt
@@ -18,7 +18,7 @@
@@ -103,6 +110,8 @@
install(TARGETS kcm_konqhtml DESTINATION ${PLUGIN_INSTALL_DIR} )
+Index: b/apps/konqueror/settings/performance/CMakeLists.txt
+===================================================================
--- a/apps/konqueror/settings/performance/CMakeLists.txt
+++ b/apps/konqueror/settings/performance/CMakeLists.txt
@@ -11,7 +11,7 @@
@@ -114,6 +123,8 @@
install(TARGETS kcm_performance DESTINATION ${PLUGIN_INSTALL_DIR} )
+Index: b/apps/kinfocenter/pci/CMakeLists.txt
+===================================================================
--- a/apps/kinfocenter/pci/CMakeLists.txt
+++ b/apps/kinfocenter/pci/CMakeLists.txt
@@ -10,14 +10,14 @@
@@ -142,6 +153,8 @@
endif(PCIUTILS_FOUND)
install(TARGETS kcm_pci DESTINATION ${PLUGIN_INSTALL_DIR})
+Index: b/apps/konqueror/kttsplugin/CMakeLists.txt
+===================================================================
--- a/apps/konqueror/kttsplugin/CMakeLists.txt
+++ b/apps/konqueror/kttsplugin/CMakeLists.txt
@@ -28,7 +28,7 @@
@@ -153,29 +166,33 @@
if( WEBKITKDE_FOUND)
target_link_libraries(khtmlkttsdplugin ${WEBKITKDE_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} )
+Index: b/apps/konsole/src/CMakeLists.txt
+===================================================================
--- a/apps/konsole/src/CMakeLists.txt
+++ b/apps/konsole/src/CMakeLists.txt
-@@ -82,7 +82,7 @@
+@@ -87,7 +87,7 @@
- kde4_add_kdeinit_executable( konsole ${konsole_KDEINIT_SRCS})
+ kde4_add_kdeinit_executable( konsole ${konsole_KDEINIT_SRCS})
--target_link_libraries(kdeinit_konsole ${KDE4_KPTY_LIBRARY} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBS} )
+- target_link_libraries(kdeinit_konsole ${KDE4_KPTY_LIBRARY} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBS} )
+target_link_libraries(kdeinit_konsole ${KDE4_KPTY_LIBRARY} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} )
- # XRender library for true transparency support
- if(X11_Xrender_FOUND)
-@@ -155,7 +155,7 @@
+ # XRender library for true transparency support
+ if(X11_Xrender_FOUND)
+@@ -122,7 +122,7 @@
- set_target_properties(konsolepart PROPERTIES DEFINE_SYMBOL KONSOLE_PART)
+ set_target_properties(konsolepart PROPERTIES DEFINE_SYMBOL KONSOLE_PART)
--target_link_libraries(konsolepart ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS})
+- target_link_libraries(konsolepart ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS})
+target_link_libraries(konsolepart ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB})
- if(X11_Xrender_FOUND)
- target_link_libraries(konsolepart ${X11_Xrender_LIB})
- endif(X11_Xrender_FOUND)
+
+ if(X11_Xrender_FOUND)
+ target_link_libraries(konsolepart ${X11_Xrender_LIB})
+Index: b/apps/nsplugins/CMakeLists.txt
+===================================================================
--- a/apps/nsplugins/CMakeLists.txt
+++ b/apps/nsplugins/CMakeLists.txt
-@@ -25,7 +25,7 @@
+@@ -34,7 +34,7 @@
kde4_add_plugin(libnsplugin ${nsplugins_PART_SRCS})
@@ -184,21 +201,8 @@
install(TARGETS libnsplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
---- a/apps/dolphin/src/CMakeLists.txt
-+++ b/apps/dolphin/src/CMakeLists.txt
-@@ -58,6 +58,12 @@
- configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
-
- target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${QIMAGEBLITZ_LIBRARIES})
-+if (X11_FOUND)
-+ target_link_libraries(dolphinprivate ${X11_X11_LIB})
-+endif (X11_FOUND)
-+if (X11_Xext_FOUND)
-+ target_link_libraries(dolphinprivate ${X11_Xext_LIB})
-+endif (X11_Xext_FOUND)
- if(X11_Xrender_FOUND)
- target_link_libraries(dolphinprivate ${X11_Xrender_LIB} )
- endif(X11_Xrender_FOUND)
+Index: b/apps/konqueror/settings/filetypes/CMakeLists.txt
+===================================================================
--- a/apps/konqueror/settings/filetypes/CMakeLists.txt
+++ b/apps/konqueror/settings/filetypes/CMakeLists.txt
@@ -18,7 +18,7 @@
More information about the pkg-kde-commits
mailing list