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/kde-gtk-config/files/
Date: Mon, 31 Aug 2015 15:22:51
Message-Id: 1441034542.e304c8b200a1b64e0547febeafa1686ed0834b39.kensington@gentoo
1 commit: e304c8b200a1b64e0547febeafa1686ed0834b39
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 31 15:21:53 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 31 15:22:22 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e304c8b2
7
8 kde-misc/kde-gtk-config: improve kde-base/kdelibs-4.14.11 compatibility patch
9
10 Gentoo-bug: 559108
11
12 Package-Manager: portage-2.2.20.1
13
14 .../kde-gtk-config-2.2.1-kdelibs-4.14.11.patch | 27 ++++++++++++++++++++++
15 1 file changed, 27 insertions(+)
16
17 diff --git a/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch b/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch
18 index ca20682..86c8b4c 100644
19 --- a/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch
20 +++ b/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch
21 @@ -50,3 +50,30 @@ index 9821cbf..18ee2d5 100644
22 --
23 2.4.6
24
25 +--- a/CMakeLists.txt
26 ++++ b/CMakeLists.txt
27 +@@ -47,6 +47,4 @@
28 + add_subdirectory(gtkproxies)
29 + add_subdirectory(gtk3proxies)
30 + add_subdirectory(icons)
31 +-find_package(Msgfmt REQUIRED)
32 +-find_package(Gettext REQUIRED)
33 + add_subdirectory( po )
34 +
35 +--- a/po/CMakeLists.txt
36 ++++ b/po/CMakeLists.txt
37 +@@ -0,0 +1,14 @@
38 ++# The pofiles macro creates in some versions same name targets
39 ++# which since cmake 2.8 leads to target clashes.
40 ++# Hence force the old policy for all po directories.
41 ++# http://public.kitware.com/Bug/view.php?id=12952
42 ++cmake_policy(SET CMP0002 OLD)
43 ++
44 ++find_package(Gettext REQUIRED)
45 ++if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
46 ++MESSAGE(FATAL_ERROR "Please install msgmerge binary")
47 ++endif (NOT GETTEXT_MSGMERGE_EXECUTABLE)
48 ++if (NOT GETTEXT_MSGFMT_EXECUTABLE)
49 ++MESSAGE(FATAL_ERROR "Please install msgmerge binary")
50 ++endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
51 ++