| 1 |
commit: 488d5319cf31630b221a1abe66e284df51fdd11a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 26 08:35:20 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 26 08:46:16 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488d5319 |
| 7 |
|
| 8 |
media-sound/tomahawk: Try to fix build with <cmake-3.10 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/674826 |
| 11 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
.../tomahawk-0.9.0_pre20181030-cmakepolicy.patch | 37 ++++++++++++++++++++++ |
| 15 |
.../tomahawk/tomahawk-0.9.0_pre20181030.ebuild | 7 ++-- |
| 16 |
2 files changed, 42 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..7ddf116eecc |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch |
| 23 |
@@ -0,0 +1,37 @@ |
| 24 |
+From 663981b4dd28fca6cac0b079bed26c411e7d1722 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 26 |
+Date: Fri, 25 Jan 2019 21:13:05 +0100 |
| 27 |
+Subject: [PATCH] Fix build with <cmake-3.10 |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ CMakeLists.txt | 8 ++++++-- |
| 31 |
+ 1 file changed, 6 insertions(+), 2 deletions(-) |
| 32 |
+ |
| 33 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 34 |
+index b44d2ee43..9422a808e 100644 |
| 35 |
+--- a/CMakeLists.txt |
| 36 |
++++ b/CMakeLists.txt |
| 37 |
+@@ -2,14 +2,18 @@ PROJECT( tomahawk ) |
| 38 |
+ CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 ) |
| 39 |
+ CMAKE_POLICY(SET CMP0017 NEW) |
| 40 |
+ CMAKE_POLICY(SET CMP0022 NEW) |
| 41 |
+-CMAKE_POLICY(SET CMP0075 NEW) |
| 42 |
++IF(POLICY CMP0075) |
| 43 |
++ CMAKE_POLICY(SET CMP0075 NEW) |
| 44 |
++ENDIF() |
| 45 |
+ |
| 46 |
+ # TODO: |
| 47 |
+ # Update to NEW and fix things up |
| 48 |
+ CMAKE_POLICY(SET CMP0023 NEW) |
| 49 |
+ |
| 50 |
+ # Let AUTOMOC and AUTOUIC process generated files |
| 51 |
+-CMAKE_POLICY(SET CMP0071 NEW) |
| 52 |
++IF(POLICY CMP0071) |
| 53 |
++ CMAKE_POLICY(SET CMP0071 NEW) |
| 54 |
++ENDIF() |
| 55 |
+ |
| 56 |
+ # TODO: |
| 57 |
+ # Disable automatic qtmain linking |
| 58 |
+-- |
| 59 |
+2.20.1 |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild |
| 63 |
index b9e80fa1ed9..82c9537fd05 100644 |
| 64 |
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild |
| 65 |
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2018 Gentoo Authors |
| 68 |
+# Copyright 1999-2019 Gentoo Authors |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
EAPI=6 |
| 72 |
@@ -53,7 +53,10 @@ RDEPEND="${COMMON_DEPEND} |
| 73 |
|
| 74 |
S="${WORKDIR}/${PN}-${COMMIT}" |
| 75 |
|
| 76 |
-PATCHES=( "${FILESDIR}/${P}-fix-warning.patch" ) |
| 77 |
+PATCHES=( |
| 78 |
+ "${FILESDIR}/${P}-fix-warning.patch" |
| 79 |
+ "${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826 |
| 80 |
+) |
| 81 |
|
| 82 |
src_configure() { |
| 83 |
local mycmakeargs=( |
Archives