From 9bd54c04212e3cde2757f5c1b849f5f936c04a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 22 Oct 2023 12:56:00 +0100
Subject: [PATCH] vigra: update to 1.11.2.

---
 srcpkgs/vigra/patches/c++17.patch    | 30 ---------------------
 srcpkgs/vigra/patches/openexr3.patch | 40 ----------------------------
 srcpkgs/vigra/template               | 16 +++--------
 3 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 srcpkgs/vigra/patches/c++17.patch
 delete mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/c++17.patch b/srcpkgs/vigra/patches/c++17.patch
deleted file mode 100644
index 4195e585936..00000000000
--- a/srcpkgs/vigra/patches/c++17.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
deleted file mode 100644
index b869e858b1c..00000000000
--- a/srcpkgs/vigra/patches/openexr3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: vigra-1.11.1/CMakeLists.txt
-===================================================================
---- vigra-1.11.1.orig/CMakeLists.txt
-+++ vigra-1.11.1/CMakeLists.txt
-@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
- 
- 
- IF(WITH_OPENEXR)
-+    FIND_PACKAGE(Imath CONFIG)
-+    IF(TARGET Imath::Imath)
-+        FIND_PACKAGE(OpenEXR CONFIG)
-+        SET(OPENEXR_LIBRARIES
-+		    OpenEXR::OpenEXR
-+		    OpenEXR::Iex
-+			OpenEXR::IlmThread
-+			Imath::Imath
-+		)
-+		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
-+		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
-+		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
-+		set(OPENEXR_FOUND TRUE)
-+	ELSE()
-     VIGRA_FIND_PACKAGE(OpenEXR)
-+	ENDIF()
- ENDIF()
- 
- IF(WITH_HDF5)
-Index: vigra-1.11.1/src/impex/CMakeLists.txt
-===================================================================
---- vigra-1.11.1.orig/src/impex/CMakeLists.txt
-+++ vigra-1.11.1/src/impex/CMakeLists.txt
-@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
- ENDIF(TIFF_FOUND)
- 
- IF(OPENEXR_FOUND)
-+  cmake_policy(SET CMP0028 NEW)
-   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
- ENDIF(OPENEXR_FOUND)
- 
-
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 0ed638bcd99..039c6c49a04 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
-version=1.11.1
-revision=11
+version=1.11.2
+revision=1
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
@@ -11,19 +11,11 @@ short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
-distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
-checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+distfiles="https://github.com/ukoethe/vigra/archive/refs/tags/Version-${version//./-}.tar.gz"
+checksum=4841936f5c3c137611ec782e293d961df29d3b5b70ade8cb711374de0f4cb5d3
 make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		g++ config/output_cplusplus_version.cxx -o gccbugcheck
-		sed "s#%OUTPUT%#$(./gccbugcheck)#" $FILESDIR/TryRunResults.cmake > TryRunResults.cmake
-		configure_args+=" -C $PWD/TryRunResults.cmake"
-	fi
-}
-
 post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname