[SCM] baloo packaging branch, master, updated. debian/4.14.2-1-12-g192289a

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/baloo.git;a=commitdiff;h=34c1221

The following commit has been merged in the master branch:
commit 34c1221bbdd16ac9ff53eaeab06e3fc0395d3d4e
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jul 28 08:05:24 2016 +0200

    fix cmake policies
    
    backport upstream commit 1cb511b205fb9f283e1f6bb2fedb2e8206d93540
---
 debian/changelog                                   |  4 +++
 debian/patches/series                              |  1 +
 ...inimum_required-to-set-the-cmake-policies.patch | 40 ++++++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 830f4f0..df977e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ baloo (4:4.14.3-0r1) UNRELEASED; urgency=medium
   * Small fixes to copyright.
   * Bump Standards-Version to 3.9.8, no changes required.
   * Stop using ${shlibs:Depends} in baloo-dev, as it's empty.
+  * Backport upstream commit 1cb511b205fb9f283e1f6bb2fedb2e8206d93540 to set
+    the cmake minimum version required and policies, and build properly with
+    that; patch
+    upstream_Set-cmake_minimum_required-to-set-the-cmake-policies.patch.
 
  -- Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 28 Jul 2016 07:52:05 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index fd393f8..c39170d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_tests_depending_on_revdep
+upstream_Set-cmake_minimum_required-to-set-the-cmake-policies.patch
diff --git a/debian/patches/upstream_Set-cmake_minimum_required-to-set-the-cmake-policies.patch b/debian/patches/upstream_Set-cmake_minimum_required-to-set-the-cmake-policies.patch
new file mode 100644
index 0000000..14c0aad
--- /dev/null
+++ b/debian/patches/upstream_Set-cmake_minimum_required-to-set-the-cmake-policies.patch
@@ -0,0 +1,40 @@
+From 1cb511b205fb9f283e1f6bb2fedb2e8206d93540 Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Wed, 18 May 2016 23:10:19 +0200
+Subject: [PATCH] Set cmake_minimum_required to set the cmake policies.
+
+Otherwise future changes in cmake can break compilation.
+---
+ CMakeLists.txt                                   | 2 ++
+ src/file/autotest/fileindexingjob/CMakeLists.txt | 3 +--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 62ddee3..6cb604f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
++
+ project(baloo)
+ 
+ set(BALOO_VERSION_MAJOR 4)
+diff --git a/src/file/autotest/fileindexingjob/CMakeLists.txt b/src/file/autotest/fileindexingjob/CMakeLists.txt
+index 486ed67..016b42d 100644
+--- a/src/file/autotest/fileindexingjob/CMakeLists.txt
++++ b/src/file/autotest/fileindexingjob/CMakeLists.txt
+@@ -10,10 +10,9 @@ if(WIN32)
+     set_target_properties(baloo_file_extractor_dummy
+         PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ endif()
+-add_definitions("-DBALOO_TEMP_PATH=\\"${CMAKE_CURRENT_BINARY_DIR}\\"")
+ kde4_add_unit_test(fileindexingjobtest NOGUI fileindexingjobtest.cpp
+                                              ../../fileindexingjob.cpp)
+-set_target_properties(fileindexingjobtest PROPERTIES COMPILE_FLAGS -DBALOO_FILE_EXPORT=)
++set_target_properties(fileindexingjobtest PROPERTIES COMPILE_FLAGS -DBALOO_TEMP_PATH="\"${CMAKE_CURRENT_BINARY_DIR}/\""\ -DBALOO_FILE_EXPORT=)
+ target_link_libraries(fileindexingjobtest
+   ${QT_QTTEST_LIBRARY}
+   ${KDE4_KDECORE_LIBS}
+-- 
+2.8.1
+

-- 
baloo packaging