diff options
Diffstat (limited to 'sci-geosciences/mapnik/files')
6 files changed, 0 insertions, 160 deletions
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch deleted file mode 100644 index 89541cb85ed7..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -503,16 +503,7 @@ for opt in pickle_store: - #print 'missing opt', opt - preconfigured = False - --# if custom arguments are supplied make sure to accept them --if opts.args: -- # since we have custom arguments update environment with all opts to -- # make sure to absorb the custom ones -- opts.Update(env) -- # now since we've got custom arguments we'll disregard any -- # pickled environment and force another configuration -- preconfigured = False -- --elif preconfigured: -+if preconfigured: - if not HELP_REQUESTED: - color_print(4,'Using previous successful configuration...') - color_print(4,'Re-configure by running "python scons/scons.py configure".') diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch deleted file mode 100644 index c92c0e9a02a7..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/build.py -+++ b/src/build.py -@@ -38,7 +38,7 @@ def call(cmd, silent=True): - print stderr - - def ldconfig(*args,**kwargs): -- call('ldconfig') -+ pass - - if env['LINKING'] == 'static': - lib_env.Append(CXXFLAGS="-fPIC") 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 deleted file mode 100644 index 1330fe6c0fb2..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.18-icu-61.patch +++ /dev/null @@ -1,54 +0,0 @@ -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_; diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch b/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch deleted file mode 100644 index 2414bf95fedd..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.18-scons.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -317,7 +317,7 @@ - ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)), - - # Install Variables -- ('PREFIX', 'The install path "prefix"', '/usr/local'), -+ ('PREFIX', 'The install path "prefix"', '/usr'), - ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT), - ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'), - ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''), -@@ -1222,6 +1222,8 @@ - - color_print(4,'Configuring build environment...') - -+ OPTIONAL_LIBSHEADERS = [] -+ - if not env['FAST']: - SetCacheMode('force') - -@@ -1410,7 +1412,8 @@ - # https://github.com/mapnik/mapnik/issues/913 - if env.get('XMLPARSER') and env['XMLPARSER'] == 'libxml2': - if env.get('XML2_LIBS') or env.get('XML2_INCLUDES'): -- OPTIONAL_LIBSHEADERS.insert(0,['libxml2','libxml/parser.h',True,'C']) -+ # code doesn't actually use HAVE_XMML2 but set just to have a fifth value -+ OPTIONAL_LIBSHEADERS.append(['libxml2','libxml/parser.h',True,'C','-DHAVE_XML2']) - if env.get('XML2_INCLUDES'): - inc_path = env['XML2_INCLUDES'] - env.AppendUnique(CPPPATH = fix_path(inc_path)) -@@ -1428,8 +1431,6 @@ - else: - env['SKIPPED_DEPS'].extend(['dlfcn']) - -- OPTIONAL_LIBSHEADERS = [] -- - if env['JPEG']: - OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG']) - inc_path = env['%s_INCLUDES' % 'JPEG'] diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch b/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch deleted file mode 100644 index cb81f526568c..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.9-harbuzz_sharper-upstream.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/include/mapnik/text/harfbuzz_shaper.hpp 2017-10-31 17:45:30.737250086 +0100 -+++ b/include/mapnik/text/harfbuzz_shaper.hpp 2017-10-31 17:46:56.002247847 +0100 -@@ -39,10 +39,11 @@ - // harfbuzz - #include <harfbuzz/hb.h> - #include <harfbuzz/hb-ft.h> -- -+#include <unicode/uvernum.h> - // icu - #include <unicode/uscript.h> - -+ - namespace mapnik - { - -@@ -55,7 +56,8 @@ - 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; diff --git a/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch b/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch deleted file mode 100644 index 0233eb4e3fdd..000000000000 --- a/sci-geosciences/mapnik/files/mapnik-3.0.9-unicode-upstream.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/mapnik/unicode.hpp 2017-10-31 17:53:23.507237672 +0100 -+++ b/include/mapnik/unicode.hpp 2017-10-31 17:53:47.096237053 +0100 -@@ -31,6 +31,8 @@ - // std - #include <cstdint> - #include <string> -+// icu -+#include <unicode/unistr.h> - - struct UConverter; - |