From b7a75eefda4acdfc433c81b7ecf26848b08b8a9b Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Mon, 15 Jan 2018 18:38:50 +0100
Subject: libre/mapnik: updated to 3.0.17

---
 libre/mapnik/icu59.patch | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 libre/mapnik/icu59.patch

(limited to 'libre/mapnik/icu59.patch')

diff --git a/libre/mapnik/icu59.patch b/libre/mapnik/icu59.patch
deleted file mode 100644
index 47494a3aa..000000000
--- a/libre/mapnik/icu59.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-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");
--#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 12:14:20.346507663 +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 {
-- 
cgit v1.2.3