[gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/

[Michael Palimaka]

commit:     ef72b5e8048ce1041fc836f30fca368061664455
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 17:31:25 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 17:33:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef72b5e8

media-video/kaffeine: backport patch from upstream solving build failure with >=dev-util/cmake-3.4.0

Gentoo-bug: 567112

Package-Manager: portage-2.2.26

 .../kaffeine/files/kaffeine-1.3.1-cmake34.patch    | 26 ++++++++++++++++++++++
 media-video/kaffeine/kaffeine-1.2.2-r1.ebuild      |  5 ++++-
 media-video/kaffeine/kaffeine-1.3.1.ebuild         |  2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch b/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch
new file mode 100644
index 0000000..a8c31f1
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch
@@ -0,0 +1,26 @@
+From 4a1a90ee1b2b4d13302046f043adf1c2a1de758d Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco@×××××××.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.4.10
+

diff --git a/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild b/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
index 4abb844..ac31d8c 100644
--- a/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
@@ -28,7 +28,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( Changelog NOTES )
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.2-gcc4.7.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-gcc4.7.patch"
+	"${FILESDIR}/${PN}-1.3.1-cmake34.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/media-video/kaffeine/kaffeine-1.3.1.ebuild b/media-video/kaffeine/kaffeine-1.3.1.ebuild
index f08f140..20278dc 100644
--- a/media-video/kaffeine/kaffeine-1.3.1.ebuild
+++ b/media-video/kaffeine/kaffeine-1.3.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}"
 
 DOCS=( Changelog NOTES )
 
-PATCHES=( )
+PATCHES=( "${FILESDIR}/${P}-cmake34.patch" )
 
 src_configure() {
 	local mycmakeargs=(