Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package insighttoolkit for openSUSE:Factory 
checked in at 2022-09-01 22:11:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/insighttoolkit (Old)
 and      /work/SRC/openSUSE:Factory/.insighttoolkit.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "insighttoolkit"

Thu Sep  1 22:11:14 2022 rev:13 rq:1000532 version:5.2.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/insighttoolkit/insighttoolkit.changes    
2022-04-28 23:08:07.336697584 +0200
+++ /work/SRC/openSUSE:Factory/.insighttoolkit.new.2083/insighttoolkit.changes  
2022-09-01 22:12:12.976415651 +0200
@@ -1,0 +2,9 @@
+Mon Aug 29 05:28:58 UTC 2022 - Atri Bhattacharya <[email protected]>
+
+- Disable python bindings for openSUSE >= 1550 until swig related
+  issues are sorted [gh#InsightSoftwareConsortium/ITK#3452].
+- Add insighttoolkit-fno-sized-deallocation.patch: Add
+  -fno-sized-deallocation for GCC 12; patch taken from upstream
+  commit.
+
+-------------------------------------------------------------------

New:
----
  insighttoolkit-fno-sized-deallocation.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ insighttoolkit.spec ++++++
--- /var/tmp/diff_new_pack.ZCFWYJ/_old  2022-09-01 22:12:13.972418374 +0200
+++ /var/tmp/diff_new_pack.ZCFWYJ/_new  2022-09-01 22:12:13.976418385 +0200
@@ -29,6 +29,13 @@
 %bcond_without system_eigen
 %endif
 
+# Python bindings must be turned off until 
https://github.com/InsightSoftwareConsortium/ITK/issues/3506 is resolved
+%if 0%{?suse_version} >= 1550
+%bcond_with python
+%else
+%bcond_without python
+%endif
+
 Name:           insighttoolkit
 Version:        5.2.1
 Release:        0
@@ -36,6 +43,8 @@
 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 [email protected] -- 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
@@ -49,15 +58,10 @@
 BuildRequires:  libnsl-devel
 BuildRequires:  ninja
 BuildRequires:  pkgconfig
-BuildRequires:  python3-devel
-BuildRequires:  swig
 BuildRequires:  vtk-devel
 BuildRequires:  vtk-qt
 BuildRequires:  xz
 BuildRequires:  cmake(double-conversion)
-%if %{with system_eigen}
-BuildRequires:  pkgconfig(eigen3)
-%endif
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(fftw3)
 BuildRequires:  pkgconfig(libjpeg)
@@ -68,6 +72,13 @@
 BuildRequires:  pkgconfig(zlib)
 # https://github.com/InsightSoftwareConsortium/ITK/issues/2529
 ExcludeArch:    %{ix86}
+%if %{with python}
+BuildRequires:  python3-devel
+BuildRequires:  swig
+%endif
+%if %{with system_eigen}
+BuildRequires:  pkgconfig(eigen3)
+%endif
 
 %description
 The Insight Toolkit (ITK) is a toolkit for N-dimensional scientific
@@ -145,7 +156,7 @@
   -DVXL_BUILD_CORE_NUMERICS:BOOL=OFF \
   -DVCL_INCLUDE_CXX_0X:BOOL=ON \
   -DITK_FORBID_DOWNLOADS=ON \
-  -DITK_WRAP_PYTHON:BOOL=ON
+  -DITK_WRAP_PYTHON:BOOL=%{?with_python:ON}%{!?with_python:OFF}
 
 %cmake_build
 
@@ -169,9 +180,11 @@
 %{_bindir}/itkTestDriver
 %doc %{_docdir}/%{name}/
 
+%if %{with python}
 %files -n python3-itk
 %license LICENSE NOTICE
 %{python3_sitearch}/*.py
 %{python3_sitearch}/itk/
+%endif
 
 %changelog

++++++ insighttoolkit-fno-sized-deallocation.patch ++++++
>From 58ce6e84f2b93a963f5e4ec58b87f72886a0aa6f Mon Sep 17 00:00:00 2001
From: Matt McCormick <[email protected]>
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")

Reply via email to