[arch-commits] Commit in mapnik/trunk (PKGBUILD icu59.patch)

[Evangelos Foutras]

    Date: Wednesday, April 26, 2017 @ 09:08:54
  Author: foutrelis
Revision: 225646

Fix build with ICU 59

Added:
  mapnik/trunk/icu59.patch
Modified:
  mapnik/trunk/PKGBUILD

-------------+
 PKGBUILD    |   11 +++++++++--
 icu59.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-26 09:08:02 UTC (rev 225645)
+++ PKGBUILD	2017-04-26 09:08:54 UTC (rev 225646)
@@ -24,9 +24,16 @@
             'mod_wsgi2:       Web Map Service')
 makedepends=('scons' 'boost' 'git')
 install="mapnik.install"
-source=("https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2")
-sha256sums=('d6213d514a0e3cd84d9bfcb6d97208d169ffcaae1f36250f6555655cdfe57bcc')
+source=("https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2"
+        'icu59.patch')
+sha256sums=('d6213d514a0e3cd84d9bfcb6d97208d169ffcaae1f36250f6555655cdfe57bcc'
+            'a58ebdb860df483371e17218324ae5ed9ecd9f2912e10d7a4708f373c34ba19a')
 
+prepare() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  patch -Np1 -i ../icu59.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
   PYTHON=python2

Added: icu59.patch
===================================================================
--- icu59.patch	                        (rev 0)
+++ icu59.patch	2017-04-26 09:08:54 UTC (rev 225646)
@@ -0,0 +1,26 @@
+diff -upr mapnik-v3.0.13.orig/include/mapnik/text/harfbuzz_shaper.hpp mapnik-v3.0.13/include/mapnik/text/harfbuzz_shaper.hpp
+--- mapnik-v3.0.13.orig/include/mapnik/text/harfbuzz_shaper.hpp	2017-04-26 11:34:05.915733900 +0300
++++ mapnik-v3.0.13/include/mapnik/text/harfbuzz_shaper.hpp	2017-04-26 12:08:08.974026806 +0300
+@@ -55,11 +55,8 @@ 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
+diff -upr mapnik-v3.0.13.orig/src/unicode.cpp mapnik-v3.0.13/src/unicode.cpp
+--- mapnik-v3.0.13.orig/src/unicode.cpp	2017-02-08 15:13:58.000000000 +0200
++++ mapnik-v3.0.13/src/unicode.cpp	2017-04-26 11:20:32.726687637 +0300
+@@ -30,6 +30,7 @@
+ #pragma GCC diagnostic push
+ #include <mapnik/warning_ignore.hpp>
+ #include <unicode/ucnv.h>
++#include <unicode/unistr.h>
+ #pragma GCC diagnostic pop
+ 
+ namespace mapnik {