commit: a739a2ed97dfedfd922da007b645ad2851cbfa3c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jul 10 20:51:52 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jul 10 21:23:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a739a2ed
media-libs/vigra: Fix build with GCC-10 Thanks-to: Victor Mataré <matare <AT> fh-aachen.de> Closes: https://bugs.gentoo.org/723302 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/vigra/files/vigra-1.11.1-gcc-10.patch | 46 ++++++++++++++++++++++++ media-libs/vigra/vigra-1.11.1-r3.ebuild | 1 + 2 files changed, 47 insertions(+) diff --git a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch new file mode 100644 index 00000000000..2433ba41712 --- /dev/null +++ b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch @@ -0,0 +1,46 @@ +From dc730be49fc8def4304a651fa525e43b7754955e Mon Sep 17 00:00:00 2001 +From: Ullrich Koethe <[email protected]> +Date: Tue, 16 Oct 2018 19:26:17 +0200 +Subject: [PATCH] fixed noexcept declaration + +--- + include/vigra/separableconvolution.hxx | 6 +++--- + include/vigra/stdconvolution.hxx | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/include/vigra/separableconvolution.hxx b/include/vigra/separableconvolution.hxx +index 7ee33c09d..8fd120602 100644 +--- a/include/vigra/separableconvolution.hxx ++++ b/include/vigra/separableconvolution.hxx +@@ -1409,10 +1409,10 @@ class Kernel1D + {} + + ~InitProxy() +-#ifndef _MSC_VER +- throw(PreconditionViolation) +-#elif _MSC_VER >= 1900 ++#if _MSC_VER >= 1900 || __cplusplus >= 201103L + noexcept(false) ++#else ++ throw(PreconditionViolation) + #endif + { + vigra_precondition(count_ == 1 || count_ == sum_, +diff --git a/include/vigra/stdconvolution.hxx b/include/vigra/stdconvolution.hxx +index 76d61a53f..657247259 100644 +--- a/include/vigra/stdconvolution.hxx ++++ b/include/vigra/stdconvolution.hxx +@@ -792,10 +792,10 @@ public: + {} + + ~InitProxy() +-#ifndef _MSC_VER +- throw(PreconditionViolation) +-#elif _MSC_VER >= 1900 ++#if _MSC_VER >= 1900 || __cplusplus >= 201103L + noexcept(false) ++#else ++ throw(PreconditionViolation) + #endif + { + vigra_precondition(count_ == 1 || count_ == sum_, diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild index 93a26b7b05e..05721485aa8 100644 --- a/media-libs/vigra/vigra-1.11.1-r3.ebuild +++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild @@ -62,6 +62,7 @@ PATCHES=( "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch" "${FILESDIR}/${P}-boost-python.patch" "${FILESDIR}/${P}-python3.7.patch" # bug 701208 + "${FILESDIR}/${P}-gcc-10.patch" # bug 723302 # TODO: upstream "${FILESDIR}/${P}-lib_suffix.patch" "${FILESDIR}/${P}-cmake-module-dir.patch"
