Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/colord-kde/, kde-misc/colord-kde/files/
Date: Fri, 25 Dec 2015 17:22:26
Message-Id: 1451064127.590c1cbfed77e4c7198be6968ed4ed52e89e2e66.kensington@gentoo
1 commit: 590c1cbfed77e4c7198be6968ed4ed52e89e2e66
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 25 17:19:09 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 25 17:22:07 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590c1cbf
7
8 kde-misc/colord-kde: fix build with >=dev-util/cmake-3.4
9
10 Gentoo-bug: 569602
11
12 Package-Manager: portage-2.2.26
13
14 kde-misc/colord-kde/colord-kde-0.3.0.ebuild | 2 ++
15 kde-misc/colord-kde/files/colord-kde-0.3.0-cmake34.patch | 11 +++++++++++
16 2 files changed, 13 insertions(+)
17
18 diff --git a/kde-misc/colord-kde/colord-kde-0.3.0.ebuild b/kde-misc/colord-kde/colord-kde-0.3.0.ebuild
19 index e0596cd..c348cc7 100644
20 --- a/kde-misc/colord-kde/colord-kde-0.3.0.ebuild
21 +++ b/kde-misc/colord-kde/colord-kde-0.3.0.ebuild
22 @@ -23,6 +23,8 @@ RDEPEND="${DEPEND}
23 x11-misc/colord
24 "
25
26 +PATCHES=( "${FILESDIR}/${P}-cmake34.patch" )
27 +
28 pkg_postinst() {
29 kde4-base_pkg_postinst
30 if ! has_version "gnome-extra/gnome-color-manager"; then
31
32 diff --git a/kde-misc/colord-kde/files/colord-kde-0.3.0-cmake34.patch b/kde-misc/colord-kde/files/colord-kde-0.3.0-cmake34.patch
33 new file mode 100644
34 index 0000000..671482d
35 --- /dev/null
36 +++ b/kde-misc/colord-kde/files/colord-kde-0.3.0-cmake34.patch
37 @@ -0,0 +1,11 @@
38 +Fix build with >cmake-3.4
39 +
40 +Gentoo-bug: 569602
41 +
42 +--- a/ConfigureChecks.cmake
43 ++++ b/ConfigureChecks.cmake
44 +@@ -1,3 +1,4 @@
45 ++include(CheckIncludeFiles)
46 + include(CheckTypeSize)
47 + include(FindPkgConfig)
48 +