[Debian-med-packaging] Bug#1010545: biosig: FTBFS with dcmtk >= 3.6.7

[Johannes Schauer Marin Rodrigues]

Source: biosig
Version: 2.3.3-1
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
X-Debbugs-Cc: josch at debian.org

Hi,

biosig FTBFS with dcmtk 3.6.7 from unstable:

cc -c  -D=__4HAERTEL__ -D=WITH_FAMOS -D=WITH_FIFF -D=WITHOUT_NETWORK -D=WITH_SCP3 -D=WITH_FEF -D=WITH_INTAN -D=WITH_ATF -
D=MAKE_EDFLIB -D=WITH_DCMTK -D=WITH_LIBTINYXML -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=
. -fstack-protector-strong -Wformat -Werror=format-security -pipe -fPIC -fno-builtin-memcmp -O2 -Wno-unused-result -Wno-d
eprecated -fvisibility=hidden -I/usr/include   -o "sopen_heka_read.o" "./t210/sopen_heka_read.c"
In file included from ./t210/sopen_dcmtk_read.cpp:51:
/usr/include/dcmtk/ofstd/ofstdinc.h:113:2: error: #error "Macro INCLUDE_CSTDIO not supported anymore. Include <cstdio> directly."
  113 | #error "Macro INCLUDE_CSTDIO not supported anymore. Include <cstdio> directly."
      |  ^~~~~
/usr/include/dcmtk/ofstd/ofstdinc.h:117:2: error: #error "Macro INCLUDE_CSTDLIB not supported anymore. Include <cstdlib> directly."
  117 | #error "Macro INCLUDE_CSTDLIB not supported anymore. Include <cstdlib> directly."
      |  ^~~~~
/usr/include/dcmtk/ofstd/ofstdinc.h:121:2: error: #error "Macro INCLUDE_CSTRING not supported anymore. Include <cstring> directly."
  121 | #error "Macro INCLUDE_CSTRING not supported anymore. Include <cstring> directly."
      |  ^~~~~


I attached a debdiff that adds a patch fixing this problem.

Thanks!

cheers, josch
-------------- next part --------------
diff -Nru biosig-2.3.3/debian/changelog biosig-2.3.3/debian/changelog
--- biosig-2.3.3/debian/changelog	2021-10-02 15:32:14.000000000 +0200
+++ biosig-2.3.3/debian/changelog	2022-05-03 23:06:01.000000000 +0200
@@ -1,3 +1,10 @@
+biosig (2.3.3-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * add patch to build with dcmtk >= 3.6.7 (closes: #XXXXXXX)
+
+ -- Johannes Schauer Marin Rodrigues <josch at debian.org>  Tue, 03 May 2022 23:06:01 +0200
+
 biosig (2.3.3-1) unstable; urgency=medium
 
   [ Alois Schl?gl ]
diff -Nru biosig-2.3.3/debian/patches/dcmtk-3.6.7 biosig-2.3.3/debian/patches/dcmtk-3.6.7
--- biosig-2.3.3/debian/patches/dcmtk-3.6.7	1970-01-01 01:00:00.000000000 +0100
+++ biosig-2.3.3/debian/patches/dcmtk-3.6.7	2022-05-03 23:06:01.000000000 +0200
@@ -0,0 +1,15 @@
+--- a/biosig4c++/t210/sopen_dcmtk_read.cpp
++++ b/biosig4c++/t210/sopen_dcmtk_read.cpp
+@@ -44,9 +44,9 @@
+ 	#include "dcmtk/dcmdata/dctk.h"
+ 	#include "dcmtk/dcmdata/dcistrmf.h"
+ 
+-#define INCLUDE_CSTRING
+-#define INCLUDE_CSTDLIB
+-#define INCLUDE_CSTDIO
++	#include <cstring>
++	#include <cstdlib>
++	#include <cstdio>
+ 
+ 	#include "dcmtk/ofstd/ofstdinc.h"
+ 
diff -Nru biosig-2.3.3/debian/patches/series biosig-2.3.3/debian/patches/series
--- biosig-2.3.3/debian/patches/series	2021-10-02 15:32:14.000000000 +0200
+++ biosig-2.3.3/debian/patches/series	2022-05-03 23:04:36.000000000 +0200
@@ -1 +1,2 @@
 fix-make-clean-when-mathematica-is-not-available.patch
+dcmtk-3.6.7