[SCM] kaffeine packaging branch, master, updated. debian/1.2.2-3-6-gc6a5465

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kaffeine.git;a=commitdiff;h=0d2a20a

The following commit has been merged in the master branch:
commit 0d2a20a4791b120e6193a0203d2d5950f88635f1
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jun 7 15:35:22 2016 +0200

    fix build with cmake >= 3.4 (#808759)
    
    backport upstream commit 4a1a90ee1b2b4d13302046f043adf1c2a1de758d
---
 debian/changelog                                   |  3 +++
 debian/patches/series                              |  1 +
 ...ream_Explicitly-include-CheckIncludeFiles.patch | 26 ++++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2e16f3b..a1febfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ kaffeine (1.2.2-4) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Drop menu file and its pixmap, since kaffeine already provides a .desktop
     file.
+  * Backport upstream commit 4a1a90ee1b2b4d13302046f043adf1c2a1de758d to fix
+    build with cmake >= 3.4; patch
+    upstream_Explicitly-include-CheckIncludeFiles.patch. (Closes: #808759)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 07 Jun 2016 15:20:52 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index b1cb9c2..69b4b1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 ftbfs_gcc47.diff
+upstream_Explicitly-include-CheckIncludeFiles.patch
diff --git a/debian/patches/upstream_Explicitly-include-CheckIncludeFiles.patch b/debian/patches/upstream_Explicitly-include-CheckIncludeFiles.patch
new file mode 100644
index 0000000..5b21485
--- /dev/null
+++ b/debian/patches/upstream_Explicitly-include-CheckIncludeFiles.patch
@@ -0,0 +1,26 @@
+From 4a1a90ee1b2b4d13302046f043adf1c2a1de758d Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+Date: Thu, 26 Nov 2015 15:36:26 +0100
+Subject: [PATCH] Explicitly include CheckIncludeFiles.
+
+This fixes the build with CMake 3.4.0. We were calling check_include_files()
+and implicitly relying on CheckIncludeFiles being included.
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9be8db..b74b44d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,6 +21,7 @@ if(STRICT_BUILD)
+                   -DQT_NO_URL_CAST_FROM_STRING -DQT_STRICT_ITERATORS)
+ endif(STRICT_BUILD)
+ 
++include(CheckIncludeFiles)
+ check_include_files(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB)
+ 
+ if(NOT HAVE_DVB)
+-- 
+2.8.1
+

-- 
kaffeine packaging