diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-23 09:00:07 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-23 09:00:08 +0000 |
| commit | 0bc2aefacd98a40c47101ff430e98cd81534a8e7 (patch) | |
| tree | c6fef9cb037677691a61d355bbf2651a5dfe13b0 /testing/mapnik/icu-59.patch | |
| parent | e66abfb4c6fece91d29a27037fd31bd23bd279a4 (diff) | |
| download | aports-0bc2aefacd98a40c47101ff430e98cd81534a8e7.tar.bz2 aports-0bc2aefacd98a40c47101ff430e98cd81534a8e7.tar.xz | |
testing/mapnik: upgrade to 3.0.20
Diffstat (limited to 'testing/mapnik/icu-59.patch')
| -rw-r--r-- | testing/mapnik/icu-59.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/testing/mapnik/icu-59.patch b/testing/mapnik/icu-59.patch deleted file mode 100644 index c888017712..0000000000 --- a/testing/mapnik/icu-59.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp -index 8b574b0..2d41efb 100644 ---- 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_script(UScriptCode script) - 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 --git a/include/mapnik/value_types.hpp b/include/mapnik/value_types.hpp -index 7682d52..9dba491 100644 ---- 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> |