[med-svn] [Git][med-team/sight][master] Fix runtime error, removed dbus-x11, finalized for release

[Flavien Bridault (@fbridault-guest)]

Flavien Bridault pushed to branch master at Debian Med / sight


Commits:
85aede0e by Flavien Bridault at 2025-10-03T17:34:23+02:00
Fix runtime error, removed dbus-x11, finalized for release

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/fix-multi-arch-folder-detection.patch
- debian/patches/gcc15.patch
- + debian/patches/itk-sized-deallocation.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,13 @@
 sight (25.1.0-1) UNRELEASED; urgency=medium
 
   * New upstream version
+  * d/control: Upgrade to Qt6, required for this version
+    Add patch to build with gcc 15.  Closes: #1097881, #1111550
+    Removed dbus-x11.  Closes: #1117106
   * d/p/: Update all patches to match new root file tree
+    Remove applied patches upstream
 
- -- Flavien BRIDAULT <flavien.bridault at ircad.fr>  Mon, 15 Sep 2025 09:41:48 +0200
+ -- Flavien BRIDAULT <fbridault at ircad.fr>  Mon, 15 Sep 2025 09:41:48 +0200
 
 sight (25.0.0-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -8,7 +8,6 @@ Build-Depends: binutils-gold,
                dcmtk,
                debhelper-compat (= 13),
                dh-exec,
-               dbus-x11,
                libarchive-dev,
                libboost-all-dev,
                libceres-dev,


=====================================
debian/patches/fix-multi-arch-folder-detection.patch
=====================================
@@ -1,4 +1,6 @@
 Description: Fix multi arch folder detection
+Forwarded: https://git.ircad.fr/sight/sight/-/issues/1416
+
 --- sight.orig/lib/__/core/runtime/detail/runtime.cpp
 +++ sight/lib/__/core/runtime/detail/runtime.cpp
 @@ -60,26 +60,25 @@


=====================================
debian/patches/gcc15.patch
=====================================
@@ -1,3 +1,8 @@
+Description: Fix build failure with gcc15
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097881
+Author: Flavien Bridault <fbridault at ircad.fr>
+Forwarded: https://git.ircad.fr/sight/sight/-/issues/1414
+
 --- sight.orig/lib/__/core/com/slot_run.hxx
 +++ sight/lib/__/core/com/slot_run.hxx
 @@ -44,7 +44,7 @@
@@ -5,7 +10,7 @@
  inline std::function<void()> slot_run<void(A ...)>::bind_run(A ... _args) const
  {
 -    return [ =, this]{run(_args ...);};
-+    return [&_args ..., this]{run(_args ...);};
++    return [_args ..., this]{run(_args ...);};
  }
  
  //-----------------------------------------------------------------------------
@@ -58,22 +63,4 @@
 +    int UnpackBody();
  
  private:
- 
---- sight.orig/lib/filter/image/CMakeLists.txt
-+++ sight/lib/filter/image/CMakeLists.txt
-@@ -1,4 +1,4 @@
--sight_add_target(filter_image TYPE LIBRARY FAST_DEBUG ON)
-+sight_add_target(filter_image TYPE LIBRARY FAST_DEBUG ON PCH OFF)
- 
- # On windows for a strange reason the VXL "core" directory (needed by itkArray.h) is not exported by ITK
- # Mark it as a private system directory to avoid putting hardcoded paths in .cmake files
---- sight.orig/module/filter/point/CMakeLists.txt
-+++ sight/module/filter/point/CMakeLists.txt
-@@ -4,7 +4,4 @@
- 
- target_link_libraries(module_filter_point PRIVATE VTK::CommonDataModel)
- 
--find_package(ITK QUIET COMPONENTS ITKCommon REQUIRED)
--target_link_libraries(module_filter_point PRIVATE ITKCommon)
--
- target_link_libraries(module_filter_point PUBLIC data io_itk ui)
+ 
\ No newline at end of file


=====================================
debian/patches/itk-sized-deallocation.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Fix build failure with ITK 5.4, because of sized-deallocation
+Author: Flavien Bridault <fbridault at ircad.fr>
+Forwarded: https://git.ircad.fr/sight/sight/-/issues/1415
+
+--- sight.orig/lib/filter/image/CMakeLists.txt
++++ sight/lib/filter/image/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-sight_add_target(filter_image TYPE LIBRARY FAST_DEBUG ON)
++sight_add_target(filter_image TYPE LIBRARY FAST_DEBUG ON PCH OFF)
+ 
+ # On windows for a strange reason the VXL "core" directory (needed by itkArray.h) is not exported by ITK
+ # Mark it as a private system directory to avoid putting hardcoded paths in .cmake files
+--- sight.orig/module/filter/point/CMakeLists.txt
++++ sight/module/filter/point/CMakeLists.txt
+@@ -4,7 +4,4 @@
+ 
+ target_link_libraries(module_filter_point PRIVATE VTK::CommonDataModel)
+ 
+-find_package(ITK QUIET COMPONENTS ITKCommon REQUIRED)
+-target_link_libraries(module_filter_point PRIVATE ITKCommon)
+-
+ target_link_libraries(module_filter_point PUBLIC data io_itk ui)


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,5 @@
 gcc15.patch
+itk-sized-deallocation.patch
 fix-multi-arch-folder-detection.patch
 lintian_warnings.patch
 remove-itk-fft.patch



View it on GitLab: https://salsa.debian.org/med-team/sight/-/commit/85aede0eab410f294c13aa208fc4f42c9045a639

-- 
View it on GitLab: https://salsa.debian.org/med-team/sight/-/commit/85aede0eab410f294c13aa208fc4f42c9045a639
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/20251003/2b69ea5f/attachment-0001.htm>