Accepting request 1040621 from Application:Geo

OBS-URL: https://build.opensuse.org/request/show/1040621
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/insighttoolkit?expand=0&rev=14

insighttoolkit-5.2.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6022b2b64624b8bcec3333fe48d5f74ff6ebceb3bdf98258ba7d7fbbc76b99ab
-size 20955613

insighttoolkit-5.3.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64e7e8094a5023c8f68ee042459d6319581fadb35e2fe90a4ae230ce36369db1
+size 21844157

insighttoolkit-fno-sized-deallocation.patch

@@ -1,32 +0,0 @@
-From 58ce6e84f2b93a963f5e4ec58b87f72886a0aa6f Mon Sep 17 00:00:00 2001
-From: Matt McCormick <matt.mccormick@kitware.com>
-Date: Wed, 10 Aug 2022 15:23:47 -0400
-Subject: [PATCH] COMP: Add -fno-sized-deallocation for GCC 12
-
-Addresses:
-
-```
-/usr/lib/gcc/x86_64-pc-linux-gnu/12.1.0/../../../../include/c++/12.1.0/bits/new_allocator.h:158:2: error: call to '__builtin_operator_delete' selects non-usual deallocation function
-        _GLIBCXX_OPERATOR_DELETE(_GLIBCXX_SIZED_DEALLOC(__p, __n));
-```
-
-Fixes #3452
----
- CMake/ITKSetStandardCompilerFlags.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMake/ITKSetStandardCompilerFlags.cmake b/CMake/ITKSetStandardCompilerFlags.cmake
-index 7886b169e52..8c3eabe3aab 100644
---- a/CMake/ITKSetStandardCompilerFlags.cmake
-+++ b/CMake/ITKSetStandardCompilerFlags.cmake
-@@ -344,6 +344,10 @@ macro(check_compiler_platform_flags)
-       endforeach()
-     endif()
- 
-+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12")
-+      set(ITK_REQUIRED_CXX_FLAGS "${ITK_REQUIRED_CXX_FLAGS} -fno-sized-deallocation")
-+    endif()
-+
-     # gcc must have -msse2 option to enable sse2 support
-     if(VNL_CONFIG_ENABLE_SSE2 OR VNL_CONFIG_ENABLE_SSE2_ROUNDING)
-       set(ITK_REQUIRED_CXX_FLAGS "${ITK_REQUIRED_CXX_FLAGS} -msse2")

insighttoolkit.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Dec  2 06:26:54 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 5.3.0:
+  * No release notes.
+- Drop insighttoolkit-fno-sized-deallocation.patch: incorporated
+  upstream.
+- Enable builds for 32 bit, gh#InsightSoftwareConsortium/ITK#2529
+  resolved.
+- At least swig 4.0 required.
+
 -------------------------------------------------------------------
 Mon Aug 29 05:28:58 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
 

insighttoolkit.spec

@@ -19,7 +19,7 @@
 
 %global __builder ninja
 %define tarname ITK
-%define libname lib%{name}5_2-1
+%define libname lib%{name}5_3-1
 
 # Do not use system eigen on aarch64 until fixed upstream:
 # https://github.com/InsightSoftwareConsortium/ITK/issues/2903
@@ -29,7 +29,7 @@
 %bcond_without system_eigen
 %endif
 
-# Python bindings must be turned off until https://github.com/InsightSoftwareConsortium/ITK/issues/3506 is resolved
+# Python bindings must be turned off until https://github.com/InsightSoftwareConsortium/ITK/issues/3782 is resolved
 %if 0%{?suse_version} >= 1550
 %bcond_with python
 %else
@@ -37,14 +37,12 @@
 %endif
 
 Name:           insighttoolkit
-Version:        5.2.1
+Version:        5.3.0
 Release:        0
 Summary:        Toolkit for scientific image processing, segmentation, and registration
 License:        Apache-2.0
 URL:            https://www.itk.org
 Source:         https://github.com/InsightSoftwareConsortium/ITK/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM insighttoolkit-fno-sized-deallocation.patch gh#InsightSoftwareConsortium/ITK#3452 badshah400@gmail.com -- Add -fno-sized-deallocation for GCC 12 to fix build failures; patch taken from upstream commit
-Patch0:         https://github.com/InsightSoftwareConsortium/ITK/commit/8f5e2618c2dee584e53ad13899384af82fbb77d9.patch#/insighttoolkit-fno-sized-deallocation.patch
 BuildRequires:  CastXML-devel
 BuildRequires:  bison
 BuildRequires:  cmake
@@ -70,11 +68,9 @@ BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(zlib)
-# https://github.com/InsightSoftwareConsortium/ITK/issues/2529
-ExcludeArch:    %{ix86}
 %if %{with python}
 BuildRequires:  python3-devel
-BuildRequires:  swig
+BuildRequires:  swig >= 4.0
 %endif
 %if %{with system_eigen}
 BuildRequires:  pkgconfig(eigen3)