Fernando Hueso pushed to branch cifix at Debian Med / ctk
Commits: 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 - - - - - 1 changed file: - + debian/patches/oflist.patch Changes: ===================================== debian/patches/oflist.patch ===================================== @@ -0,0 +1,40 @@ +From ab4ab63b12d1f2ba8c5ea0fe117cb951524e0a6b Mon Sep 17 00:00:00 2001 +From: Stefan Dinkelacker <[email protected]> +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 ctkDICOM + \ No newline at end of file View it on GitLab: https://salsa.debian.org/med-team/ctk/-/commit/faf00c52d28adaeeb45016458f29cb18b2e46b4e -- View it on GitLab: https://salsa.debian.org/med-team/ctk/-/commit/faf00c52d28adaeeb45016458f29cb18b2e46b4e 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
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
