| 1 |
commit: 79e6eaca022e22c63ef4e7bf3d4694d945c13eea |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 31 14:42:39 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 31 14:43:22 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e6eaca |
| 7 |
|
| 8 |
kde-apps/kdiff3: add patch fixing build failure with kde-base/kdelibs-4.14.11 |
| 9 |
|
| 10 |
Gentoo-bug: 559014 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.20.1 |
| 13 |
|
| 14 |
kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch | 12 ++++++++++++ |
| 15 |
kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild | 2 ++ |
| 16 |
2 files changed, 14 insertions(+) |
| 17 |
|
| 18 |
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch b/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..9332701 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch |
| 23 |
@@ -0,0 +1,12 @@ |
| 24 |
+--- po/CMakeLists.txt |
| 25 |
++++ po/CMakeLists.txt |
| 26 |
+@@ -1,3 +1,9 @@ |
| 27 |
++# The pofiles macro creates in some versions same name targets |
| 28 |
++# which since cmake 2.8 leads to target clashes. |
| 29 |
++# Hence force the old policy for all po directories. |
| 30 |
++# http://public.kitware.com/Bug/view.php?id=12952 |
| 31 |
++cmake_policy(SET CMP0002 OLD) |
| 32 |
++ |
| 33 |
+ find_package(Gettext REQUIRED) |
| 34 |
+ if (NOT GETTEXT_MSGMERGE_EXECUTABLE) |
| 35 |
+ MESSAGE(FATAL_ERROR "Please install msgmerge binary") |
| 36 |
|
| 37 |
diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild |
| 38 |
index 268ec2d..93e2413 100644 |
| 39 |
--- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild |
| 40 |
+++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild |
| 41 |
@@ -47,6 +47,8 @@ RDEPEND="${CDEPEND} |
| 42 |
|
| 43 |
RESTRICT="!kde? ( test )" |
| 44 |
|
| 45 |
+PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" ) |
| 46 |
+ |
| 47 |
src_unpack(){ |
| 48 |
if [[ ${PV} == *9999* ]]; then |
| 49 |
git-r3_src_unpack |
Archives