diff options
Diffstat (limited to 'testing/mapnik/icu-62.patch')
-rw-r--r-- | testing/mapnik/icu-62.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/testing/mapnik/icu-62.patch b/testing/mapnik/icu-62.patch deleted file mode 100644 index c703d92bf2..0000000000 --- a/testing/mapnik/icu-62.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- ./SConstruct.orig 2018-10-01 16:59:39.291478884 +0000 -+++ ./SConstruct 2018-10-01 17:05:50.416539178 +0000 -@@ -42,7 +42,7 @@ - - DEFAULT_CC = "cc" - DEFAULT_CXX = "c++" --DEFAULT_CXX11_CXXFLAGS = " -std=c++11" -+DEFAULT_CXX11_CXXFLAGS = " -std=c++11 -DU_USING_ICU_NAMESPACE=0" - DEFAULT_CXX11_LINKFLAGS = "" - if sys.platform == 'darwin': - # homebrew default -From 1ddfe6c315487a802f2ea38119255a203a25913c Mon Sep 17 00:00:00 2001 -From: Raul Marin <git@rmr.ninja> -Date: Tue, 3 Apr 2018 13:18:03 +0200 -Subject: [PATCH] Qualify ICU types explicitly - -ICU 61 has dropped the global `using namespace icu;` -http://site.icu-project.org/download/61#TOC-Migration-Issues ---- - include/mapnik/text/scrptrun.hpp | 2 +- - src/text/text_layout.cpp | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/include/mapnik/text/scrptrun.hpp b/include/mapnik/text/scrptrun.hpp -index 2161c510d9..c219a2a0d3 100644 ---- a/include/mapnik/text/scrptrun.hpp -+++ b/include/mapnik/text/scrptrun.hpp -@@ -37,7 +37,7 @@ struct ParenStackEntry - UScriptCode scriptCode = USCRIPT_INVALID_CODE; - }; - --class ScriptRun : public UObject { -+class ScriptRun : public icu::UObject { - public: - ScriptRun(); - -diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp -index 663cbe11aa..ecf02ab8e3 100644 ---- a/src/text/text_layout.cpp -+++ b/src/text/text_layout.cpp -@@ -207,6 +207,7 @@ void text_layout::layout() - // At the end everything that is left over is added as the final line. - void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits) - { -+ using BreakIterator = icu::BreakIterator; - text_line line(line_limits.first, line_limits.second); - shape_text(line); - -@@ -228,7 +229,7 @@ void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits) - } - - mapnik::value_unicode_string const& text = itemizer_.text(); -- Locale locale; // TODO: Is the default constructor correct? -+ icu::Locale locale; // TODO: Is the default constructor correct? - UErrorCode status = U_ZERO_ERROR; - std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status)); - -@@ -336,6 +337,7 @@ inline int adjust_last_break_position (int pos, bool repeat_wrap_char) - - void text_layout::break_line(std::pair<unsigned, unsigned> && line_limits) - { -+ using BreakIterator = icu::BreakIterator; - text_line line(line_limits.first, line_limits.second); - shape_text(line); - double scaled_wrap_width = wrap_width_ * scale_factor_; |