[med-svn] [Git][med-team/ctk][master] 13 commits: Update dependencies for building with Qt6
Andreas Tille (@tille)
gitlab at salsa.debian.org
Thu Aug 13 12:33:35 BST 2026
Andreas Tille pushed to branch master at Debian Med / ctk
Commits:
6f2db433 by Fernando Hueso at 2026-08-13T09:30:39+00:00
Update dependencies for building with Qt6
remove optional ones for the moment
- - - - -
f17ac460 by Fernando Hueso at 2026-08-13T09:34:56+00:00
Start small with most optional stuff disabled
until CI is up and running again
- - - - -
c5fa827a by Fernando Hueso at 2026-08-13T09:36:38+00:00
Mention changes
- - - - -
30e9611a by Fernando Hueso at 2026-08-13T09:40:22+00:00
disable patches that are probably no longer needed
- - - - -
8d2277b7 by Fernando Hueso at 2026-08-13T09:46:34+00:00
Backport upstream PR fixing qt6svg configure bug
See https://github.com/commontk/CTK/pull/1453
- - - - -
24391efc by Fernando Hueso at 2026-08-13T09:47:28+00:00
apply qt6svg patch
- - - - -
53e31858 by Fernando Hueso at 2026-08-13T09:49:56+00:00
Missing comma in depends
and add uploader
- - - - -
6dd7190e by Fernando Hueso at 2026-08-13T10:17:05+00:00
build with qt6 version
- - - - -
faf00c52 by Fernando Hueso at 2026-08-13T10:26:44+00:00
backport upstream dcmtk oflist commit
is in master but not yet released
see https://github.com/commontk/CTK/pull/1445
- - - - -
25132c80 by Fernando Hueso at 2026-08-13T10:27:16+00:00
apply oflist patch
https://github.com/commontk/CTK/pull/1445
revert once a new tag is released
- - - - -
6f87992a by Fernando Hueso at 2026-08-13T10:37:17+00:00
fix patch copy paste error
- - - - -
20e10c93 by Fernando Hueso at 2026-08-13T10:52:50+00:00
normalize installation paths
- - - - -
055f833b by Fernando Hueso at 2026-08-13T11:07:06+00:00
fix absolute install paths
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/oflist.patch
- + debian/patches/qt6svg_1453.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -23,6 +23,9 @@ ctk (2026.08.06-1) unstable; urgency=medium
* debputy lint --auto-fix (routine-update)
* Add debian/salsa-ci.yaml
* Remove manual libctk0.1-dbg package
+ * Change from Debug build type to Release
+ * Change from Qt5 dependencies to Qt6
+ * Disable some optional dependencies temporarily
-- Andreas Tille <tille at debian.org> Thu, 13 Aug 2026 07:29:16 +0200
=====================================
debian/control
=====================================
@@ -3,14 +3,21 @@ Standards-Version: 4.7.4
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders:
Dominique Belhachemi <domibel at debian.org>,
+ Fernando Hueso <Fernando.Hueso at uv.es>,
Section: libs
Build-Depends:
cmake,
- libqt5opengl5-dev,
- libqtwebkit-dev,
+ qt6-base-dev,
+ qt6-5compat-dev,
+ qt6-scxml-dev,
+ qt6-tools-dev,
+ qt6-tools-private-dev,
+ qt6-svg-dev,
+ libxkbcommon-dev,
libdcmtk-dev,
+ libpng-dev,
libtiff-dev,
- libinsighttoolkit4-dev,
+ libssl-dev,
debhelper-compat (= 14),
Vcs-Browser: https://salsa.debian.org/med-team/ctk
Vcs-Git: https://salsa.debian.org/med-team/ctk.git
=====================================
debian/patches/oflist.patch
=====================================
@@ -0,0 +1,40 @@
+From ab4ab63b12d1f2ba8c5ea0fe117cb951524e0a6b Mon Sep 17 00:00:00 2001
+From: Stefan Dinkelacker <s.dinkelacker at dkfz-heidelberg.de>
+Date: Sat, 25 Jul 2026 14:14:11 +0200
+Subject: [PATCH] COMP: Do not forward declare OFList
+
+DCMTK built with DCMTK_ENABLE_STL defines HAVE_STL_LIST, which turns
+OFList into a macro aliasing std::list. Forward declaring it then
+expands to a redeclaration of std::list, which fails to compile and
+in turn breaks every DCMTK header that uses OFList.
+
+Include oflist.h instead, which works for both DCMTK configurations.
+---
+ Libs/DICOM/Core/ctkDICOMQuery.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Libs/DICOM/Core/ctkDICOMQuery.h b/Libs/DICOM/Core/ctkDICOMQuery.h
+index 20c54f4f7271f8053eb67364aa384875c313e6d2..87856a078a00f8a63a7e45e52761f05e92a8da08 100644
+--- a/Libs/DICOM/Core/ctkDICOMQuery.h
++++ b/Libs/DICOM/Core/ctkDICOMQuery.h
+@@ -30,6 +30,11 @@
+ // ctkCore includes
+ #include <ctkPimpl.h>
+
++// DCMTK includes
++// OFList cannot be forward declared: when DCMTK is built with DCMTK_ENABLE_STL
++// it is a macro that aliases std::list.
++#include <dcmtk/ofstd/oflist.h>
++
+ // ctkDICOMCore includes
+ #include "ctkDICOMCoreExport.h"
+ #include "ctkDICOMDatabase.h"
+@@ -37,7 +42,6 @@
+ class ctkDICOMQueryPrivate;
+ class ctkDICOMJobResponseSet;
+ class QRResponse;
+-template <typename T> class OFList;
+
+ /// \ingroup DICOM_Core
+ class CTK_DICOM_CORE_EXPORT ctkDICOMQuery : public QObject
+
\ No newline at end of file
=====================================
debian/patches/qt6svg_1453.patch
=====================================
@@ -0,0 +1,37 @@
+From ea7f052c96a11ebf014d35e99766d3e1c0f975d2 Mon Sep 17 00:00:00 2001
+From: ferdymercury <ferdymercury at users.noreply.github.com>
+Date: Tue, 11 Aug 2026 16:54:59 +0200
+Subject: [PATCH] FIX: configure error on Ubuntu26
+
+CMake Error at CMake/ctkMacroBuildLib.cmake:161 (target_link_libraries):
+ Target "CTKDICOMCore" links to:
+
+ Qt6::Svg
+
+ but the target was not found. Possible reasons include:
+
+ * There is a typo in the target name.
+ * A find_package call is missing for an IMPORTED target.
+ * An ALIAS target is missing.
+
+Call Stack (most recent call first):
+ Libs/DICOM/Core/CMakeLists.txt:207 (ctkMacroBuildLib)
+---
+ CMake/ctkMacroSetupQt.cmake | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMake/ctkMacroSetupQt.cmake b/CMake/ctkMacroSetupQt.cmake
+index e4b4ff01f2f0ca00383b8afe227d173e9ce229e8..49b5d16521c141b60c96353023aaf50dbf10dfea 100644
+--- a/CMake/ctkMacroSetupQt.cmake
++++ b/CMake/ctkMacroSetupQt.cmake
+@@ -137,6 +137,10 @@ macro(ctkMacroSetupQt)
+ list(APPEND CTK_QT_COMPONENTS Network)
+ endif()
+
++ if(CTK_ENABLE_DICOM)
++ list(APPEND CTK_QT_COMPONENTS Svg)
++ endif()
++
+ if(CTK_QT_VERSION VERSION_EQUAL "5")
+ find_package(Qt5 COMPONENTS ${CTK_QT_COMPONENTS} REQUIRED)
+ mark_as_superbuild(Qt5_DIR) # Qt 5
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,5 @@
-log4cplus_namespace.patch
-lib_path.patch
-fix_dcmtk.patch
+#log4cplus_namespace.patch
+#lib_path.patch
+#fix_dcmtk.patch
+qt6svg_1453.patch
+oflist.patch
=====================================
debian/rules
=====================================
@@ -5,43 +5,48 @@ DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
CMAKE_FLAGS = \
- -DCMAKE_BUILD_TYPE:STRING=Debug \
+ -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_ENABLE_DICOM:BOOL=ON \
- -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_DICOM: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_SUPERBUILD:BOOL=OFF \
+ -DCTK_ENABLE_DICOM:BOOL=ON \
+ -DCTK_QT_VERSION=6 \
+ -DCTK_INSTALL_LIB_DIR=lib \
+ -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 \
pkg_run = libctk0.1
pkg_dev = libctk-dev
View it on GitLab: https://salsa.debian.org/med-team/ctk/-/compare/d381ae60c06fbdf21567412e70a63497335301cc...055f833b223afe61913f6f70d79d0a2fca89768f
--
View it on GitLab: https://salsa.debian.org/med-team/ctk/-/compare/d381ae60c06fbdf21567412e70a63497335301cc...055f833b223afe61913f6f70d79d0a2fca89768f
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/20260813/2b1666a3/attachment-0001.htm>
More information about the debian-med-commit
mailing list