From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- media-sound/cadence/Manifest | 5 +++-- media-sound/cadence/cadence-0.9.1.ebuild | 1 + media-sound/cadence/cadence-9999.ebuild | 4 ++++ media-sound/cadence/files/cadence-0.9.1-fix-clang.patch | 17 +++++++++++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 media-sound/cadence/files/cadence-0.9.1-fix-clang.patch (limited to 'media-sound/cadence') diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest index e4baa614fc97..6fdbeea2eb19 100644 --- a/media-sound/cadence/Manifest +++ b/media-sound/cadence/Manifest @@ -1,5 +1,6 @@ +AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719 AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713 DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219 -EBUILD cadence-0.9.1.ebuild 2410 BLAKE2B 2d1e0b36ea3d2ba7b040e940a9a9e7ac5849d9b2362fd3dc87647073ae919f41784a889d00165d94f5bbc69a855d09d6d3741aeb0f50f0ebb80ca4d1669ecab2 SHA512 7ed6d65a4437d3620e39f0c6377c0ff1ec6eb2181a812697522a8a5e662ef9d55276dcce6c2aa2447bb6e670ce8ec4373c2846e645616ccb9c555e7393788f4c -EBUILD cadence-9999.ebuild 2356 BLAKE2B 3e3422570afd70a1e8aa59ddf546aa2e1395a78009372e53c585f6979d82d051ca67fd4f35989b2a3140cb6ca317eb59476e2f8d5f6418d71419a4368ca10887 SHA512 b83ae35507c4f57faf60fb88364e33cc7fc96e7bf4951964c2a6afb80111178fa0633939d99acebcb2f336cf25520af52d788cb06eac3e616c38a20b913a1e53 +EBUILD cadence-0.9.1.ebuild 2446 BLAKE2B 0b6cb6c6ad38b5ef4e687b6f60137f3ae474248d5a36ca64c302652ec550de8a0405f17bd791c9d7942c41470fe4e28d0ef71283e3bec60cde375b505cc29277 SHA512 303a5166fd3c4ad4b17ecd162e11f2e10aadd5c915645f86d44cc36d6753c6158fb5820b56d5130492ba3bb099eebc38a79826c03efea01073f64d5cd97b7930 +EBUILD cadence-9999.ebuild 2412 BLAKE2B ce521fce0aad9cb56b3868b09ae28e267913ab2cee1ee8b42445b59ca45fef45e6e3906583e3d5666a3a72390c08ab239fb7ead259338b10c6b38ea54f1e398c SHA512 99de5daa886120a2cb05ebbb6e4a03c1665fdc2ea58b3d922a4028c0ccf144508ef3a02ba69f88421df48de182a7bca9e44859c98f074376a63dbe4f664c882a MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.1.ebuild index 6185958b360d..0876fccd26df 100644 --- a/media-sound/cadence/cadence-0.9.1.ebuild +++ b/media-sound/cadence/cadence-0.9.1.ebuild @@ -41,6 +41,7 @@ RDEPEND="${CDEPEND}" DEPEND="${CDEPEND}" PATCHES=( + "${FILESDIR}"/${P}-fix-clang.patch "${FILESDIR}"/${P}-fix-qt5.15.patch ) diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild index b0f1b5c66689..78605b5cf613 100644 --- a/media-sound/cadence/cadence-9999.ebuild +++ b/media-sound/cadence/cadence-9999.ebuild @@ -40,6 +40,10 @@ CDEPEND=" RDEPEND="${CDEPEND}" DEPEND="${CDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-0.9.1-fix-clang.patch +) + src_prepare() { sed -i -e "s/python3/${EPYTHON}/" \ data/cadence \ diff --git a/media-sound/cadence/files/cadence-0.9.1-fix-clang.patch b/media-sound/cadence/files/cadence-0.9.1-fix-clang.patch new file mode 100644 index 000000000000..30cc6250be20 --- /dev/null +++ b/media-sound/cadence/files/cadence-0.9.1-fix-clang.patch @@ -0,0 +1,17 @@ +diff --git a/c++/jackbridge/JackBridgeDefines.hpp b/c++/jackbridge/JackBridgeDefines.hpp +index a59f58a..8655291 100644 +--- a/c++/jackbridge/JackBridgeDefines.hpp ++++ b/c++/jackbridge/JackBridgeDefines.hpp +@@ -50,12 +50,6 @@ + # endif + #endif + +-#ifndef JACKBRIDGE_PROPER_CPP11_SUPPORT +-# define override +-# define noexcept +-# define nullptr (0) +-#endif +- + // Common includes + #ifdef JACKBRIDGE_OS_WIN + # include -- cgit v1.2.3