[med-svn] [Git][med-team/ctk][master] 15 commits: add new optional ITK dependency

Fernando Hueso (@ferdymercury) gitlab at salsa.debian.org
Tue Sep 15 15:47:31 BST 2026 


Fernando Hueso pushed to branch master at Debian Med / ctk


Commits:
16b923ff by Fernando Hueso at 2026-09-15T06:06:24+00:00
add new optional ITK dependency

needed when -DCTK_LIB_ImageProcessing/ITK/Core=ON
since ITK depends on VTK, it serves also for
      -DCTK_LIB_Visualization/VTK/Widgets:BOOL=ON
      -DCTK_LIB_Visualization/VTK/Widgets_USE_TRANSFER_FUNCTION_CHARTS:BOOL=ON

- - - - -
b2a644b5 by Fernando Hueso at 2026-09-15T06:06:24+00:00
readd optional flags
- - - - -
d180c251 by Fernando Hueso at 2026-09-15T06:06:24+00:00
fix comments

- - - - -
25381296 by Fernando Hueso at 2026-09-15T06:06:24+00:00
missed one flag
- - - - -
11cb4baa by Fernando Hueso at 2026-09-15T06:06:24+00:00
sort CMake flags alphabetically
- - - - -
26fb56ac by Fernando Hueso at 2026-09-15T06:06:24+00:00
rm stray spaces after breakline

were interrupting cmake command
- - - - -
bd4ccb0a by Fernando Hueso at 2026-09-15T06:06:24+00:00
temporary workaround for HDF5 bug

see https://www.mail-archive.com/debian-bugs-closed@lists.debian.org/msg847889.html
- - - - -
5ddfea37 by Fernando Hueso at 2026-09-15T06:06:24+00:00
missed backslash
- - - - -
4e782229 by Fernando Hueso at 2026-09-15T06:06:24+00:00
list installed files in libctk-dev.install
- - - - -
536b8aec by Fernando Hueso at 2026-09-15T06:06:24+00:00
disable i386 since ITK does not support it
- - - - -
9e22c8e3 by Fernando Hueso at 2026-09-15T08:10:40+00:00
lib multiarch
- - - - -
05bb0390 by Fernando Hueso at 2026-09-15T08:11:53+00:00
lib multiarch paths
- - - - -
d0e5f879 by Fernando Hueso at 2026-09-15T08:57:12+00:00
rules

- - - - -
d5a46492 by Fernando Hueso at 2026-09-15T09:01:32+00:00
d/changelog

- - - - -
65896921 by Fernando Hueso at 2026-09-15T11:06:52+00:00
remove HDF5 workaround

since upstream bug reported is closed as solved
- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/libctk-dev.install
- debian/rules
- debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+ctk (2026.09.02-2) UNRELEASED; urgency=medium
+
+  [ Fernando Hueso ]
+  * add new optional ITK dependency
+  * sort CMake flags alphabetically
+  * list installed files in libctk-dev.install
+  * disable i386 since ITK does not support it
+  * lib multiarch paths
+
+ -- Fernando Hueso <Fernando.Hueso at uv.es>  Tue, 15 Sep 2026 09:00:36 +0000
+
 ctk (2026.09.02-1) unstable; urgency=medium
 
   [ Andreas Tille ]


=====================================
debian/control
=====================================
@@ -16,6 +16,7 @@ Build-Depends:
  libdcmtk-dev,
  libpng-dev,
  libtiff-dev,
+ libinsighttoolkit5-dev,
  libssl-dev,
  debhelper-compat (= 14),
 Vcs-Browser: https://salsa.debian.org/med-team/ctk


=====================================
debian/libctk-dev.install
=====================================
@@ -1 +1,13 @@
-usr/lib/CMake/ctk usr/lib/${DEB_HOST_MULTIARCH}/cmake/ctk
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/ctk
+usr/bin/ctkDICOM
+usr/bin/ctkPluginBrowser
+usr/bin/ctkPluginGenerator
+usr/lib/${DEB_HOST_MULTIARCH}/ctk/plugins/liborg_commontk_configadmin.so
+usr/lib/${DEB_HOST_MULTIARCH}/ctk/plugins/liborg_commontk_eventadmin.so
+usr/lib/${DEB_HOST_MULTIARCH}/ctk/plugins/liborg_commontk_log.so
+usr/lib/${DEB_HOST_MULTIARCH}/ctk/plugins/liborg_commontk_metatype.so
+usr/lib/${DEB_HOST_MULTIARCH}/ctk/plugins/liborg_commontk_plugingenerator_core.so
+usr/lib/${DEB_HOST_MULTIARCH}/ctk/plugins/liborg_commontk_plugingenerator_ui.so
+usr/lib/${DEB_HOST_MULTIARCH}/designer/libCTKDICOMWidgetsPlugins.so
+usr/lib/${DEB_HOST_MULTIARCH}/designer/libCTKVisualizationVTKWidgetsPlugins.so
+usr/lib/${DEB_HOST_MULTIARCH}/designer/libCTKWidgetsPlugins.so


=====================================
debian/rules
=====================================
@@ -6,49 +6,51 @@ DPKG_EXPORT_BUILDFLAGS = 1
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+# Upstream default paths: "lib/ctk-0.1", "include/ctk-0.1", "lib/ctk-0.1/plugins" and "lib/ctk-0.1/CMake" but versioning seems pointless (https://github.com/commontk/CTK/issues/358#issuecomment-359455314)
+# -DCTK_LIB_Visualization/VTK/Widgets_USE_TRANSFER_FUNCTION_CHARTS:BOOL=ON leads to a compilation error: ui_ctkVTKScalarsToColorsWidget.h missing
+# https://www.mail-archive.com/debian-bugs-closed@lists.debian.org/msg847889.html
 CMAKE_FLAGS = \
+    -DBUILD_TESTING:BOOL=OFF \
     -DCMAKE_BUILD_TYPE:STRING=Release \
-    -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DCMAKE_SKIP_RPATH:BOOL=ON \
-    -DBUILD_TESTING:BOOL=OFF \
-    -DCTK_SUPERBUILD:BOOL=OFF \
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
+    -DCTK_APP_ctkCommandLineModuleExplorer:BOOL=ON \
+    -DCTK_APP_ctkDICOM:BOOL=ON \
+    -DCTK_APP_ctkPluginBrowser:BOOL=ON \
+    -DCTK_APP_ctkPluginGenerator:BOOL=ON \
+    -DCTK_BUILD_QTDESIGNER_PLUGINS:BOOL=ON \
     -DCTK_ENABLE_DICOM:BOOL=ON \
-    -DCTK_QT_VERSION=6 \
-    -DCTK_INSTALL_LIB_DIR=lib \
+    -DCTK_ENABLE_PluginFramework:BOOL=ON \
+    -DCTK_ENABLE_Python_Wrapping:BOOL=OFF \
+    -DCTK_ENABLE_Widgets:BOOL=ON \
+    -DCTK_INSTALL_LIB_DIR=lib/$(DEB_HOST_MULTIARCH) \
     -DCTK_INSTALL_INCLUDE_DIR=/usr/include/ctk \
-    -DCTK_INSTALL_PLUGIN_DIR=/usr/lib/ctk/plugins \
-    -DCTK_INSTALL_CMAKE_DIR=/usr/lib/CMake/ctk \
-    # Upstream default: "lib/ctk-0.1", "include/ctk-0.1", "lib/ctk-0.1/plugins" and "lib/ctk-0.1/CMake" but versioning seems pointless (https://github.com/commontk/CTK/issues/358#issuecomment-359455314)
-    #-DDCMTK_DIR:PATH=/usr \
-    #-DCTK_APP_ctkCommandLineModuleExplorer:BOOL=ON \
-    #-DCTK_APP_ctkDICOM:BOOL=ON \
-    #-DCTK_APP_ctkPluginBrowser:BOOL=ON \
-    #-DCTK_APP_ctkPluginGenerator:BOOL=ON \
-    #-DCTK_BUILD_QTDESIGNER_PLUGINS:BOOL=ON \
-    #-DCTK_ENABLE_PluginFramework:BOOL=ON \
-    #-DCTK_ENABLE_Python_Wrapping:BOOL=OFF \
-    #-DCTK_ENABLE_Widgets:BOOL=ON \
-    #-DCTK_LIB_CommandLineModules/Backend/FunctionPointer:BOOL=ON \
-    #-DCTK_LIB_CommandLineModules/Backend/LocalProcess:BOOL=ON \
-    #-DCTK_LIB_CommandLineModules/Core:BOOL=ON \
-    #-DCTK_LIB_CommandLineModules/Frontend/QtGui:BOOL=ON \
-    #-DCTK_LIB_CommandLineModules/Frontend/QtWebKit:BOOL=ON \
-    #-DCTK_LIB_Core:BOOL=ON \
-    #-DCTK_LIB_DICOM/Core:BOOL=ON \
-    #-DCTK_LIB_DICOM/Widgets:BOOL=ON \
-    #-DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON \
-    #-DCTK_LIB_PluginFramework:BOOL=ON \
-    #-DCTK_LIB_Scripting/Python/Core:BOOL=OFF \
-    #-DCTK_LIB_Visualization/VTK/Core:BOOL=ON \
-    #-DCTK_LIB_Visualization/VTK/Widgets:BOOL=ON \
-    #-DCTK_LIB_Widgets:BOOL=ON \
-    #-DCTK_PLUGIN_org.commontk.configadmin:BOOL=ON \
-    #-DCTK_PLUGIN_org.commontk.eventadmin:BOOL=ON \
-    #-DCTK_PLUGIN_org.commontk.log:BOOL=ON \
-    #-DCTK_PLUGIN_org.commontk.metatype:BOOL=ON \
-    #-DCTK_PLUGIN_org.commontk.plugingenerator.core:BOOL=ON \
-    #-DCTK_PLUGIN_org.commontk.plugingenerator.ui:BOOL=ON \
+    -DCTK_INSTALL_PLUGIN_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ctk/plugins \
+    -DCTK_INSTALL_CMAKE_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/ctk \
+    -DCTK_LIB_CommandLineModules/Backend/FunctionPointer:BOOL=ON \
+    -DCTK_LIB_CommandLineModules/Backend/LocalProcess:BOOL=ON \
+    -DCTK_LIB_CommandLineModules/Core:BOOL=ON \
+    -DCTK_LIB_CommandLineModules/Frontend/QtGui:BOOL=ON \
+    -DCTK_LIB_CommandLineModules/Frontend/QtWebKit:BOOL=ON \
+    -DCTK_LIB_Core:BOOL=ON \
+    -DCTK_LIB_DICOM/Core:BOOL=ON \
+    -DCTK_LIB_DICOM/Widgets:BOOL=ON \
+    -DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON \
+    -DCTK_LIB_PluginFramework:BOOL=ON \
+    -DCTK_LIB_Scripting/Python/Core:BOOL=OFF \
+    -DCTK_LIB_Visualization/VTK/Core:BOOL=ON \
+    -DCTK_LIB_Visualization/VTK/Widgets:BOOL=ON \
+    -DCTK_LIB_Visualization/VTK/Widgets_USE_TRANSFER_FUNCTION_CHARTS:BOOL=OFF \
+    -DCTK_LIB_Widgets:BOOL=ON \
+    -DCTK_PLUGIN_org.commontk.configadmin:BOOL=ON \
+    -DCTK_PLUGIN_org.commontk.eventadmin:BOOL=ON \
+    -DCTK_PLUGIN_org.commontk.log:BOOL=ON \
+    -DCTK_PLUGIN_org.commontk.metatype:BOOL=ON \
+    -DCTK_PLUGIN_org.commontk.plugingenerator.core:BOOL=ON \
+    -DCTK_PLUGIN_org.commontk.plugingenerator.ui:BOOL=ON \
+    -DCTK_SUPERBUILD:BOOL=OFF \
+    -DCTK_QT_VERSION=6 \
 
 pkg_run = libctk0.1
 pkg_dev = libctk-dev
@@ -69,8 +71,8 @@ override_dh_auto_configure:
 
 override_dh_install:
 	# Runtime Package
-	dh_install -p$(pkg_run) usr/lib/*.so.*
+	dh_install -p$(pkg_run) usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*
 	# Development Package
 	dh_install -p$(pkg_dev) usr/include
-	dh_install -p$(pkg_dev) usr/lib/lib*.so
+	dh_install -p$(pkg_dev) usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so
 #	dh_install -plibctk-dev   debian/tmp/usr/lib/ctk-0.1/*.cmake                 usr/lib/ctk-0.1


=====================================
debian/salsa-ci.yml
=====================================
@@ -2,6 +2,9 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
 
+variables:
+ SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1
+
 # Permit failure of blhc
 #blhc:
 #  allow_failure: true



View it on GitLab: https://salsa.debian.org/med-team/ctk/-/compare/ba6bc684495141008fd70f6bb8ff6fb1f1d55e48...65896921b1ca6f2fec9078c8505d7a72fc309258

-- 
View it on GitLab: https://salsa.debian.org/med-team/ctk/-/compare/ba6bc684495141008fd70f6bb8ff6fb1f1d55e48...65896921b1ca6f2fec9078c8505d7a72fc309258
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


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

More information about the debian-med-commit mailing list