[SCM] KDE Base Applications module packaging branch, master, updated. debian/16.04.1-1-8-g3ca0c9f

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=3ca0c9f

The following commit has been merged in the master branch:
commit 3ca0c9fddc687c175f2764e0242ed9b3c98ed3e9
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 18 09:02:03 2016 +0200

    fix cmake policies
    
    backport upstream commits a74f99409d463837094c996c19e5f90fe92dea04 and
    3eab13bc1e7fbe6c61bc156f7d6342298678dbcd to set the cmake minimum version
    required and policies, and build properly with that
---
 debian/changelog                                   |  5 +++++
 debian/patches/series                              |  2 ++
 ...cmake-use-variable-for-knewstuff3-library.patch | 25 ++++++++++++++++++++++
 ...in_req-to-match-kdelibs-policy-and-enable.patch | 25 ++++++++++++++++++++++
 4 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 29f2398..abdebf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,11 @@ kde-baseapps (4:16.04.2-0r1) UNRELEASED; urgency=medium
   * Raise the dolphin4 recommend in konqueror to a dependency: while
     konqueror can work fine without a file view, making sure dolphin4 is
     installed avoids troubles to users. (Closes: #820709)
+  * Backport upstream commits a74f99409d463837094c996c19e5f90fe92dea04 and
+    3eab13bc1e7fbe6c61bc156f7d6342298678dbcd 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-use-variable-for-knewstuff3-library.patch.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 17 Jun 2016 08:56:59 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index fa12a8e..fee487e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ enable_dlrestrictions.diff
 kubuntu_disable-failing-test.diff
 kubuntu_ignore-tests.diff
 disable_plasma.diff
+upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
+upstream_cmake-use-variable-for-knewstuff3-library.patch
diff --git a/debian/patches/upstream_cmake-use-variable-for-knewstuff3-library.patch b/debian/patches/upstream_cmake-use-variable-for-knewstuff3-library.patch
new file mode 100644
index 0000000..4decfca
--- /dev/null
+++ b/debian/patches/upstream_cmake-use-variable-for-knewstuff3-library.patch
@@ -0,0 +1,25 @@
+From 3eab13bc1e7fbe6c61bc156f7d6342298678dbcd Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 18 Jun 2016 08:55:44 +0200
+Subject: [PATCH] cmake: use variable for knewstuff3 library
+
+---
+ dolphin/src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dolphin/src/CMakeLists.txt b/dolphin/src/CMakeLists.txt
+index 28768e2..d2ef983 100644
+--- a/dolphin/src/CMakeLists.txt
++++ b/dolphin/src/CMakeLists.txt
+@@ -249,7 +249,7 @@ target_link_libraries(kdeinit_dolphin4
+     ${KDE4_KCMUTILS_LIBRARY}
+     konq
+     dolphinprivate4
+-    knewstuff3
++    ${KDE4_KNEWSTUFF3_LIBS}
+     ${KDE4_SOLID_LIBS}
+     ${KDE4_PHONON_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..aeffaf2
--- /dev/null
+++ b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
@@ -0,0 +1,25 @@
+From a74f99409d463837094c996c19e5f90fe92dea04 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 18 Jun 2016 08:48:19 +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 b06ba01..2aae22e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ project(KDEBASE_APPS)
+ 
++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 )
+ 
+-- 
+2.8.1
+

-- 
KDE Base Applications module packaging