| 1 |
commit: 3b15cc941d69608f6b52f94ea7596dcb233bdc6b |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 16:22:56 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 16:23:43 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b15cc94 |
| 7 |
|
| 8 |
media-sound/kmidimon: add patch fixing build failure with kde-base/kdelibs-4.14.11 |
| 9 |
|
| 10 |
Gentoo-bug: 559180 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.20.1 |
| 13 |
|
| 14 |
.../kmidimon/files/kmidimon-0.7.5-kdelibs-4.14.11.patch | 17 +++++++++++++++++ |
| 15 |
media-sound/kmidimon/kmidimon-0.7.5.ebuild | 3 ++- |
| 16 |
2 files changed, 19 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/media-sound/kmidimon/files/kmidimon-0.7.5-kdelibs-4.14.11.patch b/media-sound/kmidimon/files/kmidimon-0.7.5-kdelibs-4.14.11.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..833be96 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-sound/kmidimon/files/kmidimon-0.7.5-kdelibs-4.14.11.patch |
| 23 |
@@ -0,0 +1,17 @@ |
| 24 |
+The uninstall target is created automatically by FindKDE4Internal. Due to |
| 25 |
+cmake policy changes in kdelibs-4.14.11, this target name collision causes |
| 26 |
+a build failure. |
| 27 |
+ |
| 28 |
+https://bugs.gentoo.org/show_bug.cgi?id=559180 |
| 29 |
+ |
| 30 |
+--- CMakeLists.txt |
| 31 |
++++ CMakeLists.txt |
| 32 |
+@@ -132,8 +132,6 @@ |
| 33 |
+ "${CMAKE_SOURCE_DIR}/cmake_admin/cmake_uninstall.cmake.in" |
| 34 |
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" |
| 35 |
+ IMMEDIATE @ONLY) |
| 36 |
+-ADD_CUSTOM_TARGET(uninstall |
| 37 |
+- "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") |
| 38 |
+ |
| 39 |
+ ADD_CUSTOM_TARGET ( tarball |
| 40 |
+ COMMAND mkdir -p kmidimon-${VERSION} |
| 41 |
|
| 42 |
diff --git a/media-sound/kmidimon/kmidimon-0.7.5.ebuild b/media-sound/kmidimon/kmidimon-0.7.5.ebuild |
| 43 |
index 9a0f8a3..9e4cb99 100644 |
| 44 |
--- a/media-sound/kmidimon/kmidimon-0.7.5.ebuild |
| 45 |
+++ b/media-sound/kmidimon/kmidimon-0.7.5.ebuild |
| 46 |
@@ -1,4 +1,4 @@ |
| 47 |
-# Copyright 1999-2014 Gentoo Foundation |
| 48 |
+# Copyright 1999-2015 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Id$ |
| 51 |
|
| 52 |
@@ -24,6 +24,7 @@ RDEPEND=" |
| 53 |
DEPEND="${RDEPEND}" |
| 54 |
|
| 55 |
DOCS=( AUTHORS ChangeLog NEWS README TODO ) |
| 56 |
+PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" ) |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
local mycmakeargs=( |
Archives