[med-svn] [dcmtk] 04/06: add patch to include localcharset.h correctly

Gert Wollny gewo at moszumanska.debian.org
Tue Jun 20 22:23:41 UTC 2017


This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository dcmtk.

commit 9ba20764c80ca21b3947d2b179a3633753a01446
Author: Gert Wollny <gewo at debian.org>
Date:   Tue Jun 20 21:52:09 2017 +0000

    add patch to include localcharset.h correctly
---
 debian/changelog                          |  2 ++
 debian/patches/localcharset-include.patch | 11 +++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 264e145..bf82a5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dcmtk (3.6.1~20170228-1) unstable; urgency=medium
   	- correctly enable ICONV, Closes: #701802
 	- enable C++11 build 
   * d/control:  add libunistring-dev
+  * d/p/: Add localcharset-include.patch to corretly include 
+    localcharset.h
 
  -- Gert Wollny <gewo at debian.org>  Tue, 20 Jun 2017 18:58:39 +0000
 
diff --git a/debian/patches/localcharset-include.patch b/debian/patches/localcharset-include.patch
new file mode 100644
index 0000000..8590a90
--- /dev/null
+++ b/debian/patches/localcharset-include.patch
@@ -0,0 +1,11 @@
+--- a/ofstd/libsrc/ofchrenc.cc
++++ b/ofstd/libsrc/ofchrenc.cc
+@@ -288,7 +288,7 @@
+ 
+ #include <iconv.h>
+ #ifdef WITH_LIBICONV
+-#include <localcharset.h>
++#include <unistring/localcharset.h>
+ #endif
+ 
+ #define ILLEGAL_DESCRIPTOR     OFreinterpret_cast(iconv_t, -1)
diff --git a/debian/patches/series b/debian/patches/series
index ab7e6ef..59fd292 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07_dont_export_all_executables.patch
 08_remove_system_processor.patch
 
+localcharset-include.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtk.git



More information about the debian-med-commit mailing list