From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 393D2138359 for ; Fri, 10 Jul 2020 21:24:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FBB6E0849; Fri, 10 Jul 2020 21:24:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 475DFE0849 for ; Fri, 10 Jul 2020 21:24:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D512F34F79B for ; Fri, 10 Jul 2020 21:24:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B8E62C4 for ; Fri, 10 Jul 2020 21:24:00 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1594416224.a739a2ed97dfedfd922da007b645ad2851cbfa3c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vigra/files/vigra-1.11.1-gcc-10.patch media-libs/vigra/vigra-1.11.1-r3.ebuild X-VCS-Directories: media-libs/vigra/files/ media-libs/vigra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a739a2ed97dfedfd922da007b645ad2851cbfa3c X-VCS-Branch: master Date: Fri, 10 Jul 2020 21:24:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bedb7719-40e6-4dad-99e8-080c9000ef6f X-Archives-Hash: b6c98d06995cc8fbb8a99fe97569071d commit: a739a2ed97dfedfd922da007b645ad2851cbfa3c Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jul 10 20:51:52 2020 +0000 Commit: Andreas Sturmlechner gentoo 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é fh-aachen.de> Closes: https://bugs.gentoo.org/723302 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner 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 +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"