[med-svn] r13782 - trunk/packages/dcmtk/branches/experimental/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2013-05-31 16:32:39 +0000 (Fri, 31 May 2013)
New Revision: 13782

Modified:
   trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch
Log:
Fix iconv tests

Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch	2013-05-31 15:42:58 UTC (rev 13781)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch	2013-05-31 16:32:39 UTC (rev 13782)
@@ -2,6 +2,7 @@
  Debian does not ship either of them, so instead use
  iconv support from eglibc
  and use libcharset support from gettext
+ We removed the tests since iconv does not work
 Author: Mathieu Malaterre <malat at debian.org>
 Origin: vendor
 Bug-Debian: http://bugs.debian.org/701802
@@ -9,8 +10,8 @@
 
 Index: dcmtk-3.6.1~20121102/CMake/FindICONV.cmake
 ===================================================================
---- dcmtk-3.6.1~20121102.orig/CMake/FindICONV.cmake	2013-05-31 17:40:44.903835590 +0200
-+++ dcmtk-3.6.1~20121102/CMake/FindICONV.cmake	2013-05-31 17:40:56.083835464 +0200
+--- dcmtk-3.6.1~20121102.orig/CMake/FindICONV.cmake	2013-05-31 18:30:43.879801824 +0200
++++ dcmtk-3.6.1~20121102/CMake/FindICONV.cmake	2013-05-31 18:30:51.411801741 +0200
 @@ -14,11 +14,12 @@
  MARK_AS_ADVANCED(LIBICONV_INCLUDE_DIR)
  
@@ -30,8 +31,8 @@
  IF(LIBICONV_FOUND)
 Index: dcmtk-3.6.1~20121102/CMake/FindCharset.cmake
 ===================================================================
---- dcmtk-3.6.1~20121102.orig/CMake/FindCharset.cmake	2013-05-31 17:40:44.983835589 +0200
-+++ dcmtk-3.6.1~20121102/CMake/FindCharset.cmake	2013-05-31 17:40:56.083835464 +0200
+--- dcmtk-3.6.1~20121102.orig/CMake/FindCharset.cmake	2013-05-31 18:30:43.891801824 +0200
++++ dcmtk-3.6.1~20121102/CMake/FindCharset.cmake	2013-05-31 18:30:51.411801741 +0200
 @@ -7,10 +7,14 @@
  INCLUDE(FindPackageHandleStandardArgs)
  
@@ -51,15 +52,15 @@
  
 Index: dcmtk-3.6.1~20121102/ofstd/libsrc/ofchrenc.cc
 ===================================================================
---- dcmtk-3.6.1~20121102.orig/ofstd/libsrc/ofchrenc.cc	2013-05-31 17:40:45.043835590 +0200
-+++ dcmtk-3.6.1~20121102/ofstd/libsrc/ofchrenc.cc	2013-05-31 17:40:56.083835464 +0200
+--- dcmtk-3.6.1~20121102.orig/ofstd/libsrc/ofchrenc.cc	2013-05-31 18:30:43.907801824 +0200
++++ dcmtk-3.6.1~20121102/ofstd/libsrc/ofchrenc.cc	2013-05-31 18:30:51.411801741 +0200
 @@ -28,6 +28,9 @@
  #ifdef WITH_LIBICONV
  #include <iconv.h>
  #include <localcharset.h>
 +// The following #define is important this way it turns on/off iconv support in DCMTK
 +// debian/iconv.h does not define this variable
-+#define _LIBICONV_VERSION 0x010E
++//#define _LIBICONV_VERSION 0x010E
  #endif
  
  BEGIN_EXTERN_C
@@ -71,3 +72,18 @@
      sprintf(buf, "%i.%i", (_libiconv_version >> 8), (_libiconv_version & 0xff));
      versionStr.append(buf);
      return versionStr;
+Index: dcmtk-3.6.1~20121102/dcmdata/libsrc/dcspchrs.cc
+===================================================================
+--- dcmtk-3.6.1~20121102.orig/dcmdata/libsrc/dcspchrs.cc	2013-05-31 18:30:57.899801668 +0200
++++ dcmtk-3.6.1~20121102/dcmdata/libsrc/dcspchrs.cc	2013-05-31 18:31:33.095801270 +0200
+@@ -674,8 +674,9 @@
+ 
+ OFBool DcmSpecificCharacterSet::isConversionLibraryAvailable()
+ {
++  return OFFalse;
+     // just call the appropriate function from the underlying class
+-    return OFCharacterEncoding::isLibraryAvailable();
++//    return OFCharacterEncoding::isLibraryAvailable();
+ }
+ 
+