rev 10198 - in branches/kde4/packages/kdelibs/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sun Apr 20 01:59:15 UTC 2008
Author: modax-guest
Date: 2008-04-20 01:59:15 +0000 (Sun, 20 Apr 2008)
New Revision: 10198
Added:
branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff
Modified:
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/patches/97_cmake26_imported_link_interfaces.diff
branches/kde4/packages/kdelibs/debian/patches/series
Log:
Add 18_ to fix upstream issue with policy setting. Builds of other packages should no longer fail due CMP0000 policy enforcement.
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2008-04-20 00:26:46 UTC (rev 10197)
+++ branches/kde4/packages/kdelibs/debian/changelog 2008-04-20 01:59:15 UTC (rev 10198)
@@ -1,4 +1,4 @@
-kde4libs (4:4.0.70+svn798712-1~pre3) UNRELEASED; urgency=low
+kde4libs (4:4.0.70+svn798712-1~pre4) UNRELEASED; urgency=low
+++ Auto changes by Debian KDE Builder:
@@ -27,6 +27,8 @@
* Shrink *-dev dependency list of kdelibs5-dev to libqt4-dev (>= 4.4.0~),
libsoprano-dev (>= 2.0.97~). Thanks to Sune Vuorela for determining this
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
@@ -45,7 +47,7 @@
respective public KDE library. KDE4_*_LIBRARY semantics were not changed
and they still point to the result of find_library().
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 20 Apr 2008 03:21:53 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 20 Apr 2008 04:51:49 +0300
kde4libs (4:4.0.68+svn794641-1) experimental; urgency=low
Added: branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff 2008-04-20 01:59:15 UTC (rev 10198)
@@ -0,0 +1,54 @@
+Index: kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake
+===================================================================
+--- kde4libs-4.0.70+svn798712.orig/cmake/modules/FindKDE4Internal.cmake 2008-04-20 04:40:43.000000000 +0300
++++ kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake 2008-04-20 04:41:27.000000000 +0300
+@@ -217,6 +217,24 @@
+ # this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
+ 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
++if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.5")
++ message(FATAL_ERROR "You are using CMake 2.5, which was the unreleased development version between 2.4 and 2.6. This is no longer supported. Please update to CMake 2.6 or current cvs HEAD.")
++endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.5")
++
++# CMake 2.6, set compatibility behaviour to cmake 2.4
++if(COMMAND CMAKE_POLICY)
++ # CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough
++ cmake_policy(SET CMP0000 OLD)
++ # CMP0002: in KDE4 we have multiple targets with the same name for the unit tests
++ cmake_policy(SET CMP0002 OLD)
++ # CMP0003: add the link paths to the link command as with cmake 2.4
++ cmake_policy(SET CMP0003 OLD)
++ # CMP0005: keep escaping behaviour for definitions added via add_definitions()
++ cmake_policy(SET CMP0005 OLD)
++
++endif(COMMAND CMAKE_POLICY)
++
+ if(KDE4_FOUND)
+ # Already found in this cmake run, nothing more to do
+ else(KDE4_FOUND)
+@@ -658,24 +676,6 @@
+ endif(WIN32)
+
+
+-# cmake 2.5, i.e. the cvs version between 2.4 and 2.6, is not supported
+-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.5")
+- message(FATAL_ERROR "You are using CMake 2.5, which was the unreleased development version between 2.4 and 2.6. This is no longer supported. Please update to CMake 2.6 or current cvs HEAD.")
+-endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.5")
+-
+-# CMake 2.6, set compatibility behaviour to cmake 2.4
+-if(COMMAND CMAKE_POLICY)
+- # CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough
+- cmake_policy(SET CMP0000 OLD)
+- # CMP0002: in KDE4 we have multiple targets with the same name for the unit tests
+- cmake_policy(SET CMP0002 OLD)
+- # CMP0003: add the link paths to the link command as with cmake 2.4
+- cmake_policy(SET CMP0003 OLD)
+- # CMP0005: keep escaping behaviour for definitions added via add_definitions()
+- cmake_policy(SET CMP0005 OLD)
+-
+-endif(COMMAND CMAKE_POLICY)
+-
+
+
+ ##################### and now the platform specific stuff ############################
Modified: branches/kde4/packages/kdelibs/debian/patches/97_cmake26_imported_link_interfaces.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/97_cmake26_imported_link_interfaces.diff 2008-04-20 00:26:46 UTC (rev 10197)
+++ branches/kde4/packages/kdelibs/debian/patches/97_cmake26_imported_link_interfaces.diff 2008-04-20 01:59:15 UTC (rev 10198)
@@ -1,19 +1,25 @@
Index: kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake
===================================================================
---- kde4libs-4.0.70+svn798712.orig/cmake/modules/FindKDE4Internal.cmake 2008-04-20 00:23:54.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake 2008-04-20 00:24:18.000000000 +0000
-@@ -214,8 +214,8 @@
+--- kde4libs-4.0.70+svn798712.orig/cmake/modules/FindKDE4Internal.cmake 2008-04-20 04:44:26.000000000 +0300
++++ kde4libs-4.0.70+svn798712/cmake/modules/FindKDE4Internal.cmake 2008-04-20 04:48:46.000000000 +0300
+@@ -214,13 +214,9 @@
# 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
-cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
-+# cmake 2.6 is required to make use of the new IMPORTED_* stuff
+-
+-# cmake 2.5, i.e. the cvs version between 2.4 and 2.6, is not supported
+-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.5")
+- message(FATAL_ERROR "You are using CMake 2.5, which was the unreleased development version between 2.4 and 2.6. This is no longer supported. Please update to CMake 2.6 or current cvs HEAD.")
+-endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.5")
++# cmake 2.6 is required to make use of the new IMPORTED targets
++# and LINK_INTERFACE_LIBRARIES property
+cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
- if(KDE4_FOUND)
- # Already found in this cmake run, nothing more to do
-@@ -235,7 +235,6 @@
+ # CMake 2.6, set compatibility behaviour to cmake 2.4
+ if(COMMAND CMAKE_POLICY)
+@@ -253,7 +249,6 @@
include (CheckCXXCompilerFlag)
include (CheckCXXSourceCompiles)
@@ -21,17 +27,17 @@
# 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)
-@@ -251,23 +250,67 @@
+@@ -269,23 +264,67 @@
####################### #now try to find some kde stuff ################################
-+# A function for vertifying existance of the core libraries and
-+# setting obsolete _LIBS and _LIBRARY variables to the respective
-+# IMPORTED targets
++# A function for vertifying existance of the core libraries and
++# setting obsolete KDE4_*_LIBS to the respective IMPORTED target.
++# KDE4_*_LIBRARY is a ful path to the library
+MACRO(IMPORT_KDE4_LIBRARIES)
+ foreach(lib ${ARGV})
+ string(TOUPPER ${lib} _ulib)
-+
++
+ if (_kdeBootStrapping)
+ set(KDE4_${_ulib}_LIBRARY ${lib})
+ else(_kdeBootStrapping)
@@ -104,7 +110,7 @@
set(EXECUTABLE_OUTPUT_PATH ${kdelibs_BINARY_DIR}/bin )
if (WIN32)
-@@ -336,89 +379,7 @@
+@@ -354,89 +393,7 @@
get_filename_component(QT_INSTALL_DIR ${_DIR} PATH )
endif (WIN32)
@@ -197,8 +203,8 @@
# kpassworddialog.h is new with KDE4
Index: kde4libs-4.0.70+svn798712/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/CMakeLists.txt 2008-04-20 00:21:08.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/CMakeLists.txt 2008-04-20 04:40:34.000000000 +0300
++++ kde4libs-4.0.70+svn798712/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -318,7 +318,12 @@
# file (APPEND ${CMAKE_BINARY_DIR}/KDELibsDependencies.cmake "${__deps}")
endif(WIN32)
@@ -215,8 +221,8 @@
Index: kde4libs-4.0.70+svn798712/dnssd/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/dnssd/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/dnssd/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/dnssd/CMakeLists.txt 2008-04-20 04:40:36.000000000 +0300
++++ kde4libs-4.0.70+svn798712/dnssd/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -61,9 +61,10 @@
else (HAVE_DNSSD)
target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS})
@@ -231,8 +237,8 @@
install( FILES dnssd_export.h domainbrowser.h remoteservice.h servicetypebrowser.h publicservice.h
Index: kde4libs-4.0.70+svn798712/interfaces/ktexteditor/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/interfaces/ktexteditor/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/interfaces/ktexteditor/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/interfaces/ktexteditor/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/interfaces/ktexteditor/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -25,9 +25,10 @@
kde4_add_library(ktexteditor SHARED ${ktexteditor_LIB_SRCS})
@@ -247,14 +253,14 @@
install( FILES
Index: kde4libs-4.0.70+svn798712/kde3support/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kde3support/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kde3support/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kde3support/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kde3support/CMakeLists.txt 2008-04-20 04:49:07.000000000 +0300
@@ -78,10 +78,12 @@
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}
++target_link_libraries(kde3support ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY}
+ ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KFILE_LIBS} ${X11_X11_LIB} )
+set_property(TARGET kde3support PROPERTY LINK_INTERFACE_LIBRARIES kio ${QT_QT3SUPPORT_LIBRARY})
@@ -266,8 +272,8 @@
Index: kde4libs-4.0.70+svn798712/kdecore/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kdecore/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kdecore/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kdecore/CMakeLists.txt 2008-04-20 04:40:36.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kdecore/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -105,7 +105,8 @@
if (NOT HAVE_TRUNC)
target_link_libraries(kdefakes m )
@@ -292,8 +298,8 @@
Index: kde4libs-4.0.70+svn798712/kded/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kded/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kded/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kded/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kded/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -13,7 +13,7 @@
kde4_add_kdeinit_executable(kded4 ${kded_KDEINIT_SRCS})
@@ -305,8 +311,8 @@
Index: kde4libs-4.0.70+svn798712/kdesu/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kdesu/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kdesu/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kdesu/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kdesu/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -18,6 +18,7 @@
kde4_add_library(kdesu SHARED ${kdesu_LIB_SRCS})
@@ -326,8 +332,8 @@
########### next target ###############
Index: kde4libs-4.0.70+svn798712/kdeui/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kdeui/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kdeui/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kdeui/CMakeLists.txt 2008-04-20 04:40:36.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kdeui/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -280,7 +280,9 @@
kde4_add_library(kdeui SHARED ${kdeui_LIB_SRCS})
@@ -364,8 +370,8 @@
Index: kde4libs-4.0.70+svn798712/kfile/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kfile/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kfile/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kfile/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kfile/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -37,9 +37,10 @@
${STRIGI_LIBRARIES}
${KDE4_SOLID_LIBS}
@@ -380,8 +386,8 @@
kdiroperator.h
Index: kde4libs-4.0.70+svn798712/khtml/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/khtml/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/khtml/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/khtml/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/khtml/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -296,7 +296,9 @@
kde4_add_library(khtml SHARED ${khtml_LIB_SRCS})
@@ -413,8 +419,8 @@
Index: kde4libs-4.0.70+svn798712/khtml/kmultipart/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/khtml/kmultipart/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/khtml/kmultipart/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/khtml/kmultipart/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/khtml/kmultipart/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -9,7 +9,7 @@
kde4_add_plugin(kmultipart WITH_PREFIX ${kmultipart_PART_SRCS})
@@ -426,8 +432,8 @@
Index: kde4libs-4.0.70+svn798712/kinit/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kinit/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kinit/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kinit/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kinit/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -136,7 +136,7 @@
kde4_add_kdeinit_executable( klauncher NOGUI ${klauncher_KDEINIT_SRCS})
set_target_properties(kdeinit_klauncher PROPERTIES DEFINE_SYMBOL MAKE_KLAUNCHER)
@@ -439,8 +445,8 @@
Index: kde4libs-4.0.70+svn798712/kio/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kio/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kio/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kio/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kio/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -235,7 +235,9 @@
kde4_add_library(kio SHARED ${kio_LIB_SRCS})
@@ -463,8 +469,8 @@
Index: kde4libs-4.0.70+svn798712/kioslave/http/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kioslave/http/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kioslave/http/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kioslave/http/CMakeLists.txt 2008-04-20 04:40:34.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kioslave/http/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -37,7 +37,7 @@
kde4_add_kdeinit_executable( kio_http_cache_cleaner NOGUI ${kio_http_cache_cleaner_KDEINIT_SRCS})
@@ -485,8 +491,8 @@
endif(GSSAPI_FOUND)
Index: kde4libs-4.0.70+svn798712/kioslave/http/kcookiejar/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kioslave/http/kcookiejar/CMakeLists.txt 2008-04-20 00:21:08.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kioslave/http/kcookiejar/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kioslave/http/kcookiejar/CMakeLists.txt 2008-04-20 04:40:34.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kioslave/http/kcookiejar/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -45,7 +45,7 @@
kde4_add_plugin(kded_kcookiejar ${kded_kcookiejar_PART_SRCS})
@@ -498,8 +504,8 @@
Index: kde4libs-4.0.70+svn798712/kjs/api/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kjs/api/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kjs/api/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kjs/api/CMakeLists.txt 2008-04-20 04:40:36.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kjs/api/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -13,7 +13,7 @@
target_link_libraries(kjsapi ${KJSLIBNAME} ${KDE4_KDECORE_LIBS})
@@ -511,8 +517,8 @@
kjsapi_export.h
Index: kde4libs-4.0.70+svn798712/kjs/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kjs/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kjs/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kjs/CMakeLists.txt 2008-04-20 04:40:36.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kjs/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -167,6 +167,7 @@
if(UNIX)
@@ -532,8 +538,8 @@
Index: kde4libs-4.0.70+svn798712/knewstuff/knewstuff2/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/knewstuff/knewstuff2/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/knewstuff/knewstuff2/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/knewstuff/knewstuff2/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/knewstuff/knewstuff2/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -54,8 +54,9 @@
kde4_add_library(knewstuff2 SHARED ${knewstuff2_core_SRCS} ${knewstuff2_dxs_SRCS} ${knewstuff2_ui_SRCS} ${knewstuff2_SRCS})
@@ -547,8 +553,8 @@
core/author.h
Index: kde4libs-4.0.70+svn798712/knotify/config/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/knotify/config/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/knotify/config/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/knotify/config/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/knotify/config/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -19,9 +19,10 @@
# Needs KIO for KUrlRequester
@@ -563,8 +569,8 @@
install( FILES knotifyconfig_export.h knotifyconfigwidget.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
Index: kde4libs-4.0.70+svn798712/kparts/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kparts/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kparts/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kparts/CMakeLists.txt 2008-04-20 04:40:36.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kparts/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -25,9 +25,10 @@
kde4_add_library(kparts SHARED ${kparts_LIB_SRCS})
@@ -579,8 +585,8 @@
Index: kde4libs-4.0.70+svn798712/kpty/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kpty/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kpty/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kpty/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kpty/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -12,9 +12,10 @@
kde4_add_library(kpty SHARED ${kpty_LIB_SRCS})
@@ -595,8 +601,8 @@
kpty_export.h
Index: kde4libs-4.0.70+svn798712/kross/core/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kross/core/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kross/core/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kross/core/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kross/core/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -12,8 +12,9 @@
kde4_add_library(krosscore SHARED ${krosscore_LIB_SRCS})
@@ -610,8 +616,8 @@
kross_export.h
Index: kde4libs-4.0.70+svn798712/kross/ui/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kross/ui/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kross/ui/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kross/ui/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kross/ui/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -15,8 +15,9 @@
kde4_add_library(krossui SHARED ${krossui_LIB_SRCS})
@@ -625,8 +631,8 @@
Index: kde4libs-4.0.70+svn798712/kutils/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/kutils/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/kutils/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/kutils/CMakeLists.txt 2008-04-20 04:40:36.000000000 +0300
++++ kde4libs-4.0.70+svn798712/kutils/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -31,9 +31,10 @@
kde4_add_library(kutils SHARED ${kutils_LIB_SRCS})
@@ -641,8 +647,8 @@
Index: kde4libs-4.0.70+svn798712/phonon/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/phonon/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/phonon/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/phonon/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/phonon/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -65,7 +65,7 @@
target_link_libraries(phonon ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
#do not use GENERIC versioning in phonon
@@ -654,8 +660,8 @@
Index: kde4libs-4.0.70+svn798712/phonon/libkaudiodevicelist/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/phonon/libkaudiodevicelist/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/phonon/libkaudiodevicelist/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/phonon/libkaudiodevicelist/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/phonon/libkaudiodevicelist/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -29,10 +29,11 @@
kde4_add_library(kaudiodevicelist SHARED ${kaudiodevicelist_LIB_SRCS})
@@ -671,8 +677,8 @@
audiodevice.h
Index: kde4libs-4.0.70+svn798712/solid/solid/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/solid/solid/CMakeLists.txt 2008-04-20 00:21:08.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/solid/solid/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/solid/solid/CMakeLists.txt 2008-04-20 04:40:34.000000000 +0300
++++ kde4libs-4.0.70+svn798712/solid/solid/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -181,9 +181,10 @@
kde4_add_library(solid SHARED ${solid_LIB_SRCS})
@@ -687,8 +693,8 @@
Index: kde4libs-4.0.70+svn798712/sonnet/plugins/hspell/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/sonnet/plugins/hspell/CMakeLists.txt 2008-04-20 00:21:09.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/sonnet/plugins/hspell/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/sonnet/plugins/hspell/CMakeLists.txt 2008-04-20 04:40:35.000000000 +0300
++++ kde4libs-4.0.70+svn798712/sonnet/plugins/hspell/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -9,7 +9,7 @@
kde4_add_plugin(kspell_hspell ${kspell_hspell_PART_SRCS})
@@ -700,8 +706,8 @@
Index: kde4libs-4.0.70+svn798712/threadweaver/Weaver/CMakeLists.txt
===================================================================
---- kde4libs-4.0.70+svn798712.orig/threadweaver/Weaver/CMakeLists.txt 2008-04-20 00:21:10.000000000 +0000
-+++ kde4libs-4.0.70+svn798712/threadweaver/Weaver/CMakeLists.txt 2008-04-20 00:23:54.000000000 +0000
+--- kde4libs-4.0.70+svn798712.orig/threadweaver/Weaver/CMakeLists.txt 2008-04-20 04:40:36.000000000 +0300
++++ kde4libs-4.0.70+svn798712/threadweaver/Weaver/CMakeLists.txt 2008-04-20 04:44:26.000000000 +0300
@@ -33,7 +33,7 @@
kde4_add_library(threadweaver SHARED ${ThreadWeaver_LIB_SRCS})
target_link_libraries(threadweaver ${QT_QTCORE_LIBRARY})
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2008-04-20 00:26:46 UTC (rev 10197)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2008-04-20 01:59:15 UTC (rev 10198)
@@ -7,4 +7,5 @@
14_hardcode_ptm_device.diff
15_kfreebsd_support.diff
17_findservicebydesktoppath_try_realfilepath.diff
+18_always_set_cmake_policy.diff
97_cmake26_imported_link_interfaces.diff
More information about the pkg-kde-commits
mailing list