diff -pruN 4.13.3withdata-dfsg2-3/debian/changelog 4.13.3withdata-dfsg2-3ubuntu2/debian/changelog --- 4.13.3withdata-dfsg2-3/debian/changelog 2022-05-19 18:18:37.000000000 +0000 +++ 4.13.3withdata-dfsg2-3ubuntu2/debian/changelog 2022-10-17 12:06:27.000000000 +0000 @@ -1,3 +1,23 @@ +insighttoolkit4 (4.13.3withdata-dfsg2-3ubuntu2) kinetic; urgency=medium + + * d/control, d/rules: Force build with GCC 11 as it apparently miscompiles + on GCC 12 (successfully compiled but testsuite fails) (LP: #1993169) + + -- Simon Chopin Mon, 17 Oct 2022 14:06:27 +0200 + +insighttoolkit4 (4.13.3withdata-dfsg2-3ubuntu1) kinetic; urgency=medium + + * debian/patches/0001-COMP-Ensure-CastXML-uses-C-11-with-GCC-or-Clang.patch: + Cherry-pick from upstream to fix FTBFS with gcc 12. Closes: #1012950. + + -- Steve Langasek Sat, 08 Oct 2022 00:19:31 +0000 + +insighttoolkit4 (4.13.3withdata-dfsg2-3build1) kinetic; urgency=medium + + * No-change rebuild against libminc2-5.3.0 + + -- Steve Langasek Thu, 25 Aug 2022 15:20:17 +0000 + insighttoolkit4 (4.13.3withdata-dfsg2-3) unstable; urgency=medium * d/control: adjust Vcs-* fields to point to itk-4.y. diff -pruN 4.13.3withdata-dfsg2-3/debian/control 4.13.3withdata-dfsg2-3ubuntu2/debian/control --- 4.13.3withdata-dfsg2-3/debian/control 2022-05-19 18:18:37.000000000 +0000 +++ 4.13.3withdata-dfsg2-3ubuntu2/debian/control 2022-10-17 12:06:27.000000000 +0000 @@ -1,5 +1,6 @@ Source: insighttoolkit4 -Maintainer: Debian Med Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Med Packaging Team Uploaders: Steve M. Robbins , Gert Wollny , Étienne Mollier @@ -8,6 +9,8 @@ Priority: optional Build-Depends: debhelper-compat (= 13), cmake, dh-python, + gcc-11, + g++-11, swig, castxml (>= 0.3.4-2), zlib1g-dev, diff -pruN 4.13.3withdata-dfsg2-3/debian/control.in 4.13.3withdata-dfsg2-3ubuntu2/debian/control.in --- 4.13.3withdata-dfsg2-3/debian/control.in 2022-05-19 18:18:37.000000000 +0000 +++ 4.13.3withdata-dfsg2-3ubuntu2/debian/control.in 2022-08-25 15:20:17.000000000 +0000 @@ -2,7 +2,8 @@ Source: insighttoolkit4 Homepage: http://www.itk.org/ Section: science Priority: optional -Maintainer: Debian Med Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Med Packaging Team Uploaders: Steve M. Robbins , Gert Wollny Build-Depends: debhelper (>= 13), diff -pruN 4.13.3withdata-dfsg2-3/debian/patches/0001-COMP-Ensure-CastXML-uses-C-11-with-GCC-or-Clang.patch 4.13.3withdata-dfsg2-3ubuntu2/debian/patches/0001-COMP-Ensure-CastXML-uses-C-11-with-GCC-or-Clang.patch --- 4.13.3withdata-dfsg2-3/debian/patches/0001-COMP-Ensure-CastXML-uses-C-11-with-GCC-or-Clang.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.13.3withdata-dfsg2-3ubuntu2/debian/patches/0001-COMP-Ensure-CastXML-uses-C-11-with-GCC-or-Clang.patch 2022-10-08 00:17:07.000000000 +0000 @@ -0,0 +1,42 @@ +From b6d3d5066d939b90fff7d642adf46f5ab4136876 Mon Sep 17 00:00:00 2001 +From: Matt McCormick +Date: Mon, 29 Jan 2018 00:58:53 -0500 +Subject: [PATCH] COMP: Ensure CastXML uses C++11 with GCC or Clang + +Addresses: + + FAILED: Wrapping/itkVTKImageImport.xml + cd /home/matt/bin/ITK2-Wrap-MinSizeRel/Wrapping/Modules/ITKVTK && /usr/bin/ccache-swig /home/matt/bin/ITK2-Wrap-MinSizeRel/Wrapping/Generators/CastXML/castxml/bin/castxml -o /home/matt/bin/ITK2-Wrap-MinSizeRel/Wrapping/itkVTKImageImport.xml --castxml-gccxml --castxml-start _wrapping_ --castxml-cc-gnu "(" /home/matt/.config/dotfiles/bin/ccache-clang++ -Wall -Wcast-align-Wdisabled-optimization -Wextra -Wformat=2 -Winvalid-pch -Wno-format-nonliteral -Wpointer-arith -Wshadow -Wunused -Wwrite-strings -funit-at-a-time -Wno-strict-overflow -Wno-deprecated -Wno-invalid-offsetof -Woverloaded-virtual ")" -w -c @/home/matt/bin/ITK2-Wrap-MinSizeRel/Wrapping/ITKVTK.castxml.inc /home/matt/bin/ITK2-Wrap-MinSizeRel/Wrapping/itkVTKImageImport.cxx + In file included from /home/matt/bin/ITK2-Wrap-MinSizeRel/Wrapping/itkVTKImageImport.cxx:1: + In file included from /home/matt/src/ITK2/Modules/Core/Common/include/itkCommand.h:21: + In file included from /home/matt/src/ITK2/Modules/Core/Common/include/itkObject.h:31: + In file included from /home/matt/src/ITK2/Modules/Core/Common/include/itkLightObject.h:21: + In file included from /home/matt/src/ITK2/Modules/Core/Common/include/itkMacro.h:429: + In file included from /home/matt/src/ITK2/Modules/Core/Common/include/itkExceptionObject.h:28: + /home/matt/src/ITK2/Modules/Core/Common/include/itkSmartPointer.h:53:17: error: use of undeclared identifier 'nullptr' + { m_Pointer = nullptr; } + +Change-Id: I6cf31b6bec12365a70122fa2405da15886620869 +--- + Wrapping/Generators/CastXML/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Wrapping/Generators/CastXML/CMakeLists.txt b/Wrapping/Generators/CastXML/CMakeLists.txt +index f0254b2f4e..8377587e51 100644 +--- a/Wrapping/Generators/CastXML/CMakeLists.txt ++++ b/Wrapping/Generators/CastXML/CMakeLists.txt +@@ -214,6 +214,11 @@ macro(itk_end_wrap_submodule_castxml module) + set(_ccache_cmd ${CCACHE_EXECUTABLE}) + endif() + set(_castxml_cc_flags ${CMAKE_CXX_FLAGS}) ++ if(CMAKE_CXX_EXTENSIONS) ++ set(_castxml_cc_flags "${_castxml_cc_flags} ${CMAKE_CXX11_EXTENSION_COMPILE_OPTION}") ++ else() ++ set(_castxml_cc_flags "${_castxml_cc_flags} ${CMAKE_CXX11_STANDARD_COMPILE_OPTION}") ++ endif() + separate_arguments(_castxml_cc_flags) + if(MSVC) + set(_castxml_cc --castxml-cc-msvc ( "${CMAKE_CXX_COMPILER}" ${_castxml_cc_flags} ) -fexceptions) +-- +2.37.2 + diff -pruN 4.13.3withdata-dfsg2-3/debian/patches/series 4.13.3withdata-dfsg2-3ubuntu2/debian/patches/series --- 4.13.3withdata-dfsg2-3/debian/patches/series 2022-05-19 18:18:37.000000000 +0000 +++ 4.13.3withdata-dfsg2-3ubuntu2/debian/patches/series 2022-10-08 00:17:50.000000000 +0000 @@ -13,3 +13,4 @@ python3.8.diff ignore_failing_test.patch gcc11.patch python3.10.patch +0001-COMP-Ensure-CastXML-uses-C-11-with-GCC-or-Clang.patch diff -pruN 4.13.3withdata-dfsg2-3/debian/rules 4.13.3withdata-dfsg2-3ubuntu2/debian/rules --- 4.13.3withdata-dfsg2-3/debian/rules 2022-05-19 18:18:37.000000000 +0000 +++ 4.13.3withdata-dfsg2-3ubuntu2/debian/rules 2022-10-17 12:06:27.000000000 +0000 @@ -7,6 +7,9 @@ VERSION = $(VER_MAJOR).$(VER_MINOR).$(VE SOVERSION = $(VER_MAJOR).$(VER_MINOR) PYVER := $(shell py3versions -dv) +export CC = gcc-11 +export CXX = g++-11 + #ITK is not properly using system provided headers export DEB_CPPFLAGS_MAINT_APPEND = -I/usr/include/nifti -g1