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

Gentoo-bug: 567112

Package-Manager: portage-2.2.26

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 (file)
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@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.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 4abb844cbcb9db2bff524b93bdb4c93ec0cd5e37..ac31d8c7ee3ba5b6a2a58631918a27ce6291f200 100644 (file)
--- 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 f08f1409e6984101334f915c2e9637711b88ad99..20278dceb6fb0692498c4b916ca1f32ecdac245f 100644 (file)
--- 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=(