[med-svn] [Git][med-team/itksnap][master] 4 commits: Add patch from Logan Rosen to fix FTBFS with glibc 2.32

[Anton Gladky (@gladk)]

Anton Gladky pushed to branch master at Debian Med / itksnap


Commits:
ff651a1d by Adrian Bunk at 2021-10-24T13:25:48+03:00
Add patch from Logan Rosen to fix FTBFS with glibc 2.32

Closes: #986600

- - - - -
23e6d300 by Adrian Bunk at 2021-10-24T13:30:31+03:00
Add upstream commit fixing the C++ version used

Closes: #984068

- - - - -
6097ae8d by Adrian Bunk at 2021-10-24T19:35:56+03:00
Switch from vtk6 to vtk7

- - - - -
24a656b3 by Adrian Bunk at 2021-10-24T19:36:08+03:00
debian/control: Update Vcs-{Browser,Git} after the move to med-team

- - - - -


5 changed files:

- debian/control
- + debian/patches/03_glibc_2.32.patch
- + debian/patches/04_gxx.patch
- + debian/patches/05_vtk7.patch
- debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 11),
                cmake,
-               libvtk6-dev,
+               libvtk7-dev,
                libinsighttoolkit4-dev,
                libgdcm-dev,
                imagemagick,
@@ -18,8 +18,8 @@ Build-Depends: debhelper-compat (= 11),
                qttools5-private-dev,
                libfftw3-dev
 Standards-Version: 4.4.1
-Vcs-Browser: https://salsa.debian.org/neurodebian-team/itksnap
-Vcs-Git: https://salsa.debian.org/neurodebian-team/itksnap.git
+Vcs-Browser: https://salsa.debian.org/med-team/itksnap
+Vcs-Git: https://salsa.debian.org/med-team/itksnap.git
 Homepage: http://www.itksnap.org
 
 Package: itksnap


=====================================
debian/patches/03_glibc_2.32.patch
=====================================
@@ -0,0 +1,11 @@
+--- a/GUI/Qt/main.cxx
++++ b/GUI/Qt/main.cxx
+@@ -56,7 +56,7 @@
+ void SegmentationFaultHandler(int sig)
+ {
+   cerr << "*************************************" << endl;
+-  cerr << "ITK-SNAP: " << sys_siglist[sig] << endl;
++  cerr << "ITK-SNAP: " << strsignal(sig) << endl;
+   cerr << "BACKTRACE: " << endl;
+   void *array[50];
+   int nsize = backtrace(array, 50);


=====================================
debian/patches/04_gxx.patch
=====================================
@@ -0,0 +1,26 @@
+From 2ef9ed48a352acf0c0436a24c5ef56f947340d8e Mon Sep 17 00:00:00 2001
+From: JLasserv <56830768+JLasserv at users.noreply.github.com>
+Date: Mon, 2 Mar 2020 10:08:01 -0500
+Subject: Update CMakeLists.txt
+
+C++ 11 required
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 993ae91d..492a74c9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,8 @@ MESSAGE(STATUS "ITK-SNAP Git Info:")
+ # CMAKE PRELIMINARIES                       
+ #--------------------------------------------------------------------------------
+ cmake_minimum_required(VERSION 2.8.12)
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+ IF(POLICY CMP0026)
+   cmake_policy(SET CMP0026 OLD)
+-- 
+2.20.1
+


=====================================
debian/patches/05_vtk7.patch
=====================================
@@ -0,0 +1,26 @@
+From b9de837844d89c8326c7d047820c033f5cbe8668 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk at debian.org>
+Date: Sun, 24 Oct 2021 19:34:15 +0300
+Subject: Correct the return type of
+ IntensityCurveControlPointsContextItem::GetControlPointsMTime() for vtk7
+
+---
+ GUI/Renderer/IntensityCurveVTKRenderer.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/GUI/Renderer/IntensityCurveVTKRenderer.cxx b/GUI/Renderer/IntensityCurveVTKRenderer.cxx
+index 679adb1..7acb3fa 100644
+--- a/GUI/Renderer/IntensityCurveVTKRenderer.cxx
++++ b/GUI/Renderer/IntensityCurveVTKRenderer.cxx
+@@ -339,7 +339,7 @@ public:
+     else return false;
+   }
+ 
+-  virtual unsigned long int GetControlPointsMTime()
++  virtual vtkMTimeType GetControlPointsMTime()
+   {
+     // TODO: figure this out!
+     return this->GetMTime();
+-- 
+2.20.1
+


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,6 @@
 01_add_required_vtklibraries_and_gdcm.patch
 
 02_check_sse.patch
+03_glibc_2.32.patch
+04_gxx.patch
+05_vtk7.patch



View it on GitLab: https://salsa.debian.org/med-team/itksnap/-/compare/4da5b788a97e54e31e30467872238cf2e62cfe43...24a656b357b24de6a4c650b55174cf138bd719f3

-- 
View it on GitLab: https://salsa.debian.org/med-team/itksnap/-/compare/4da5b788a97e54e31e30467872238cf2e62cfe43...24a656b357b24de6a4c650b55174cf138bd719f3
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211024/ac7dd913/attachment-0001.htm>