From 65c69093b88565f7085bc496aa3dd36231be556f Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 18 Feb 2011 13:51:26 +0100
Subject: upgrade package dcmtk

---
 src/dcmtk-1-explicit-cast.patch     | 26 --------------------------
 src/dcmtk-2-const-correctness.patch | 17 -----------------
 src/dcmtk.mk                        |  4 ++--
 3 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 src/dcmtk-1-explicit-cast.patch
 delete mode 100644 src/dcmtk-2-const-correctness.patch

diff --git a/src/dcmtk-1-explicit-cast.patch b/src/dcmtk-1-explicit-cast.patch
deleted file mode 100644
index 26bdbbe..0000000
--- a/src/dcmtk-1-explicit-cast.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://forum.dcmtk.org/viewtopic.php?t=2563
-
---- dcmtk-3.5.4.orig/ofstd/libsrc/ofthread.cc	2005-12-08 16:49:02.000000000 +0100
-+++ dcmtk-3.5.4/ofstd/libsrc/ofthread.cc	2010-06-15 21:34:29.234201660 +0200
-@@ -139,7 +139,7 @@
-   theThreadHandle = _beginthreadex(NULL, 0, thread_stub, (void *)this, 0, &tid);
-   if (theThreadHandle == 0) return errno; else
-   {
--    theThread = tid;
-+    theThread = (void *)tid;
-     return 0;
-   }
- #elif defined(POSIX_INTERFACE)
-@@ -195,7 +195,7 @@
- #endif
- {
- #ifdef WINDOWS_INTERFACE
--  if (theThread == tID) return OFTrue; else return OFFalse;
-+  if (theThread == (void *)tID) return OFTrue; else return OFFalse;
- #elif defined(POSIX_INTERFACE)
- #ifdef HAVE_POINTER_TYPE_PTHREAD_T
-   // dangerous - we cast an unsigned long back to a pointer type and hope that it is still valid
diff --git a/src/dcmtk-2-const-correctness.patch b/src/dcmtk-2-const-correctness.patch
deleted file mode 100644
index 63b089d..0000000
--- a/src/dcmtk-2-const-correctness.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=9ae9f56c4d40ebc7408fcbf84a7521d1d1341f5e
-
---- dcmtk-3.5.4.orig/dcmtls/libsrc/tlslayer.cc	2005-12-08 16:48:28.000000000 +0100
-+++ dcmtk-3.5.4/dcmtls/libsrc/tlslayer.cc	2010-06-16 06:25:12.279931390 +0200
-@@ -188,7 +188,7 @@
-    SSLeay_add_all_algorithms();
-    seedPRNG(randFile);
- 
--   SSL_METHOD *method = NULL;
-+   const SSL_METHOD *method = NULL;
-    switch (networkRole)
-    {
-      case DICOM_APPLICATION_ACCEPTOR: 
diff --git a/src/dcmtk.mk b/src/dcmtk.mk
index 982ea55..d1c0d6c 100644
--- a/src/dcmtk.mk
+++ b/src/dcmtk.mk
@@ -4,8 +4,8 @@
 # DCMTK
 PKG             := dcmtk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.5.4
-$(PKG)_CHECKSUM := 169056874947083e68eb941fcd53faaebc862ae5
+$(PKG)_VERSION  := 3.6.0
+$(PKG)_CHECKSUM := 469e017cffc56f36e834aa19c8612111f964f757
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://dicom.offis.de/dcmtk.php.en
-- 
cgit v0.12