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

[Evangelos Foutras]

    Date: Wednesday, April 26, 2017 @ 09:17:08
  Author: foutrelis
Revision: 225649

Fix patch from last commit

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

-------------+
 PKGBUILD    |    2 +-
 icu59.patch |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-26 09:16:02 UTC (rev 225648)
+++ PKGBUILD	2017-04-26 09:17:08 UTC (rev 225649)
@@ -27,7 +27,7 @@
 source=("https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2"
         'icu59.patch')
 sha256sums=('d6213d514a0e3cd84d9bfcb6d97208d169ffcaae1f36250f6555655cdfe57bcc'
-            'a58ebdb860df483371e17218324ae5ed9ecd9f2912e10d7a4708f373c34ba19a')
+            'b391a775f28ec9bc7d5d2a8ef429789d8c6158bdf8023f395501fbfc8137cc22')
 
 prepare() {
   cd "$srcdir/$pkgname-v$pkgver"

Modified: icu59.patch
===================================================================
--- icu59.patch	2017-04-26 09:16:02 UTC (rev 225648)
+++ icu59.patch	2017-04-26 09:17:08 UTC (rev 225649)
@@ -1,7 +1,7 @@
 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
+--- mapnik-v3.0.13.orig/include/mapnik/text/harfbuzz_shaper.hpp	2017-02-08 15:13:58.000000000 +0200
++++ mapnik-v3.0.13/include/mapnik/text/harfbuzz_shaper.hpp	2017-04-26 12:14:46.156921035 +0300
+@@ -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");
@@ -8,7 +8,7 @@
 -#if defined(_MSC_VER)
     return reinterpret_cast<const uint16_t *>(src);
 -#else
-    return src;
+-   return src;
 -#endif
  }
  
@@ -15,7 +15,7 @@
  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
++++ mapnik-v3.0.13/src/unicode.cpp	2017-04-26 12:14:20.346507663 +0300
 @@ -30,6 +30,7 @@
  #pragma GCC diagnostic push
  #include <mapnik/warning_ignore.hpp>