diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-07-10 22:51:52 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-07-10 23:23:44 +0200 |
| commit | a739a2ed97dfedfd922da007b645ad2851cbfa3c (patch) | |
| tree | 72d36a35fa54cc628dbe10384368423f8154eecf /media-libs | |
| parent | dev-util/diffoscope: bump up to 151 (diff) | |
| download | gentoo-a739a2ed97dfedfd922da007b645ad2851cbfa3c.tar.gz gentoo-a739a2ed97dfedfd922da007b645ad2851cbfa3c.tar.bz2 gentoo-a739a2ed97dfedfd922da007b645ad2851cbfa3c.zip | |
media-libs/vigra: Fix build with GCC-10
Thanks-to: Victor Mataré <matare@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@gentoo.org>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/vigra/files/vigra-1.11.1-gcc-10.patch | 46 | ||||
| -rw-r--r-- | media-libs/vigra/vigra-1.11.1-r3.ebuild | 1 |
2 files changed, 47 insertions, 0 deletions
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 000000000000..2433ba41712a --- /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 <ullrich.koethe@iwr.uni-heidelberg.de> +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 93a26b7b05e2..05721485aa86 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" |