summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch12
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild2
2 files changed, 14 insertions, 0 deletions
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
new file mode 100644
index 000000000000..9332701ea925
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.98-kdelibs-4.14.11.patch
@@ -0,0 +1,12 @@
+--- po/CMakeLists.txt
++++ po/CMakeLists.txt
+@@ -1,3 +1,9 @@
++# The pofiles macro creates in some versions same name targets
++# which since cmake 2.8 leads to target clashes.
++# Hence force the old policy for all po directories.
++# http://public.kitware.com/Bug/view.php?id=12952
++cmake_policy(SET CMP0002 OLD)
++
+ find_package(Gettext REQUIRED)
+ if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
+ MESSAGE(FATAL_ERROR "Please install msgmerge binary")
diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
index 268ec2dd8ad7..93e2413f0b59 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
@@ -47,6 +47,8 @@ RDEPEND="${CDEPEND}
RESTRICT="!kde? ( test )"
+PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
+
src_unpack(){
if [[ ${PV} == *9999* ]]; then
git-r3_src_unpack