rev 10208 - in branches/kde4/packages/kdelibs/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sun Apr 20 18:06:17 UTC 2008
Author: modax-guest
Date: 2008-04-20 18:06:17 +0000 (Sun, 20 Apr 2008)
New Revision: 10208
Added:
branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff
branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
Removed:
branches/kde4/packages/kdelibs/debian/patches/97_cmake26_imported_link_interfaces.diff
Modified:
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/control
branches/kde4/packages/kdelibs/debian/patches/series
Log:
* 97_ patch split, add back support for cmake 2.4 (using the old way)
* More tweaks
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2008-04-20 16:24:36 UTC (rev 10207)
+++ branches/kde4/packages/kdelibs/debian/changelog 2008-04-20 18:06:17 UTC (rev 10208)
@@ -22,15 +22,15 @@
set from #include's of the public headers.
* Add 18_always_set_cmake_policy.diff patch to set CMake policy settings
regardless of KDE_FOUND value.
- * Introduce 97_cmake26_imported_link_interfaces.diff which messes up with
- upstream build system a bit with the intention to reduce excess linkage:
- - Most changes need cmake 2.6 or later. Make kdelibs5-dev depend on
+ * Introduce 97_use_imported_targets_with_cmake26.diff which changes the way
+ libraries dependences are exported when built with CMake 2.6:
+ - Rationale behind this is to reduce excess linkage.
+ - Build-depend on cmake 2.6 or later. Make kdelibs5-dev depend on
cmake 2.6.
- - Make use of LINK_INTERFACE_LIBRARIES target property to control which
- libraries are exported via link interface (probably needs more tweaking).
- - Do not use export_library_dependencies() to export library dependences.
- This method was the main source of excess linkage problems. Use a brand
- new install(EXPORT) instead which supports LINK_INTERFACE_LIBRARIES.
+ - Do not use export_library_dependencies() to export library dependences
+ with CMake 2.6. This method was the main source of excess linkage
+ problems. Use a brand new install(EXPORT) instead which supports
+ LINK_INTERFACE_LIBRARIES.
- Due to the change above, add "EXPORT kdelibs" property for all public
install(TARGETS).
- Rewrite the part of FindKDE4Install.cmake which deals with
@@ -39,10 +39,19 @@
make each KDE4_*_LIBS variable refer to the IMPORTED target of the
respective public KDE library. KDE4_*_LIBRARY semantics were not changed
and they still point to the result of find_library().
+ * Add 98_link_interface_libraries.diff which:
+ - Tweaks target_link_libraries() calls where dependences where were
+ missing.
+ - Makes use of LINK_INTERFACE_LIBRARIES target property to control which
+ libraries are exported via link interface (property values probably need
+ more tweaking). This is CMake 2.6 or only, ignored for CMake 2.4.
* Make kdelibs shlibs "dynamic" and ensure kdebase-runtime from KDE 4.1
series is used as runtime dependency.
+ * Build-depend on libglu1-mesa-dev as libqt4-dev 4.4.0~rc1-5 is dropping it
+ from Depends.
+ * Add myself to Uploaders.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 20 Apr 2008 13:47:52 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 20 Apr 2008 20:03:34 +0300
kde4libs (4:4.0.68+svn794641-1) experimental; urgency=low
Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control 2008-04-20 16:24:36 UTC (rev 10207)
+++ branches/kde4/packages/kdelibs/debian/control 2008-04-20 18:06:17 UTC (rev 10208)
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0~), shared-mime-info,
libcupsys2-dev, libdbus-1-dev, libqt4-dev (>= 4.4.0~),
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@ -11,7 +11,8 @@
libsoprano-dev (>= 2.0.97~), libstreamanalyzer-dev (>= 0.5.8-2),
libxml2-dev, libxml2-utils, libxslt1-dev, libxtst-dev, libgif-dev,
libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,
- libjasper-dev, libopenexr-dev, libpcre3-dev, libtiff4-dev, hspell, xsltproc
+ libjasper-dev, libopenexr-dev, libpcre3-dev, libtiff4-dev, hspell, xsltproc,
+ libglu1-mesa-dev
Standards-Version: 3.7.3
Homepage: http://www.kde.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdelibs
Deleted: branches/kde4/packages/kdelibs/debian/patches/97_cmake26_imported_link_interfaces.diff
Added: branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff 2008-04-20 18:06:17 UTC (rev 10208)
@@ -0,0 +1,494 @@
+--- kde4libs-4.0.70+svn798712.orig/cmake/modules/FindKDE4Internal.cmake 2008-04-20 17:34:32.000000000 +0000
++++ kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake 2008-04-20 17:52:12.000000000 +0000
+@@ -213,8 +213,8 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+-
+-# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
++# Use of CMake 2.4.5 or later from CMake 2.4 series is supported
++# but CMake 2.6 is recommended
+ cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
+
+ # cmake 2.5, i.e. the cvs version between 2.4 and 2.6, is not supported
+@@ -253,7 +253,6 @@
+ include (CheckCXXCompilerFlag)
+ include (CheckCXXSourceCompiles)
+
+-
+ # get the directory of the current file, used later on in the file
+ get_filename_component( kde_cmake_module_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+@@ -269,23 +268,94 @@
+
+ ####################### #now try to find some kde stuff ################################
+
++# A macro for vertifying existance of the core libraries and
++# setting KDE4_*_LIBRARY and KDE4_*_LIBS to the proper values.
++MACRO(IMPORT_KDE4_CORE_LIBRARIES)
++ foreach(lib ${ARGV})
++ string(TOUPPER ${lib} _ulib)
++
++ if (_kdeBootStrapping)
++ set(KDE4_${_ulib}_LIBRARY ${lib})
++ else(_kdeBootStrapping)
++ find_library(KDE4_${_ulib}_LIBRARY NAMES ${lib} PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH)
++ endif(_kdeBootStrapping)
++
++ if (KDE4_${_ulib}_LIBRARY)
++ if (KDELIBS_EXPORT OR _kdeBootStrapping)
++ # Set KDE4_*_LIBS to the (IMPORTED) target name
++ set(KDE4_${_ulib}_LIBS ${lib})
++ else (KDELIBS_EXPORT OR _kdeBootStrapping)
++ # Set KDE4_*_LIBS to the lib name and its dependences
++ set(KDE4_${_ulib}_LIBS ${${lib}_LIB_DEPENDS} ${KDE4_${_ulib}_LIBRARY} )
++ endif (KDELIBS_EXPORT OR _kdeBootStrapping)
++ endif (KDE4_${_ulib}_LIBRARY)
++
++ endforeach(lib ${ARGV})
++ENDMACRO(IMPORT_KDE4_CORE_LIBRARIES)
++
+ if (_kdeBootStrapping)
+- set(KDE4_INCLUDE_DIR ${kdelibs_SOURCE_DIR})
+- set(KDE4_KDECORE_LIBS ${QT_QTCORE_LIBRARY} kdecore)
+- set(KDE4_KDEUI_LIBS ${KDE4_KDECORE_LIBS} kdeui)
+- set(KDE4_KIO_LIBS ${KDE4_KDEUI_LIBS} kio)
+- set(KDE4_KPARTS_LIBS ${KDE4_KIO_LIBS} kparts)
+- if (UNIX)
+- set(KDE4_KPTY_LIBS ${KDE4_KDECORE_LIBS} kpty)
+- endif (UNIX)
+- set(KDE4_KUTILS_LIBS ${KDE4_KIO_LIBS} kutils)
+- set(KDE4_KDE3SUPPORT_LIBS ${KDE4_KIO_LIBS} kde3support)
+- set(KDE4_SOLID_LIBS ${KDE4_KDECORE_LIBS} solid)
+- set(KDE4_PHONON_LIBS ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} phonon)
+- set(KDE4_KAUDIODEVICELIST_LIBS ${KDE4_SOLID_LIBS} kaudiodevicelist)
+- set(KDE4_KFILE_LIBS ${KDE4_KDE3SUPPORT_LIBS} kfile)
+- set(KDE4_KHTML_LIBS ${KDE4_KPARTS_LIBS} khtml)
+
++ # If we are using CMake 2.6 or later, use cmake IMPORTED mechanism to export
++ # libraries and dependencies (as IMPORTED targets)
++ if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STRLESS "2.6")
++ set(KDELIBS_EXPORT EXPORT kdelibs)
++ message(STATUS "CMake 2.6 or later found. KDELibs library information will be exported via IMPORTED targets")
++ else (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STRLESS "2.6")
++ message(STATUS "CMake 2.4 found. KDELibs library information will be exported in *_LIB_DEPENDS variables")
++ endif (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STRLESS "2.6")
++
++else (_kdeBootStrapping)
++
++ # this file contains all KDELibs libraries and dependences (either IMPORTED or the old way)
++ include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
++
++ # Check whether we are using IMPORTED targets for KDE libraries. It's not possible to
++ # use IMPORTED targets with CMake 2.4
++ if (EXISTS ${kde_cmake_module_dir}/KDELibsImports.cmake)
++ if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STRLESS "2.6")
++ message(FATAL_ERROR "KDELibs was compiled with CMake 2.6 or later but you are using CMake ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}. Either recompile KDELibs or upgrade CMake to 2.6 or later")
++ else ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STRLESS "2.6")
++ set(KDELIBS_EXPORT EXPORT kdelibs)
++ endif ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STRLESS "2.6")
++ endif (EXISTS ${kde_cmake_module_dir}/KDELibsImports.cmake)
++
++endif (_kdeBootStrapping)
++
++import_kde4_core_libraries(
++ kdecore
++ kdeui
++ kio
++ kparts
++ kutils
++ kde3support
++ kfile
++ khtml
++ kjs
++ kjsapi
++ knewstuff2
++ kdnssd
++ phonon
++ kaudiodevicelist
++ solid
++ threadweaver
++ knotifyconfig
++ krosscore
++ krossui
++ ktexteditor
++# knepomuk
++# kmetadata
++)
++
++if (UNIX)
++ import_kde4_core_libraries(
++ kdefakes
++ kpty
++ kdesu
++ )
++endif (UNIX)
++
++if (_kdeBootStrapping)
++ set(KDE4_INCLUDE_DIR ${kdelibs_SOURCE_DIR})
+ set(EXECUTABLE_OUTPUT_PATH ${kdelibs_BINARY_DIR}/bin )
+
+ if (WIN32)
+@@ -354,89 +424,7 @@
+ get_filename_component(QT_INSTALL_DIR ${_DIR} PATH )
+ endif (WIN32)
+
+- # this file contains all dependencies of all libraries of kdelibs, Alex
+- include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
+-
+- if (UNIX)
+- find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
+- endif (UNIX)
+-
+- find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
+-
+- find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
+-
+- find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
+-
+- find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
+-
+- find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
+-
+- find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
+-
+- find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
+-
+- find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
+-
+- find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
+- find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} )
+-
+- find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
+-
+- if (UNIX)
+- find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} )
+-
+- find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
+- endif (UNIX)
+-
+- find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
+-
+- find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
+-
+- find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_LIBRARY} )
+-
+- find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
+-
+- find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
+-
+- find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
+-
+- find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
+-
+- find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
+-
+- find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
+-
+- # Can't do that, it's not always compiled.
+- #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- #set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} )
+-
+- # Can't do that, it's not always compiled. See FindKMetaData.cmake
+- #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- #set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
+-
++ # extract KDE4_LIB_DIR from kdecore location
+ get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
+
+ # kpassworddialog.h is new with KDE4
+--- kde4libs-4.0.70+svn798712.orig/CMakeLists.txt 2008-04-20 17:34:11.000000000 +0000
++++ kde4libs-4.0.70+svn798712/CMakeLists.txt 2008-04-20 17:34:32.000000000 +0000
+@@ -318,7 +318,17 @@
+ # file (APPEND ${CMAKE_BINARY_DIR}/KDELibsDependencies.cmake "${__deps}")
+ endif(WIN32)
+
+-export_library_dependencies(${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake APPEND)
++if (KDELIBS_EXPORT)
++ install(${KDELIBS_EXPORT} DESTINATION ${DATA_INSTALL_DIR}/cmake/modules FILE KDELibsImports.cmake)
++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake
++"# Import KDELibs libraries as IMPORTED targets
++include(KDELibsImports)
++"
++ )
++else (KDELIBS_EXPORT)
++ # Export dependences the old CMake 2.4 way
++ export_library_dependencies(${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake APPEND)
++endif (KDELIBS_EXPORT)
+
+ ########### install files ###############
+
+--- kde4libs-4.0.70+svn798712.orig/dnssd/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/dnssd/CMakeLists.txt 2008-04-20 17:51:28.000000000 +0000
+@@ -63,7 +63,7 @@
+ endif (HAVE_DNSSD)
+
+ set_target_properties(kdnssd PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS kdnssd ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kdnssd ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+ install( FILES dnssd_export.h domainbrowser.h remoteservice.h servicetypebrowser.h publicservice.h
+--- kde4libs-4.0.70+svn798712.orig/interfaces/ktexteditor/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/interfaces/ktexteditor/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -27,7 +27,7 @@
+ target_link_libraries(ktexteditor ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} kparts )
+
+ set_target_properties(ktexteditor PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS ktexteditor ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS ktexteditor ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+ install( FILES
+--- kde4libs-4.0.70+svn798712.orig/kde3support/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kde3support/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -81,7 +81,7 @@
+ target_link_libraries(kde3support ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS})
+
+ set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS kde3support ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kde3support ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+
+--- kde4libs-4.0.70+svn798712.orig/kdecore/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kdecore/CMakeLists.txt 2008-04-20 17:51:28.000000000 +0000
+@@ -105,7 +105,7 @@
+ if (NOT HAVE_TRUNC)
+ target_link_libraries(kdefakes m )
+ endif (NOT HAVE_TRUNC)
+- install(TARGETS kdefakes ${INSTALL_TARGETS_DEFAULT_ARGS} )
++ install(TARGETS kdefakes ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS} )
+
+ endif (UNIX)
+
+@@ -244,7 +244,7 @@
+ target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
+
+ set_target_properties(kdecore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+-install(TARGETS kdecore ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kdecore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### next target ###############
+
+--- kde4libs-4.0.70+svn798712.orig/kdesu/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kdesu/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -25,7 +25,7 @@
+ endif(KDESU_USE_SUDO_DEFAULT)
+
+ set_target_properties(kdesu PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+-install(TARGETS kdesu ${INSTALL_TARGETS_DEFAULT_ARGS} )
++install(TARGETS kdesu ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS} )
+
+
+ ########### next target ###############
+--- kde4libs-4.0.70+svn798712.orig/kdeui/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kdeui/CMakeLists.txt 2008-04-20 17:51:28.000000000 +0000
+@@ -303,7 +303,7 @@
+ endif(X11_Xrender_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(TARGETS kdeui ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+ ########### install files ###############
+
+ if (Q_WS_MAC)
+--- kde4libs-4.0.70+svn798712.orig/kfile/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kfile/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -39,7 +39,7 @@
+ )
+
+ set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS kfile ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kfile ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install( FILES
+ kdiroperator.h
+--- kde4libs-4.0.70+svn798712.orig/khtml/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/khtml/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -333,7 +333,7 @@
+ create_lut(ecma/kjs_audio.cpp kjs_audio.lut.h)
+
+
+-install(TARGETS khtml ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS khtml ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### khtmlpart ###############
+
+--- kde4libs-4.0.70+svn798712.orig/kio/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kio/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -261,7 +261,7 @@
+ set_target_properties(kio PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+
+ ########### install files ###############
+-install(TARGETS kio ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kio ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install( PROGRAMS useragent.pl proxytype.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+
+--- kde4libs-4.0.70+svn798712.orig/kjs/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kjs/CMakeLists.txt 2008-04-20 17:51:28.000000000 +0000
+@@ -174,7 +174,7 @@
+ endif(PCRE_FOUND)
+
+ set_target_properties(${KJSLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS ${KJSLIBNAME} ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS ${KJSLIBNAME} ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### kjs - basic shell ###############
+
+--- kde4libs-4.0.70+svn798712.orig/kjs/api/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kjs/api/CMakeLists.txt 2008-04-20 17:34:32.000000000 +0000
+@@ -13,7 +13,7 @@
+ target_link_libraries(kjsapi ${KJSLIBNAME} ${KDE4_KDECORE_LIBS})
+
+ set_target_properties(kjsapi PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS kjsapi ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kjsapi ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install(FILES
+ kjsapi_export.h
+--- kde4libs-4.0.70+svn798712.orig/knewstuff/knewstuff2/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/knewstuff/knewstuff2/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -55,7 +55,7 @@
+
+ target_link_libraries(knewstuff2 ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY})
+ set_target_properties(knewstuff2 PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+-install(TARGETS knewstuff2 ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS knewstuff2 ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install(FILES
+ core/author.h
+--- kde4libs-4.0.70+svn798712.orig/knotify/config/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/knotify/config/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -21,7 +21,7 @@
+ target_link_libraries(knotifyconfig ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} )
+
+ set_target_properties(knotifyconfig PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS knotifyconfig ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS knotifyconfig ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+ install( FILES knotifyconfig_export.h knotifyconfigwidget.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
+--- kde4libs-4.0.70+svn798712.orig/kparts/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kparts/CMakeLists.txt 2008-04-20 17:51:28.000000000 +0000
+@@ -27,7 +27,7 @@
+ target_link_libraries(kparts ${KDE4_KDECORE_LIBS} kdeui kio)
+
+ set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS kparts ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kparts ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+
+--- kde4libs-4.0.70+svn798712.orig/kpty/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kpty/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -14,7 +14,7 @@
+ target_link_libraries(kpty ${KDE4_KDECORE_LIBS} ${UTIL_LIBRARY} ${UTEMPTER_LIBRARY})
+
+ set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS kpty ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kpty ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install( FILES
+ kpty_export.h
+--- kde4libs-4.0.70+svn798712.orig/kross/core/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kross/core/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -13,7 +13,7 @@
+ kde4_add_library(krosscore SHARED ${krosscore_LIB_SRCS})
+ target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY})
+ set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+-install(TARGETS krosscore ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS krosscore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install(FILES
+ kross_export.h
+--- kde4libs-4.0.70+svn798712.orig/kross/ui/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kross/ui/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -16,7 +16,7 @@
+ kde4_add_library(krossui SHARED ${krossui_LIB_SRCS})
+ target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS})
+ set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+-install(TARGETS krossui ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS krossui ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+
+--- kde4libs-4.0.70+svn798712.orig/kutils/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/kutils/CMakeLists.txt 2008-04-20 17:51:28.000000000 +0000
+@@ -33,7 +33,7 @@
+ target_link_libraries(kutils ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} )
+
+ set_target_properties(kutils PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS kutils ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kutils ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+
+--- kde4libs-4.0.70+svn798712.orig/phonon/CMakeLists.txt 2008-04-20 17:34:11.000000000 +0000
++++ kde4libs-4.0.70+svn798712/phonon/CMakeLists.txt 2008-04-20 17:34:32.000000000 +0000
+@@ -65,7 +65,7 @@
+ target_link_libraries(phonon ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+ #do not use GENERIC versioning in phonon
+ set_target_properties(phonon PROPERTIES VERSION 4.2.0 SOVERSION 4)
+-install(TARGETS phonon ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS phonon ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+
+--- kde4libs-4.0.70+svn798712.orig/phonon/libkaudiodevicelist/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/phonon/libkaudiodevicelist/CMakeLists.txt 2008-04-20 17:51:27.000000000 +0000
+@@ -32,7 +32,7 @@
+
+ set_target_properties(kaudiodevicelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+
+-install(TARGETS kaudiodevicelist ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kaudiodevicelist ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES
+ kaudiodevicelist_export.h
+ audiodevice.h
+--- kde4libs-4.0.70+svn798712.orig/solid/solid/CMakeLists.txt 2008-04-20 17:34:11.000000000 +0000
++++ kde4libs-4.0.70+svn798712/solid/solid/CMakeLists.txt 2008-04-20 17:51:26.000000000 +0000
+@@ -183,7 +183,7 @@
+ target_link_libraries(solid ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS})
+
+ set_target_properties(solid PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS solid ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS solid ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install(FILES org.kde.Solid.Networking.Client.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+
+--- kde4libs-4.0.70+svn798712.orig/threadweaver/Weaver/CMakeLists.txt 2008-04-20 17:34:12.000000000 +0000
++++ kde4libs-4.0.70+svn798712/threadweaver/Weaver/CMakeLists.txt 2008-04-20 17:34:32.000000000 +0000
+@@ -33,7 +33,7 @@
+ kde4_add_library(threadweaver SHARED ${ThreadWeaver_LIB_SRCS})
+ target_link_libraries(threadweaver ${QT_QTCORE_LIBRARY})
+ set_target_properties(threadweaver PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+-install(TARGETS threadweaver ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS threadweaver ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install(FILES
+ WeaverInterface.h
Added: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff 2008-04-20 18:06:17 UTC (rev 10208)
@@ -0,0 +1,326 @@
+--- kde4libs.orig/dnssd/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/dnssd/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -61,6 +61,7 @@
+ else (HAVE_DNSSD)
+ target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS})
+ endif (HAVE_DNSSD)
++set_target_properties(kdnssd PROPERTIES LINK_INTERFACE_LIBRARIES "kdeui")
+
+ set_target_properties(kdnssd PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kdnssd ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/interfaces/ktexteditor/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/interfaces/ktexteditor/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -25,6 +25,7 @@
+ kde4_add_library(ktexteditor SHARED ${ktexteditor_LIB_SRCS})
+
+ target_link_libraries(ktexteditor ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} kparts )
++set_target_properties(ktexteditor PROPERTIES LINK_INTERFACE_LIBRARIES "kparts")
+
+ set_target_properties(ktexteditor PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS ktexteditor ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/kde3support/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kde3support/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -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 "kio;${QT_QT3SUPPORT_LIBRARY}")
+
+ set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kde3support ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/kdecore/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kdecore/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -105,6 +105,7 @@
+ if (NOT HAVE_TRUNC)
+ target_link_libraries(kdefakes m )
+ endif (NOT HAVE_TRUNC)
++ set_target_properties(kdefakes PROPERTIES LINK_INTERFACE_LIBRARIES "")
+ install(TARGETS kdefakes ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS} )
+
+ endif (UNIX)
+@@ -242,6 +243,7 @@
+ kde4_add_library(kdecore SHARED ${kdecore_LIB_SRCS})
+
+ target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
++set_target_properties(kdecore PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTNETWORK_LIBRARY};${QT_QTDBUS_LIBRARY}")
+
+ set_target_properties(kdecore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+ install(TARGETS kdecore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/kded/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kded/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -13,7 +13,7 @@
+
+ kde4_add_kdeinit_executable(kded4 ${kded_KDEINIT_SRCS})
+
+-target_link_libraries(kdeinit_kded4 ${KDE4_KIO_LIBS} )
++target_link_libraries(kdeinit_kded4 ${KDE4_KIO_LIBS} ${X11_X11_LIB} )
+
+ install(TARGETS kdeinit_kded4 ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kde4libs.orig/kdesu/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kdesu/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -18,6 +18,7 @@
+ kde4_add_library(kdesu SHARED ${kdesu_LIB_SRCS})
+
+ target_link_libraries(kdesu ${KDE4_KPTY_LIBS} )
++set_target_properties(kdesu PROPERTIES LINK_INTERFACE_LIBRARIES "kpty")
+
+ if(KDESU_USE_SUDO_DEFAULT)
+ set_source_files_properties(su.cpp
+--- kde4libs.orig/kdeui/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kdeui/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -280,7 +280,8 @@
+
+ kde4_add_library(kdeui SHARED ${kdeui_LIB_SRCS})
+
+-target_link_libraries(kdeui ${QT_QTSVG_LIBRARY} ${KDE4_KDECORE_LIBS} ${X11_LIBRARIES} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} )
++target_link_libraries(kdeui ${QT_QTSVG_LIBRARY} ${KDE4_KDECORE_LIBS} ${X11_X11_LIB} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} )
++set_target_properties(kdeui PROPERTIES LINK_INTERFACE_LIBRARIES "kdecore;${QT_QTSVG_LIBRARY};${QT_QTGUI_LIBRARY};${QT_QTGUI_LIBRARY};${QT_QTXML_LIBRARY};${QT_QTDBUS_LIBRARY}" )
+
+ if(MINGW)
+ target_link_libraries(kdeui gdi32)
+@@ -302,6 +303,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 ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+ ########### install files ###############
+@@ -521,7 +526,7 @@
+ endif ( Q_WS_QWS )
+
+ kde4_add_plugin( kded_globalaccel ${kded_globalaccel_SRCS} )
+-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} )
+
+--- kde4libs.orig/kfile/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kfile/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -37,6 +37,7 @@
+ ${STRIGI_LIBRARIES}
+ ${KDE4_SOLID_LIBS}
+ )
++set_target_properties(kfile PROPERTIES LINK_INTERFACE_LIBRARIES "kde3support")
+
+ set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kfile ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/khtml/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/khtml/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -296,7 +296,9 @@
+
+ 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} )
++target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${X11_X11_LIB}
++ ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} )
++set_target_properties(khtml PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
+ set_target_properties(khtml PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+
+@@ -342,7 +344,7 @@
+
+ kde4_add_plugin(khtmlpart WITH_PREFIX ${khtmlpart_PART_SRCS})
+
+-target_link_libraries(khtmlpart ${KDE4_KDECORE_LIBS} khtml )
++target_link_libraries(khtmlpart ${KDE4_KPARTS_LIBS} khtml )
+
+ install(TARGETS khtmlpart DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kde4libs.orig/khtml/kmultipart/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/khtml/kmultipart/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -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} )
+
+--- kde4libs.orig/kinit/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kinit/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -136,7 +136,7 @@
+ 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} )
++target_link_libraries(kdeinit_klauncher ${KDE4_KIO_LIBS} ${X11_X11_LIB} )
+
+ install(TARGETS kdeinit_klauncher ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kde4libs.orig/kio/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kio/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -235,7 +235,9 @@
+
+ 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} ${STRIGI_STREAMS_LIBRARY} ${KDE4_SOLID_LIBS} )
++set_target_properties(kio PROPERTIES LINK_INTERFACE_LIBRARIES "kdeui")
+
+
+ set(SYS_INOTIFY_H_FOUND 0)
+--- kde4libs.orig/kioslave/http/CMakeLists.txt 2008-04-20 17:33:41.000000000 +0000
++++ kde4libs/kioslave/http/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -37,7 +37,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} )
++target_link_libraries(kdeinit_kio_http_cache_cleaner ${KDE4_KIO_LIBS} ${ZLIB_LIBRARY} )
+
+ install(TARGETS kdeinit_kio_http_cache_cleaner ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+@@ -57,7 +57,7 @@
+
+ kde4_add_plugin(kio_http ${kio_http_PART_SRCS})
+
+-target_link_libraries(kio_http ${KDE4_KIO_LIBS} kntlm )
++target_link_libraries(kio_http ${KDE4_KIO_LIBS} kntlm ${ZLIB_LIBRARY} )
+ if(GSSAPI_FOUND)
+ target_link_libraries(kio_http ${GSSAPI_LIBS} )
+ endif(GSSAPI_FOUND)
+--- kde4libs.orig/kioslave/http/kcookiejar/CMakeLists.txt 2008-04-20 17:33:41.000000000 +0000
++++ kde4libs/kioslave/http/kcookiejar/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -45,7 +45,7 @@
+
+ kde4_add_plugin(kded_kcookiejar ${kded_kcookiejar_PART_SRCS})
+
+-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} )
+
+ install(TARGETS kded_kcookiejar DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kde4libs.orig/kjs/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kjs/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -167,6 +167,7 @@
+
+ if(UNIX)
+ target_link_libraries(${KJSLIBNAME} m)
++ set_target_properties(${KJSLIBNAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
+ endif(UNIX)
+
+ if(PCRE_FOUND)
+--- kde4libs.orig/knewstuff/knewstuff2/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/knewstuff/knewstuff2/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -54,6 +54,7 @@
+ kde4_add_library(knewstuff2 SHARED ${knewstuff2_core_SRCS} ${knewstuff2_dxs_SRCS} ${knewstuff2_ui_SRCS} ${knewstuff2_SRCS})
+
+ target_link_libraries(knewstuff2 ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY})
++set_target_properties(knewstuff2 PROPERTIES LINK_INTERFACE_LIBRARIES "kio")
+ set_target_properties(knewstuff2 PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS knewstuff2 ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kde4libs.orig/knotify/config/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/knotify/config/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -19,6 +19,7 @@
+
+ # Needs KIO for KUrlRequester
+ target_link_libraries(knotifyconfig ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} )
++set_target_properties(knotifyconfig PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY};${QT_QTGUI_LIBRARY}")
+
+ set_target_properties(knotifyconfig PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS knotifyconfig ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/kparts/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kparts/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -25,6 +25,7 @@
+ kde4_add_library(kparts SHARED ${kparts_LIB_SRCS})
+
+ target_link_libraries(kparts ${KDE4_KDECORE_LIBS} kdeui kio)
++set_target_properties(kparts PROPERTIES LINK_INTERFACE_LIBRARIES "kio")
+
+ set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kparts ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/kpty/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kpty/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -12,6 +12,7 @@
+ kde4_add_library(kpty SHARED ${kpty_LIB_SRCS})
+
+ target_link_libraries(kpty ${KDE4_KDECORE_LIBS} ${UTIL_LIBRARY} ${UTEMPTER_LIBRARY})
++set_target_properties(kpty PROPERTIES LINK_INTERFACE_LIBRARIES "kdecore")
+
+ set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kpty ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/kross/core/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kross/core/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -12,6 +12,7 @@
+
+ kde4_add_library(krosscore SHARED ${krosscore_LIB_SRCS})
+ target_link_libraries(krosscore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY})
++set_target_properties(krosscore PROPERTIES LINK_INTERFACE_LIBRARIES "kdecore;${QT_QTSCRIPT_LIBRARY}")
+ set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS krosscore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kde4libs.orig/kross/ui/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kross/ui/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -15,6 +15,7 @@
+
+ kde4_add_library(krossui SHARED ${krossui_LIB_SRCS})
+ target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS})
++set_target_properties(krossui PROPERTIES LINK_INTERFACE_LIBRARIES "kdeui;kparts")
+ set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS krossui ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kde4libs.orig/kutils/CMakeLists.txt 2008-04-20 17:33:42.000000000 +0000
++++ kde4libs/kutils/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -31,6 +31,7 @@
+ kde4_add_library(kutils SHARED ${kutils_LIB_SRCS})
+
+ target_link_libraries(kutils ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} )
++set_target_properties(kutils PROPERTIES LINK_INTERFACE_LIBRARIES "kdeui")
+
+ set_target_properties(kutils PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kutils ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/phonon/libkaudiodevicelist/CMakeLists.txt 2008-04-20 17:33:41.000000000 +0000
++++ kde4libs/phonon/libkaudiodevicelist/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -28,7 +28,8 @@
+ endif(ALSA_FOUND)
+
+ kde4_add_library(kaudiodevicelist SHARED ${kaudiodevicelist_LIB_SRCS})
+-target_link_libraries(kaudiodevicelist ${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} ${ASOUND_LIBRARY})
++target_link_libraries(kaudiodevicelist ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} ${ASOUND_LIBRARY})
++set_target_properties(kaudiodevicelist PROPERTIES LINK_INTERFACE_LIBRARIES "solid")
+
+ set_target_properties(kaudiodevicelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+
+--- kde4libs.orig/solid/solid/CMakeLists.txt 2008-04-20 17:33:41.000000000 +0000
++++ kde4libs/solid/solid/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -181,6 +181,7 @@
+ kde4_add_library(solid SHARED ${solid_LIB_SRCS})
+
+ target_link_libraries(solid ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS})
++set_target_properties(solid PROPERTIES LINK_INTERFACE_LIBRARIES "${QT_QTCORE_LIBRARY}")
+
+ set_target_properties(solid PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS solid ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/sonnet/plugins/hspell/CMakeLists.txt 2008-04-20 17:33:41.000000000 +0000
++++ kde4libs/sonnet/plugins/hspell/CMakeLists.txt 2008-04-20 17:33:46.000000000 +0000
+@@ -9,7 +9,7 @@
+
+ kde4_add_plugin(kspell_hspell ${kspell_hspell_PART_SRCS})
+
+-target_link_libraries(kspell_hspell ${KDE4_KDECORE_LIBS} ${HSPELL_LIBRARIES} )
++target_link_libraries(kspell_hspell ${KDE4_KDECORE_LIBS} ${HSPELL_LIBRARIES} ${ZLIB_LIBRARY} )
+
+ install(TARGETS kspell_hspell DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kde4libs.orig/phonon/kcm/CMakeLists.txt 2008-04-20 17:33:41.000000000 +0000
++++ kde4libs/phonon/kcm/CMakeLists.txt 2008-04-20 17:34:02.000000000 +0000
+@@ -5,7 +5,7 @@
+
+ kde4_add_plugin(kcm_phonon ${kcmphonon_SRCS})
+ target_link_libraries(kcm_phonon ${KDE4_PHONON_LIBS} ${KDE4_KUTILS_LIBS}
+- ${KDE4_KAUDIODEVICELIST_LIBS})
++ ${KDE4_KAUDIODEVICELIST_LIBS} ${KDE4_KIO_LIBS})
+
+ install(TARGETS kcm_phonon DESTINATION ${PLUGIN_INSTALL_DIR} )
+
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2008-04-20 16:24:36 UTC (rev 10207)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2008-04-20 18:06:17 UTC (rev 10208)
@@ -8,4 +8,5 @@
15_kfreebsd_support.diff
17_findservicebydesktoppath_try_realfilepath.diff
18_always_set_cmake_policy.diff
-97_cmake26_imported_link_interfaces.diff
+97_use_imported_targets_with_cmake26.diff
+98_link_interface_libraries.diff
More information about the pkg-kde-commits
mailing list