[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapnik/, sci-geosciences/mapnik/files/

[Andreas Sturmlechner]

commit:     1c619fe0dcb8c7ebe7ac573f552977127cc2a5ba
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 16 17:42:09 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 17:42:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c619fe0

sci-geosciences/mapnik: Fix build with ICU 61

Closes: https://bugs.gentoo.org/668618
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../mapnik/files/mapnik-3.0.18-icu-61.patch        | 54 ++++++++++++++++++++++
 sci-geosciences/mapnik/mapnik-3.0.18.ebuild        |  3 +-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch
new file mode 100644
index 00000000000..1330fe6c0fb
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch
@@ -0,0 +1,54 @@
+From 1ddfe6c315487a802f2ea38119255a203a25913c Mon Sep 17 00:00:00 2001
+From: Raul Marin <git@×××.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_;

diff --git a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
index 8c0db9a6c0b..5a5a4d1e20f 100644
--- a/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
+++ b/sci-geosciences/mapnik/mapnik-3.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-configure-only-once.patch"
 	"${FILESDIR}/${PN}-2.2.0-dont-run-ldconfig.patch"
 	"${FILESDIR}/${PN}-3.0.18-scons.patch"
+	"${FILESDIR}/${PN}-3.0.18-icu-61.patch"
 )
 
 src_prepare() {