diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-12-01 04:31:25 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-12-01 04:33:17 +1100 |
| commit | ef72b5e8048ce1041fc836f30fca368061664455 (patch) | |
| tree | cd9a561a2b4419cf3534b16f87dbf311904a869c /media-video/kaffeine | |
| parent | dev-go/godep: remove old version (diff) | |
| download | gentoo-ef72b5e8048ce1041fc836f30fca368061664455.tar.gz gentoo-ef72b5e8048ce1041fc836f30fca368061664455.tar.bz2 gentoo-ef72b5e8048ce1041fc836f30fca368061664455.zip | |
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
Diffstat (limited to 'media-video/kaffeine')
| -rw-r--r-- | media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch | 26 | ||||
| -rw-r--r-- | media-video/kaffeine/kaffeine-1.2.2-r1.ebuild | 5 | ||||
| -rw-r--r-- | 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 000000000000..a8c31f19f69f --- /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 4abb844cbcb9..ac31d8c7ee3b 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 f08f1409e698..20278dceb6fb 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=( |