From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- sci-geosciences/mapnik/Manifest | 3 +- .../mapnik/files/mapnik-3.0.18-icu-61.patch | 54 ++++++++++++++++++++++ sci-geosciences/mapnik/mapnik-3.0.18.ebuild | 3 +- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch (limited to 'sci-geosciences/mapnik') diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest index 08bcdec05bb4..081b4524cd41 100644 --- a/sci-geosciences/mapnik/Manifest +++ b/sci-geosciences/mapnik/Manifest @@ -1,10 +1,11 @@ AUX mapnik-2.2.0-configure-only-once.patch 737 BLAKE2B 66233c05272cf12c62c04bd87b5c3ab74894ed2887e6d33f5fe82217344a341ade76c3c9df138baa31629a75bc7c65083baf0470e705fbbd48ae830e36402b0c SHA512 30f044c8501536599d625646dc8930d3cdcd14fc1ef6c3ee64c8226fe03a6d0f3cbc5d175f6aff7bc7dc0575206dcd23288828cb6edad264aed3b2b4d9e7874b AUX mapnik-2.2.0-dont-run-ldconfig.patch 243 BLAKE2B 8dffa522b7f8cc7a080ebeb3175c953a7a8f457d5c9288a7857aebc1f76cc8b032c11bd46678e2bd50f59ee0e19e7f7172766658640b4a06530ad0163f600e33 SHA512 dd42f09654de246ff6be4cf68fc2b08bb5ec2ae6515e722e89337081ff4b89c8b269fa70d3393f3c6156a539d7a9b1d1f516e9d6ff7f35639669fcfcd20a26ff +AUX mapnik-3.0.18-icu-61.patch 2148 BLAKE2B 3dfc1a8fe598c13317576a31bd758bd28cf24140b02fd46eaf97e9bbb9cc10c56ad5f2b68ebde4e3ccd12f2275469f556edeee21c6f3b7d92e426a6f0b147730 SHA512 32ff973dde413c85fb03769d7b07dc3e1dcdf9fd2e398fb9a77e618a461a8613056cf978d2e1ff4679738e1122af563c6dd5238dcc1d434a19b70b314ea1faa1 AUX mapnik-3.0.18-scons.patch 1939 BLAKE2B ece0bf49df2959a33af5f58842a59fe59a2e232f41a6e9542e747f24ebcc99d550370cc742e28ba50f10272ac5f2d31cb4c503559fd55ae4323d9ecdcbab1571 SHA512 e17363609928d6654a9949f944dc8d1745336028019f65d7fd12190c8c88de65cc40dae272dab71626ab9fb69009ebc26f0ae2e569dd9d5e8fd84aa2de0370ac AUX mapnik-3.0.9-harbuzz_sharper-upstream.patch 746 BLAKE2B 73ad3bcb237e30447336657b541bd794e9e7786b23961d6a7ee94c1c5c7646e9337ea5a8002a68e15a9a9cae05a21f06e5517a07f4dbd65815a06f88c3a76d12 SHA512 08815cf001db531cec2660d53f8afdc83df0bb9e59cb792487a05fb5dff64aa66fa79e8283b7b2b8aca031e90205ab0dcd0097d8129953fed33432e93e34a2e2 AUX mapnik-3.0.9-unicode-upstream.patch 264 BLAKE2B 9b2b8a062a861c58bfbe3681d7edc1d115ae85955dd1c1b73e37b9d1f1e690a97037144d957b318cc0921071525eaae4b3a94403842bdebf503d0f8bd195a3e6 SHA512 1f1f58477f5d54408320190b369a3039c70147f6d4c8498a318969661c258a6c7b5e2f26c111e8d543409512c7a98ddb31ece12ac75b5256a06105177e303c9d DIST mapnik-3.0.18.tar.bz2 10103474 BLAKE2B de914ffe31940b74114cdf07a9ff13f36c7210d27b84cecd16fda7c429f0c4be7ffb9e677cf1bc8d156298b5f10ed2a41adcbf4f7727bbf85d2f0099950f5c4f SHA512 7af04b9437c83cddedf2b43f7da0622e44178b4ecce80c0349bacf551bf747698d9ec9e4d6eee68c0265feeae5833281215a759de5a1394abbdfdd39eef39661 DIST mapnik-3.0.9.tar.gz 13434729 BLAKE2B 49cf90089b34cfc706f85950d090609d5f9a5a6e9cfb56f6e1f1a6279f864b35f3f8d456caa2365787261affc4acb85ad93621d6471efed85f560c808dc0535a SHA512 ad45ecbb2661e860b7057e0a235542a390ae5790f401ef2c04f1517b6487e83cdb8e307072681847cb72a3abc242e0114bc15d48f504dec1f92df970dd1556e1 -EBUILD mapnik-3.0.18.ebuild 2768 BLAKE2B fa9fb68ad23c4b17d1163492f375735f26925137327f9b1dc6eefdc9d078e67a6f31331d21a3fcd3f90ff75242bc30429ded2c7f46df7aa08c545cecf43d3efe SHA512 0c27792c584dd10f845bff899318b685cdb7fffb08e3d0335628cf37d9a365b2e53fc65023bc0c229d018e6ae50d27dfeeaabf483f2a7a864013e8a09d948823 +EBUILD mapnik-3.0.18.ebuild 2806 BLAKE2B d732995c0cf6dd805dbc01def9e1185cd6c2424de42d6cd92b07aaf89b6fc9e89d60f95f7de80e0510afda4f1e4bb38a8069b6d77797c086a6e01b34c0443218 SHA512 2ba308aa071f761ee278eda592956d1ce6ae1d932fdab3870fa593d3793c8376154747bd352bb4204caab2a3425884ae52e3ded9234d763cc16d630f9e0dc73f EBUILD mapnik-3.0.9-r1.ebuild 2578 BLAKE2B d2c508da64f319b9043ff290f34b3fb99b0bd10f04aa3084108572eeb449ae9ea33131292e06a72807f363b4dc812b560c141e29cb622ffa92ca83e4140a1dac SHA512 8143ee3916c8d4fe4eb54c42dc11e3a5553016a3442b80a5131922a68d9ef47477f91b8c76e3f7a49c418e6b4ffbb78751d64fecef7f191bfb2505e8c6fe7d0a MISC metadata.xml 754 BLAKE2B f28f0847b5c78c667dc69f9d7e0ca75b196926ad8b6f98cbc1c529470943b0ecc64bd05fdc1ed3ef289dc60bf54d4f594800fcea44ef20d5e3dd5ba4ad1cfeb7 SHA512 84138433b879b8d48422f7f9d587966b69a28d89effac6cfbf7bd925010c3d118f4296c08de787dbf6649af549acf4fd671a4702acc9d203c3829caca30fc5d1 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 000000000000..1330fe6c0fb2 --- /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 +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 && 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 && 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 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 && 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 8c0db9a6c0be..5a5a4d1e20f0 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() { -- cgit v1.2.3