# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1619085629 -7200
# Node ID 31169ba1d68d3ae529f715700413d967b931924a
# Parent  b4dd33ef5d9708382b6ebd7df40dbf25cf6d9d96
dcmtk: Drop problematic patch.

* src/dcmtk-4-c++11-related-fixes.patch: Drop patch that provokes error with
  current compilers.
* dist-files.mk: Remove deleted file.
* src/dcmtk.mk: Remove duplicate configure flag.

diff -r b4dd33ef5d97 -r 31169ba1d68d dist-files.mk
--- a/dist-files.mk	Wed Apr 21 08:45:45 2021 -0400
+++ b/dist-files.mk	Thu Apr 22 12:00:29 2021 +0200
@@ -75,7 +75,6 @@
   dcmtk-1-fixes.patch \
   dcmtk-2-mingw-w64.patch \
   dcmtk-3-pointer-fixes.patch \
-  dcmtk-4-c++11-related-fixes.patch \
   dcmtk.mk \
   default-octave-1-gnulib.patch \
   default-octave.mk \
diff -r b4dd33ef5d97 -r 31169ba1d68d src/dcmtk-4-c++11-related-fixes.patch
--- a/src/dcmtk-4-c++11-related-fixes.patch	Wed Apr 21 08:45:45 2021 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-From: Boris Pek
-Date: Thu, 05 May 2016 15:38:47 +0300
-Subject: [PATCH] fix build with GCC >= 6.x
-
-diff --git a/ofstd/libsrc/ofstd.cc b/ofstd/libsrc/ofstd.cc
---- a/ofstd/libsrc/ofstd.cc
-+++ b/ofstd/libsrc/ofstd.cc
-@@ -175,7 +175,7 @@
- 
- 
- // some systems don't properly define isnan()
--#ifdef HAVE_ISNAN
-+#if defined(HAVE_ISNAN) && (__cplusplus < 201103L)
- #ifndef HAVE_PROTOTYPE_ISNAN
- extern "C"
- {
diff -r b4dd33ef5d97 -r 31169ba1d68d src/dcmtk.mk
--- a/src/dcmtk.mk	Wed Apr 21 08:45:45 2021 -0400
+++ b/src/dcmtk.mk	Thu Apr 22 12:00:29 2021 +0200
@@ -23,14 +23,13 @@
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
-        --with-openssl \
+        --without-openssl \
         --with-libtiff \
         --with-libpng \
         --with-libxml \
         --with-libxmlinc='$(HOST_PREFIX)' \
         --with-zlib \
         --without-libwrap \
-	--without-openssl \
         CXX='$(MXE_CXX)' \
         RANLIB='$(MXE_RANLIB)' \
         AR='$(MXE_AR)' \