diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-31 16:00:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-31 16:00:27 +0000 |
commit | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (patch) | |
tree | c34bf820c2809fb7e08ed5564df2a25cf759516f /media-sound/tomahawk | |
parent | 693cc9b6e847a01c1bb692153021aaf9fb0fab25 (diff) |
gentoo resync 31.01.2019
Diffstat (limited to 'media-sound/tomahawk')
-rw-r--r-- | media-sound/tomahawk/Manifest | 3 | ||||
-rw-r--r-- | media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch | 37 | ||||
-rw-r--r-- | media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild | 7 |
3 files changed, 44 insertions, 3 deletions
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest index 058a7b6848b7..f3b0886208dd 100644 --- a/media-sound/tomahawk/Manifest +++ b/media-sound/tomahawk/Manifest @@ -1,4 +1,5 @@ +AUX tomahawk-0.9.0_pre20181030-cmakepolicy.patch 926 BLAKE2B 8af469b6186e57db674dc5acaec6032bf43c15d91b5db9a9bf30f617c47b74486149a50774c76eb69bf89157e1ee8eed0d449b9d107e4f8e7e376f9d9d4f9d29 SHA512 7d0c98a6f1708d156ab643439faf3f469fa21a106f618dc1b8b7c569a2f65a9c929670bc1aa679eebf1116e615fd832593116f84e3abe5fff3d91450e1455f21 AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5 DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202 -EBUILD tomahawk-0.9.0_pre20181030.ebuild 1719 BLAKE2B fb60cb5b1d1242063fd1061f602402b680de409245f988f07e136ab80f80dd4fd6e4d3c614a8686931ab5a59a2c8a5020eda9ee0074e719a85cbd39e740e7bdc SHA512 5131942184c391b6d9865e0f0e7bdb0bc068a97214b8c88a446cebcfd05ae548b1156ec4be01bb0aeabc81eab8ee8612bd90cf5c8e4429a5a60e4bb94d42ba25 +EBUILD tomahawk-0.9.0_pre20181030.ebuild 1771 BLAKE2B 274be96fe2d1072d028245ab133e1f11630d56ee89fa9e4910d708f0ee386f5028a197f0fd88f42c0dc324885a41e49a60a82d16f6750db1faab630b7cc5d13c SHA512 2454cfc8e03f74fce0c752780118b5093bc7f5e160914b26c37814d6bca7b2060d472612f352c4198835270cfb7fa9f486e94a255348110ef9ea57b2bb235be4 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15 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 new file mode 100644 index 000000000000..7ddf116eeccc --- /dev/null +++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch @@ -0,0 +1,37 @@ +From 663981b4dd28fca6cac0b079bed26c411e7d1722 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 25 Jan 2019 21:13:05 +0100 +Subject: [PATCH] Fix build with <cmake-3.10 + +--- + CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b44d2ee43..9422a808e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,14 +2,18 @@ PROJECT( tomahawk ) + CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 ) + CMAKE_POLICY(SET CMP0017 NEW) + CMAKE_POLICY(SET CMP0022 NEW) +-CMAKE_POLICY(SET CMP0075 NEW) ++IF(POLICY CMP0075) ++ CMAKE_POLICY(SET CMP0075 NEW) ++ENDIF() + + # TODO: + # Update to NEW and fix things up + CMAKE_POLICY(SET CMP0023 NEW) + + # Let AUTOMOC and AUTOUIC process generated files +-CMAKE_POLICY(SET CMP0071 NEW) ++IF(POLICY CMP0071) ++ CMAKE_POLICY(SET CMP0071 NEW) ++ENDIF() + + # TODO: + # Disable automatic qtmain linking +-- +2.20.1 + diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild index b9e80fa1ed9e..82c9537fd054 100644 --- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild +++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,7 +53,10 @@ RDEPEND="${COMMON_DEPEND} S="${WORKDIR}/${PN}-${COMMIT}" -PATCHES=( "${FILESDIR}/${P}-fix-warning.patch" ) +PATCHES=( + "${FILESDIR}/${P}-fix-warning.patch" + "${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826 +) src_configure() { local mycmakeargs=( |