From 563a1699f414426f46e1be14e17c95a2ce46bb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Nov 2022 22:46:21 +0700 Subject: [PATCH] vigra: patch for C++17 --- srcpkgs/vigra/patches/c++17.patch | 30 ++++++++++++++++++++++++++++++ srcpkgs/vigra/template | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/vigra/patches/c++17.patch diff --git a/srcpkgs/vigra/patches/c++17.patch b/srcpkgs/vigra/patches/c++17.patch new file mode 100644 index 00000000000..4195e585936 --- /dev/null +++ b/srcpkgs/vigra/patches/c++17.patch @@ -0,0 +1,30 @@ +Index: vigra-1.11.1/include/vigra/stdconvolution.hxx +=================================================================== +--- vigra-1.11.1.orig/include/vigra/stdconvolution.hxx ++++ vigra-1.11.1/include/vigra/stdconvolution.hxx +@@ -792,7 +792,9 @@ public: + {} + + ~InitProxy() +-#ifndef _MSC_VER ++#if __cplusplus >= 201700L ++ noexcept(false) ++#elif !defined(_MSC_VER) + throw(PreconditionViolation) + #elif _MSC_VER >= 1900 + noexcept(false) +Index: vigra-1.11.1/include/vigra/separableconvolution.hxx +=================================================================== +--- vigra-1.11.1.orig/include/vigra/separableconvolution.hxx ++++ vigra-1.11.1/include/vigra/separableconvolution.hxx +@@ -1409,7 +1409,9 @@ class Kernel1D + {} + + ~InitProxy() +-#ifndef _MSC_VER ++#if __cplusplus >= 201700L ++ noexcept(false) ++#elif !defined(_MSC_VER) + throw(PreconditionViolation) + #elif _MSC_VER >= 1900 + noexcept(false) diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template index 6006c796455..d2e91a7019b 100644 --- a/srcpkgs/vigra/template +++ b/srcpkgs/vigra/template @@ -1,7 +1,7 @@ # Template file for 'vigra' pkgname=vigra version=1.11.1 -revision=6 +revision=7 build_style=cmake configure_args="-DWITH_OPENEXR=1" hostmakedepends="python3"