commit: 3125f4aac8cbb2da7bd1e6f725b0a116bff77d6a Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Fri Sep 4 09:53:40 2020 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Sep 4 09:54:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3125f4aa
media-sound/cadence: fixed compilation with clang++ thanks Stephan Hartmann (sultan) and David Seifert (soap) for the fix Closes: https://bugs.gentoo.org/740330 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> 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 +++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.1.ebuild index 6185958b360..0876fccd26d 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 b0f1b5c6668..78605b5cf61 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 00000000000..30cc6250be2 --- /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 <winsock2.h>
