[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.04.0-1-10-g87f7369

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=87f7369

The following commit has been merged in the master branch:
commit 87f7369a728f1b7ffd1adf8b06b289bd8e024b23
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 18 11:32:10 2016 +0200

    fix cmake policy
---
 debian/changelog                                   |  5 +++
 debian/patches/series                              |  2 +
 ...x-add_definitions-according-to-new-policy.patch | 43 ++++++++++++++++++++++
 ...in_req-to-match-kdelibs-policy-and-enable.patch | 25 +++++++++++++
 4 files changed, 75 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a7e4994..93e8f0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ kde-runtime (4:16.04.2-0r1) UNRELEASED; urgency=medium
   * Drop patch khelp_htdig.diff, no more needed now that khelpcenter is not
     built.
   * Clean not-installed file.
+  * Backport upstream commits 5a1d89e006ca69c6bf5351a796f7da57a6f96582 and
+    823d2fbd9cbc146e007510a41b4820fb8b9e81b8 to set the cmake minimum version
+    required and policies, and build properly with that; patches
+    upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch and
+    upstream_cmake-fix-add_definitions-according-to-new-policy.patch.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jun 2016 09:39:41 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index a11dc06..e08a99a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@ kubuntu_shutup_shutup_shutup.diff
 kubuntu_drkonqi_whoopsie_integration.patch
 kubuntu_disable-gpg-backend.diff
 add_glib_for_nm
+upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
+upstream_cmake-fix-add_definitions-according-to-new-policy.patch
diff --git a/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch b/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch
new file mode 100644
index 0000000..75a64d0
--- /dev/null
+++ b/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch
@@ -0,0 +1,43 @@
+From 823d2fbd9cbc146e007510a41b4820fb8b9e81b8 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 18 Jun 2016 10:25:22 +0200
+Subject: [PATCH] cmake: fix add_definitions according to new policy
+
+---
+ kioslave/nfs/CMakeLists.txt       | 2 +-
+ kwalletd/autotests/CMakeLists.txt | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/kioslave/nfs/CMakeLists.txt b/kioslave/nfs/CMakeLists.txt
+index 32be86c..0d62d7b 100644
+--- a/kioslave/nfs/CMakeLists.txt
++++ b/kioslave/nfs/CMakeLists.txt
+@@ -23,7 +23,7 @@ if (HAVE_XDR_U_LONGLONG_T)
+     add_definitions(-DHAVE_XDR_U_LONGLONG_T)
+ endif (HAVE_XDR_U_LONGLONG_T)
+ 
+- add_definitions(-DTRANSLATION_DOMAIN=\"kio_nfs\")
++ add_definitions(-DTRANSLATION_DOMAIN="kio_nfs")
+ 
+ set(kio_nfs_PART_SRCS kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c )
+ 
+diff --git a/kwalletd/autotests/CMakeLists.txt b/kwalletd/autotests/CMakeLists.txt
+index 5ffbba4..c9af385 100644
+--- a/kwalletd/autotests/CMakeLists.txt
++++ b/kwalletd/autotests/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_definitions(-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\"")
++add_definitions(-DTEST_DATA="${CMAKE_CURRENT_SOURCE_DIR}/")
+ 
+ set(testname testpamopen)
+ include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
+@@ -8,4 +8,4 @@ target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT
+ set(testname testpamopennofile)
+ include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
+ kde4_add_unit_test(${testname} kwalletexecuter.cpp ${testname}.cpp)
+-target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
+\ No newline at end of file
++target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
+-- 
+2.8.1
+
diff --git a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
new file mode 100644
index 0000000..f733be6
--- /dev/null
+++ b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
@@ -0,0 +1,25 @@
+From 5a1d89e006ca69c6bf5351a796f7da57a6f96582 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 18 Jun 2016 09:46:45 +0200
+Subject: [PATCH] set cmake_min_req to match kdelibs policy and enable newer
+ cmake policies
+
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1db0cd2..8b4d0f2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ project(KDEBASE_RUNTIME)
+ 
++cmake_minimum_required(VERSION 2.8.9)
++
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+ 
+-- 
+2.8.1
+

-- 
KDE Base Runtime module packaging