diff options
| author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2017-07-03 21:31:20 -0500 |
|---|---|---|
| committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2017-07-03 21:31:20 -0500 |
| commit | ab72d6ba9aa8688eeca9947c6ef0f70f40772184 (patch) | |
| tree | 4983ba1c88e2e55f067db9387835f53b11c96343 /libre/mapnik/icu59.patch | |
| parent | 875f9f71f77e3f31c59d7a6d5c6f9d2fcd7442c9 (diff) | |
| download | abslibre-ab72d6ba9aa8688eeca9947c6ef0f70f40772184.tar.gz abslibre-ab72d6ba9aa8688eeca9947c6ef0f70f40772184.tar.bz2 abslibre-ab72d6ba9aa8688eeca9947c6ef0f70f40772184.zip | |
mapnik-3.0.13-5.parabola1: rebuild
Diffstat (limited to 'libre/mapnik/icu59.patch')
| -rw-r--r-- | libre/mapnik/icu59.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/libre/mapnik/icu59.patch b/libre/mapnik/icu59.patch new file mode 100644 index 000000000..47494a3aa --- /dev/null +++ b/libre/mapnik/icu59.patch @@ -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-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 { |