[mapnik] 01/02: Add patch Matthias Klose by to fix build with ICU 59.1. (closes: #879835)

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapnik.

commit 3c362c35fbc4b97039e62e03d8a95e0da5a3db21
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Oct 26 18:47:42 2017 +0200

    Add patch Matthias Klose by to fix build with ICU 59.1. (closes: #879835)
---
 debian/changelog            |  7 +++++++
 debian/patches/icu-59.patch | 33 +++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5c7d625..64887ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapnik (3.0.15+ds-3) UNRELEASED; urgency=medium
+
+  * Add patch Matthias Klose by to fix build with ICU 59.1.
+    (closes: #879835)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 26 Oct 2017 18:47:10 +0200
+
 mapnik (3.0.15+ds-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.1.1, no changes.
diff --git a/debian/patches/icu-59.patch b/debian/patches/icu-59.patch
new file mode 100644
index 0000000..e841bf2
--- /dev/null
+++ b/debian/patches/icu-59.patch
@@ -0,0 +1,33 @@
+Description: Fix FTBFS with ICU 5.9.1.
+ Upstream fix is a little different, see:
+ .
+  https://github.com/mapnik/mapnik/commit/d3ec91b29b364681e393ff7910b883d7f22e2243
+  https://github.com/mapnik/mapnik/commit/7f4adc2d73871d45dbedcc08b37154989599caed
+Author: Matthias Klose <doko at debian.org>
+Bug-Debian: https://bugs.debian.org/879835
+Forwarded: not-needed
+
+--- a/include/mapnik/text/harfbuzz_shaper.hpp
++++ b/include/mapnik/text/harfbuzz_shaper.hpp
+@@ -55,11 +55,7 @@ static inline hb_script_t _icu_script_to
+ static inline const uint16_t * uchar_to_utf16(const UChar* src)
+ {
+    static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t");
+-#if defined(_MSC_VER)
+    return reinterpret_cast<const uint16_t *>(src);
+-#else
+-   return src;
+-#endif
+ }
+ 
+ struct harfbuzz_shaper
+--- a/include/mapnik/value_types.hpp
++++ b/include/mapnik/value_types.hpp
+@@ -23,6 +23,7 @@
+ #ifndef MAPNIK_VALUE_TYPES_HPP
+ #define MAPNIK_VALUE_TYPES_HPP
+ 
++#include <unicode/unistr.h>
+ // mapnik
+ #include <mapnik/config.hpp>
+ #include <mapnik/cxx11_support.hpp>
diff --git a/debian/patches/series b/debian/patches/series
index e1e916a..f35a2f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 scons-3.0.patch
+icu-59.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git