diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-09-13 06:23:50 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-09-13 06:23:50 +0800 |
| commit | d5c616b61a7380137424dd130af9f4f57a86d9f1 (patch) | |
| tree | 56570ecf6f2437710ca6333a5cb62daac79727e1 | |
| parent | c9cfb3a7f7905855bf8453f138a163dcdcc43373 (diff) | |
| download | freebsd-ports-gnome-d5c616b61a7380137424dd130af9f4f57a86d9f1.tar.gz freebsd-ports-gnome-d5c616b61a7380137424dd130af9f4f57a86d9f1.tar.zst freebsd-ports-gnome-d5c616b61a7380137424dd130af9f4f57a86d9f1.zip | |
graphics/mapnik: unbreak with ICU 59.1
src/unicode.cpp:47:42: error: incomplete result type 'mapnik::value_unicode_string' (aka 'icu::UnicodeString') in function definition
mapnik::value_unicode_string transcoder::transcode(const char* data, std::int32_t length) const
^
include/mapnik/value_types.hpp:39:11: note: forward declaration of 'icu::UnicodeString'
class UnicodeString;
^
src/unicode.cpp:51:34: error: variable has incomplete type 'mapnik::value_unicode_string' (aka 'icu::UnicodeString')
mapnik::value_unicode_string ustr(data,length,conv_,err);
^
include/mapnik/value_types.hpp:39:11: note: forward declaration of 'icu::UnicodeString'
class UnicodeString;
^
PR: 218788
Obtained from: upstream
| -rw-r--r-- | graphics/mapnik/files/patch-icu59 | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/graphics/mapnik/files/patch-icu59 b/graphics/mapnik/files/patch-icu59 new file mode 100644 index 000000000000..01bcdd6d76d0 --- /dev/null +++ b/graphics/mapnik/files/patch-icu59 @@ -0,0 +1,39 @@ +https://github.com/mapnik/mapnik/commit/9e58c890430d +https://github.com/mapnik/mapnik/commit/093fcee6d1ba + +--- include/mapnik/text/harfbuzz_shaper.hpp.orig 2015-11-26 14:32:15 UTC ++++ include/mapnik/text/harfbuzz_shaper.hpp +@@ -41,6 +41,7 @@ + #include <harfbuzz/hb-ft.h> + + // icu ++#include <unicode/uvernum.h> + #include <unicode/uscript.h> + + namespace mapnik +@@ -55,7 +56,8 @@ static inline hb_script_t _icu_script_to_script(UScrip + 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) ++#if defined(_MSC_VER) || (U_ICU_VERSION_MAJOR_NUM >= 59) ++ // ^^ http://site.icu-project.org/download/59#TOC-ICU4C-char16_t1 + return reinterpret_cast<const uint16_t *>(src); + #else + return src; +--- include/mapnik/unicode.hpp.orig 2015-11-26 14:32:15 UTC ++++ include/mapnik/unicode.hpp +@@ -31,6 +31,13 @@ + // std + #include <cstdint> + #include <string> ++// icu ++#if (U_ICU_VERSION_MAJOR_NUM >= 59) ++#pragma GCC diagnostic push ++#include <mapnik/warning_ignore.hpp> ++#include <unicode/unistr.h> ++#pragma GCC diagnostic pop ++#endif + + struct UConverter; + |