Mercurial > mxe-octave

changeset 5066:fb000475ca16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dcmtk: update patches/build * src/dcmtk-3-pointer-fixes.patch: new file * src/dcmtk-4-c++11-related-fixes.patch: new file * src/dcmtk-2-mingw-w64.patch: renamed from ming64 patch * src/dcmtk-2-ming64.patch: removed * dist-files.mk: add ref to new patches * src/dcmtk.mk: dont use openssl, force a autoreconf
author John Donoghue
date Fri, 03 May 2019 13:19:53 -0400
parents 71bc1f766e03
children 01ced4433575
files dist-files.mk src/dcmtk-1-fixes.patch src/dcmtk-2-ming64.patch src/dcmtk-2-mingw-w64.patch src/dcmtk-3-pointer-fixes.patch src/dcmtk-4-c++11-related-fixes.patch src/dcmtk.mk
diffstat 7 files changed, 242 insertions(+), 82 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed May 01 17:02:42 2019 -0400
+++ b/dist-files.mk	Fri May 03 13:19:53 2019 -0400
@@ -69,6 +69,8 @@
   dbus.mk \
   dcmtk-1-fixes.patch \
   dcmtk-2-ming64.patch \
+  dcmtk-3-pointer-fixes.patch \
+  dcmtk-4-c++11-related-fixes.patch \
   dcmtk.mk \
   default-octave-1-gnulib.patch \
   default-octave.mk \
--- a/src/dcmtk-1-fixes.patch	Wed May 01 17:02:42 2019 -0400
+++ b/src/dcmtk-1-fixes.patch	Fri May 03 13:19:53 2019 -0400
@@ -1,12 +1,11 @@
-This file is part of MXE.
-See index.html for further information.
+This file is part of MXE. See LICENSE.md for licensing information.
 
 Contains ad hoc patches for cross building.
 
-From ac29986df03482c61dbd7271554e6bc453228bd6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Joerg Riesmeier <dicom@offis.de>
 Date: Thu, 17 Nov 2011 16:13:14 +0000
-Subject: [PATCH] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang
+Subject: [PATCH 1/1] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang
  compiler) quiet.
 
 (cherry picked from commit dbadc0d8f3760f65504406c8b2cb8633f868a258)
@@ -15,31 +14,9 @@
 
 	CHANGES.361
 	ofstd/libsrc/ofchrenc.cc
----
- dcmimage/include/dcmtk/dcmimage/diargpxt.h |   25 ++++++++++++++-----------
- dcmimage/include/dcmtk/dcmimage/dicmypxt.h |   11 +++++++----
- dcmimage/include/dcmtk/dcmimage/dicocpt.h  |   11 +++++++----
- dcmimage/include/dcmtk/dcmimage/dicoflt.h  |   17 ++++++++++-------
- dcmimage/include/dcmtk/dcmimage/dicorot.h  |   17 ++++++++++-------
- dcmimage/include/dcmtk/dcmimage/dicosct.h  |   13 ++++++++-----
- dcmimage/include/dcmtk/dcmimage/dihsvpxt.h |   11 +++++++----
- dcmimage/include/dcmtk/dcmimage/dipalpxt.h |   11 +++++++----
- dcmimage/include/dcmtk/dcmimage/dirgbpxt.h |   15 +++++++++------
- dcmimage/include/dcmtk/dcmimage/diybrpxt.h |   15 +++++++++------
- dcmimage/include/dcmtk/dcmimage/diyf2pxt.h |   11 +++++++----
- dcmimage/include/dcmtk/dcmimage/diyp2pxt.h |   11 +++++++----
- dcmimgle/include/dcmtk/dcmimgle/diflipt.h  |   11 +++++++----
- dcmimgle/include/dcmtk/dcmimgle/dimoflt.h  |   15 +++++++++------
- dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h |   13 ++++++++-----
- dcmimgle/include/dcmtk/dcmimgle/dimorot.h  |   15 +++++++++------
- dcmimgle/include/dcmtk/dcmimgle/dimosct.h  |   11 +++++++----
- dcmimgle/include/dcmtk/dcmimgle/dirotat.h  |   11 +++++++----
- dcmimgle/include/dcmtk/dcmimgle/discalet.h |   19 +++++++++++--------
- ofstd/include/dcmtk/ofstd/ofoset.h         |   13 ++++++++-----
- 20 files changed, 168 insertions(+), 108 deletions(-)
 
 diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
-index 7e3894d..1ed9291 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/diargpxt.h
 +++ b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
 @@ -1,6 +1,6 @@
@@ -122,7 +99,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
-index 5357780..bf1161e 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
 +++ b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
 @@ -1,6 +1,6 @@
@@ -164,7 +141,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/dicocpt.h b/dcmimage/include/dcmtk/dcmimage/dicocpt.h
-index 0c06de7..3f03b6b 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/dicocpt.h
 +++ b/dcmimage/include/dcmtk/dcmimage/dicocpt.h
 @@ -1,6 +1,6 @@
@@ -206,7 +183,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/dicoflt.h b/dcmimage/include/dcmtk/dcmimage/dicoflt.h
-index a5bed81..bc809ab 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/dicoflt.h
 +++ b/dcmimage/include/dcmtk/dcmimage/dicoflt.h
 @@ -1,6 +1,6 @@
@@ -258,7 +235,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/dicorot.h b/dcmimage/include/dcmtk/dcmimage/dicorot.h
-index 2bcd71e..c8afd70 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/dicorot.h
 +++ b/dcmimage/include/dcmtk/dcmimage/dicorot.h
 @@ -1,6 +1,6 @@
@@ -310,7 +287,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/dicosct.h b/dcmimage/include/dcmtk/dcmimage/dicosct.h
-index 006a829..3bccc45 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/dicosct.h
 +++ b/dcmimage/include/dcmtk/dcmimage/dicosct.h
 @@ -1,6 +1,6 @@
@@ -354,7 +331,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
-index 10d8b70..52580ec 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
 +++ b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
 @@ -1,6 +1,6 @@
@@ -396,7 +373,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
-index 2e5eef7..1ae2352 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
 +++ b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
 @@ -1,6 +1,6 @@
@@ -438,7 +415,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
-index 85f973d..d9cc7ed 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
 +++ b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
 @@ -1,6 +1,6 @@
@@ -492,7 +469,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
-index 6b523fb..ecd2038 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
 +++ b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
 @@ -1,6 +1,6 @@
@@ -546,7 +523,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
-index ed27796..93d28cc 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
 +++ b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
 @@ -1,6 +1,6 @@
@@ -588,7 +565,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
-index 518fed7..0dd9d5b 100644
+index 1111111..2222222 100644
 --- a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
 +++ b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
 @@ -1,6 +1,6 @@
@@ -630,7 +607,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
-index 4933fe1..05c198c 100644
+index 1111111..2222222 100644
 --- a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
 +++ b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
 @@ -1,6 +1,6 @@
@@ -672,7 +649,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
-index a88ab9d..52d71a3 100644
+index 1111111..2222222 100644
 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
 @@ -1,6 +1,6 @@
@@ -720,7 +697,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
-index e815e90..c190dd6 100644
+index 1111111..2222222 100644
 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
 @@ -1,6 +1,6 @@
@@ -766,7 +743,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
-index 4ef277d..e729424 100644
+index 1111111..2222222 100644
 --- a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
 @@ -1,6 +1,6 @@
@@ -814,7 +791,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
-index 60c9abb..8f89855 100644
+index 1111111..2222222 100644
 --- a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
 @@ -1,6 +1,6 @@
@@ -856,7 +833,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
-index edb452e..2e7e3a0 100644
+index 1111111..2222222 100644
 --- a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
 +++ b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
 @@ -1,6 +1,6 @@
@@ -898,7 +875,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/dcmimgle/include/dcmtk/dcmimgle/discalet.h b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
-index 758dde2..0bcbc70 100644
+index 1111111..2222222 100644
 --- a/dcmimgle/include/dcmtk/dcmimgle/discalet.h
 +++ b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
 @@ -1,6 +1,6 @@
@@ -973,7 +950,7 @@
   * Updated copyright header. Added reference to COPYRIGHT file.
   *
 diff --git a/ofstd/include/dcmtk/ofstd/ofoset.h b/ofstd/include/dcmtk/ofstd/ofoset.h
-index 1a7f208..a534ebf 100644
+index 1111111..2222222 100644
 --- a/ofstd/include/dcmtk/ofstd/ofoset.h
 +++ b/ofstd/include/dcmtk/ofstd/ofoset.h
 @@ -1,6 +1,6 @@
@@ -1023,6 +1000,3 @@
  ** Revision 1.11  2010-10-14 13:15:50  joergr
  ** Updated copyright header. Added reference to COPYRIGHT file.
  **
--- 
-1.7.9.2
-
--- a/src/dcmtk-2-ming64.patch	Wed May 01 17:02:42 2019 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-Patch for the fact we are using the mingw-w64 with mingw32 compiler
-
-diff -ur dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h
---- dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h	2014-06-30 12:23:34.314366353 -0400
-+++ dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h	2014-06-30 12:29:57.079959273 -0400
-@@ -81,7 +81,7 @@
-   typedef __int64 offile_off_t;
-   typedef fpos_t offile_fpos_t;
- #else
--  #ifdef EXPLICIT_LFS_64
-+  #if defined(EXPLICIT_LFS_64) && !defined(__MINGW64__) && !defined(__MINGW32__)
-     // Explicit LFS (LFS64)
-     typedef fpos64_t offile_fpos_t;
-     typedef off64_t offile_off_t;
-@@ -196,7 +196,7 @@
-   OFBool popen(const char *command, const char *modes)
-   {
-     if (file_) fclose();
--#ifdef _WIN32
-+#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
-     file_ = _popen(command, modes);
- #else
-     file_ = :: popen(command, modes);
-@@ -258,7 +258,7 @@
-     {
-       if (popened_)
-       {
--#ifdef _WIN32
-+#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
-         result = _pclose(file_);
- #else
-         result = :: pclose(file_);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/dcmtk-2-mingw-w64.patch	Fri May 03 13:19:53 2019 -0400
@@ -0,0 +1,161 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+From 2d08af9a15089c354b436282e4d23f462a81ce8f Mon Sep 17 00:00:00 2001
+From: MXE <mxe@mxe.cc>
+Date: Tue, 7 Oct 2014 21:50:59 -0700
+Subject: [PATCH] Fix i686-w64-mingw32
+
+Cherry-picked from
+http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=b8a53c5f7fd12e9479f830680ef84f93805fd004
+
+diff --git a/config/configure.in b/config/configure.in
+index e343ce1..a305114 100644
+--- a/config/configure.in
++++ b/config/configure.in
+@@ -199,6 +199,10 @@ AC_CHECK_TYPES(longlong)
+ AC_CHECK_TYPES(ulonglong)
+ CHECK_VLA
+ 
++dnl File access stuff
++AC_CHECK_TYPES(fpos64_t)
++AC_CHECK_TYPES(off64_t)
++
+ dnl stdbool.h and stdint.h are only defined in ANSI C, not in C++
+ AC_CHECK_HEADERS(stdbool.h)
+ AC_CHECK_HEADERS(stdint.h)
+@@ -232,6 +236,7 @@ AC_CHECK_FUNCS(sleep fork)
+ AC_CHECK_FUNCS(_findfirst)
+ AC_CHECK_FUNCS(strlcpy strlcat)
+ AC_CHECK_FUNCS(vsnprintf)
++AC_CHECK_FUNCS(popen pclose)
+ AC_FUNC_FSEEKO
+ 
+ 
+diff --git a/config/include/dcmtk/config/cfunix.h.in b/config/include/dcmtk/config/cfunix.h.in
+index 3a6cd69..ed211ca 100644
+--- a/config/include/dcmtk/config/cfunix.h.in
++++ b/config/include/dcmtk/config/cfunix.h.in
+@@ -157,6 +157,9 @@
+ /* Define to 1 if you have the `fork' function. */
+ #undef HAVE_FORK
+ 
++/* Define to 1 if the system has the type `fpos64_t'. */
++#undef HAVE_FPOS64_T
++
+ /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+ #undef HAVE_FSEEKO
+ 
+@@ -424,14 +427,23 @@ typedef unsigned short ushort;
+ /* Define to 1 if you have the `ntohs' function. */
+ #undef HAVE_NTOHS
+ 
++/* Define to 1 if the system has the type `off64_t'. */
++#undef HAVE_OFF64_T
++
+ /* Define if your system supports readdir_r with the obsolete Posix 1.c draft
+    6 declaration (2 arguments) instead of the Posix 1.c declaration with 3
+    arguments. */
+ #undef HAVE_OLD_READDIR_R
+ 
++/* Define to 1 if you have the `pclose' function. */
++#undef HAVE_PCLOSE
++
+ /* Define if pthread_t is a pointer type on your system */
+ #undef HAVE_POINTER_TYPE_PTHREAD_T
+ 
++/* Define to 1 if you have the `popen' function. */
++#undef HAVE_POPEN
++
+ /* Define if your system has a prototype for accept in sys/types.h
+    sys/socket.h */
+ #undef HAVE_PROTOTYPE_ACCEPT
+diff --git a/ofstd/include/dcmtk/ofstd/offile.h b/ofstd/include/dcmtk/ofstd/offile.h
+index 0f5d454..3f5a677 100644
+--- a/ofstd/include/dcmtk/ofstd/offile.h
++++ b/ofstd/include/dcmtk/ofstd/offile.h
+@@ -75,26 +75,36 @@ END_EXTERN_C
+   #endif
+ #endif
+ 
+-#if defined(_WIN32) && !defined(__MINGW32__)
+-  // On Win32 systems except MinGW (where Posix definitions are available)
+-  // we use Win32 specific definitions
+-  typedef __int64 offile_off_t;
+-  typedef fpos_t offile_fpos_t;
++// Explicit LFS (LFS64) and Windows need 64 bit types
++#if defined(EXPLICIT_LFS_64) || defined(_WIN32)
++
++// Use POSIX 64 bit file position type when available
++#ifdef HAVE_FPOS64_T
++typedef fpos64_t offile_fpos_t;
++#else // Otherwise this should be sufficient
++typedef fpos_t offile_fpos_t;
++#endif
++
++// Use POSIX 64 bit file offset type when available
++#ifdef HAVE_OFF64_T
++typedef off64_t offile_off_t;
++#elif !defined(OF_NO_SINT64) // Otherwise use a 64 bit integer
++typedef Sint64 offile_off_t;
++#else // Cry when 64 LFS is required but no 64 bit integer exists
++#error \
++  Could not find a suitable offset-type for LFS64 support.
++#endif
++
++#else // Implicit LFS or no LFS
++
++#ifdef HAVE_FSEEKO
++typedef off_t offile_off_t;
+ #else
+-  #ifdef EXPLICIT_LFS_64
+-    // Explicit LFS (LFS64)
+-    typedef fpos64_t offile_fpos_t;
+-    typedef off64_t offile_off_t;
+-  #else
+-    // Implicit LFS or no LFS
+-    #ifdef HAVE_FSEEKO
+-      typedef off_t offile_off_t;
+-    #else
+-      typedef long offile_off_t;
+-    #endif
+-    typedef fpos_t offile_fpos_t;
+-  #endif
++typedef long offile_off_t;
+ #endif
++typedef fpos_t offile_fpos_t;
++
++#endif // basic type definitions
+ 
+ // the type we use to store the last error.
+ typedef int offile_errno_t;
+@@ -196,10 +206,10 @@ public:
+   OFBool popen(const char *command, const char *modes)
+   {
+     if (file_) fclose();
+-#ifdef _WIN32
+-    file_ = _popen(command, modes);
+-#else
++#ifdef HAVE_POPEN
+     file_ = :: popen(command, modes);
++#else
++    file_ = _popen(command, modes);
+ #endif
+     if (file_) popened_ = OFTrue; else storeLastError();
+     return (file_ != NULL);
+@@ -258,10 +268,10 @@ public:
+     {
+       if (popened_)
+       {
+-#ifdef _WIN32
+-        result = _pclose(file_);
+-#else
++#ifdef HAVE_PCLOSE
+         result = :: pclose(file_);
++#else
++        result = _pclose(file_);
+ #endif
+       }
+       else
+-- 
+1.8.3.2
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/dcmtk-3-pointer-fixes.patch	Fri May 03 13:19:53 2019 -0400
@@ -0,0 +1,36 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 808089f334f44ea125ec5263fb85c0f2c95fd190 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Sat, 6 Jun 2015 06:16:19 -0700
+Subject: [PATCH] Do not cast pointer to integer types. Instead, pass them in
+ as-is.
+
+
+diff --git a/dcmnet/libsrc/dul.cc b/dcmnet/libsrc/dul.cc
+index 48a267b..3a5eb18 100644
+--- a/dcmnet/libsrc/dul.cc
++++ b/dcmnet/libsrc/dul.cc
+@@ -1770,7 +1770,7 @@ receiveTransportConnectionTCP(PRIVATE_NETWORKKEY ** network,
+                 // send number of socket handle in child process over anonymous pipe
+                 DWORD bytesWritten;
+                 char buf[20];
+-                sprintf(buf, "%i", OFreinterpret_cast(int, childSocketHandle));
++                sprintf(buf, "%p", childSocketHandle);
+                 if (!WriteFile(hChildStdInWriteDup, buf, strlen(buf) + 1, &bytesWritten, NULL))
+                 {
+                     CloseHandle(hChildStdInWriteDup);
+@@ -1780,7 +1780,7 @@ receiveTransportConnectionTCP(PRIVATE_NETWORKKEY ** network,
+                 // return OF_ok status code DULC_FORKEDCHILD with descriptive text
+                 OFOStringStream stream;
+                 stream << "New child process started with pid " << OFstatic_cast(int, pi.dwProcessId)
+-                       << ", socketHandle " << OFreinterpret_cast(int, childSocketHandle) << OFStringStream_ends;
++                       << ", socketHandle " << childSocketHandle << OFStringStream_ends;
+                 OFSTRINGSTREAM_GETOFSTRING(stream, msg)
+                 return makeDcmnetCondition(DULC_FORKEDCHILD, OF_ok, msg.c_str());
+             }
+-- 
+2.1.4
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/dcmtk-4-c++11-related-fixes.patch	Fri May 03 13:19:53 2019 -0400
@@ -0,0 +1,16 @@
+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"
+ {
--- a/src/dcmtk.mk	Wed May 01 17:02:42 2019 -0400
+++ b/src/dcmtk.mk	Fri May 03 13:19:53 2019 -0400
@@ -9,7 +9,8 @@
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://dicom.offis.de/pub/dicom/offis/software/$(PKG)/$(PKG)$(subst .,,$($(PKG)_VERSION))/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://ftp.debian.org/debian/pool/main/d/$(PKG)/$(PKG)_$($(PKG)_VERSION).orig.tar.gz
-$(PKG)_DEPS     := openssl tiff libpng libxml2 zlib
+#$(PKG)_DEPS     := openssl tiff libpng libxml2 zlib
+$(PKG)_DEPS     := tiff libpng libxml2 zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://dicom.offis.de/dcmtk.php.en' | \
@@ -18,6 +19,7 @@
 endef
 
 define $(PKG)_BUILD
+    cd '$(1)'/config && autoconf -f
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
@@ -28,6 +30,7 @@
         --with-libxmlinc='$(HOST_PREFIX)' \
         --with-zlib \
         --without-libwrap \
+	--without-openssl \
         CXX='$(MXE_CXX)' \
         RANLIB='$(MXE_RANLIB)' \
         AR='$(MXE_AR)' \