[med-svn] [Git][med-team/ctk][cifixopts] 9 commits: Delete no longer needed fix_dcmtk.patch
Fernando Hueso (@ferdymercury)
gitlab at salsa.debian.org
Thu Aug 13 15:16:22 BST 2026
Fernando Hueso pushed to branch cifixopts at Debian Med / ctk
Commits:
bf36f7aa by Fernando Hueso at 2026-08-13T14:05:27+00:00
Delete no longer needed fix_dcmtk.patch
- - - - -
42bb17aa by Fernando Hueso at 2026-08-13T14:06:19+00:00
Delete lib_path.patch
since the same can be achieved when calling CMake by setting the
proper flag in debian/rules
- - - - -
93226a7a by Fernando Hueso at 2026-08-13T14:12:30+00:00
Delete log4cplus_namespace.patch
It seems that with recent DCMTK versions this works fine,
probably they allow both options.
- - - - -
37ec483e by Fernando Hueso at 2026-08-13T14:13:08+00:00
cleanup list of patches
- - - - -
29565020 by Fernando Hueso at 2026-08-13T14:16:20+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
- - - - -
bda89137 by Fernando Hueso at 2026-08-13T14:16:20+00:00
readd optional flags
- - - - -
a8965d43 by Fernando Hueso at 2026-08-13T14:16:20+00:00
fix comments
- - - - -
32f11322 by Fernando Hueso at 2026-08-13T14:16:20+00:00
missed one flag
- - - - -
ab71bfe7 by Fernando Hueso at 2026-08-13T14:16:20+00:00
sort CMake flags alphabetically
- - - - -
6 changed files:
- debian/control
- − debian/patches/fix_dcmtk.patch
- − debian/patches/lib_path.patch
- − debian/patches/log4cplus_namespace.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
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/patches/fix_dcmtk.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -438,6 +438,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- endif()
-
- set(CTK_C_FLAGS "${cflags} ${CTK_C_FLAGS}")
-+ # Fix for debian bug #637687, should never be merged in CTK master
-+ set(CTK_CXX_FLAGS "${CTK_CXX_FLAGS} -DHAVE_CONFIG_H")
- set(CTK_CXX_FLAGS "${cflags} -Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel -Wsign-promo ${CTK_CXX_FLAGS}")
- endif()
-
=====================================
debian/patches/lib_path.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -196,7 +196,7 @@ if(NOT CTK_INSTALL_BIN_DIR)
- set(CTK_INSTALL_BIN_DIR "bin")
- endif()
- if(NOT CTK_INSTALL_LIB_DIR)
-- set(CTK_INSTALL_LIB_DIR "lib/ctk-${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION}")
-+ set(CTK_INSTALL_LIB_DIR "lib")
- endif()
- if(NOT CTK_INSTALL_PLUGIN_DIR)
- set(CTK_INSTALL_PLUGIN_DIR "lib/ctk-${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION}/plugins")
=====================================
debian/patches/log4cplus_namespace.patch deleted
=====================================
@@ -1,20 +0,0 @@
---- a/Libs/DICOM/Core/ctkDICOMUtil.cpp
-+++ b/Libs/DICOM/Core/ctkDICOMUtil.cpp
-@@ -30,7 +30,7 @@
- //------------------------------------------------------------------------------
- void ctk::setDICOMLogLevel(ctkErrorLogLevel::LogLevel level)
- {
-- dcmtk::log4cplus::Logger log = dcmtk::log4cplus::Logger::getRoot();
-+ log4cplus::Logger log = log4cplus::Logger::getRoot();
- switch (level)
- {
- case ctkErrorLogLevel::Trace: log.setLogLevel(OFLogger::TRACE_LOG_LEVEL); break;
-@@ -62,7 +62,7 @@ void ctk::setDICOMDetailedLogging(bool e
- //------------------------------------------------------------------------------
- ctkErrorLogLevel::LogLevel ctk::dicomLogLevel()
- {
-- dcmtk::log4cplus::Logger log = dcmtk::log4cplus::Logger::getRoot();
-+ log4cplus::Logger log = log4cplus::Logger::getRoot();
- switch (log.getLogLevel())
- {
- case OFLogger::TRACE_LOG_LEVEL: return ctkErrorLogLevel::Trace;
=====================================
debian/patches/series
=====================================
@@ -1,5 +1,2 @@
-#log4cplus_namespace.patch
-#lib_path.patch
-#fix_dcmtk.patch
qt6svg_1453.patch
oflist.patch
=====================================
debian/rules
=====================================
@@ -4,49 +4,50 @@ DH_VERBOSE=0
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+# 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
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_ENABLE_PluginFramework:BOOL=ON \
+ -DCTK_ENABLE_Python_Wrapping:BOOL=OFF \
+ -DCTK_ENABLE_Widgets:BOOL=ON \
-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 \
+ -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
View it on GitLab: https://salsa.debian.org/med-team/ctk/-/compare/685f58f3f1f762da28f55d2a60db514cbf28ad2f...ab71bfe7162181be4e38a7affdb54fb7b4c9373c
--
View it on GitLab: https://salsa.debian.org/med-team/ctk/-/compare/685f58f3f1f762da28f55d2a60db514cbf28ad2f...ab71bfe7162181be4e38a7affdb54fb7b4c9373c
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/530a239a/attachment-0001.htm>
More information about the debian-med-commit
mailing list