This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik.
commit 9e12d1d66c8d4c4eff9fced6470d9502db0eb186 Author: Bas Couwenberg <[email protected]> Date: Wed Nov 15 21:10:44 2017 +0100 Drop icu-59.patch, fixed upstream. --- debian/changelog | 1 + debian/patches/icu-59.patch | 33 --------------------------------- debian/patches/scons-3.0.patch | 16 ++++++++-------- debian/patches/series | 1 - 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 81845a1..6242503 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mapnik (3.0.16~rc1+ds-1) UNRELEASED; urgency=medium * New upstream release candidate. + * Drop icu-59.patch, fixed upstream. -- Bas Couwenberg <[email protected]> Wed, 15 Nov 2017 21:08:52 +0100 diff --git a/debian/patches/icu-59.patch b/debian/patches/icu-59.patch deleted file mode 100644 index e841bf2..0000000 --- a/debian/patches/icu-59.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Fix FTBFS with ICU 5.9.1. - Upstream fix is a little different, see: - . - https://github.com/mapnik/mapnik/commit/d3ec91b29b364681e393ff7910b883d7f22e2243 - https://github.com/mapnik/mapnik/commit/7f4adc2d73871d45dbedcc08b37154989599caed -Author: Matthias Klose <[email protected]> -Bug-Debian: https://bugs.debian.org/879835 -Forwarded: not-needed - ---- a/include/mapnik/text/harfbuzz_shaper.hpp -+++ b/include/mapnik/text/harfbuzz_shaper.hpp -@@ -55,11 +55,7 @@ static inline hb_script_t _icu_script_to - 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) - return reinterpret_cast<const uint16_t *>(src); --#else -- return src; --#endif - } - - struct harfbuzz_shaper ---- a/include/mapnik/value_types.hpp -+++ b/include/mapnik/value_types.hpp -@@ -23,6 +23,7 @@ - #ifndef MAPNIK_VALUE_TYPES_HPP - #define MAPNIK_VALUE_TYPES_HPP - -+#include <unicode/unistr.h> - // mapnik - #include <mapnik/config.hpp> - #include <mapnik/cxx11_support.hpp> diff --git a/debian/patches/scons-3.0.patch b/debian/patches/scons-3.0.patch index dc29b72..d27f1a5 100644 --- a/debian/patches/scons-3.0.patch +++ b/debian/patches/scons-3.0.patch @@ -4,7 +4,7 @@ Forwarded: https://github.com/mapnik/mapnik/pull/3774 --- a/SConstruct +++ b/SConstruct -@@ -142,15 +142,15 @@ def color_print(color,text,newline=True) +@@ -145,15 +145,15 @@ def color_print(color,text,newline=True) # 4 - blue text = "\033[9%sm%s\033[0m" % (color,text) if not newline: @@ -24,7 +24,7 @@ Forwarded: https://github.com/mapnik/mapnik/pull/3774 def call(cmd, silent=False): stdin, stderr = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE).communicate() -@@ -503,7 +503,7 @@ elif HELP_REQUESTED: +@@ -509,7 +509,7 @@ elif HELP_REQUESTED: # https://github.com/mapnik/mapnik/issues/2112 if not os.path.exists(SCONS_LOCAL_LOG) and not os.path.exists(SCONS_CONFIGURE_CACHE) \ and ('-c' in command_line_args or '--clean' in command_line_args): @@ -33,7 +33,7 @@ Forwarded: https://github.com/mapnik/mapnik/pull/3774 Exit(0) # initially populate environment with defaults and any possible custom arguments -@@ -528,7 +528,7 @@ if not force_configure: +@@ -534,7 +534,7 @@ if not force_configure: # rebuilds, e.g. for folks following trunk for opt in pickle_store: if not opt in env: @@ -42,7 +42,7 @@ Forwarded: https://github.com/mapnik/mapnik/pull/3774 preconfigured = False # if custom arguments are supplied make sure to accept them -@@ -616,7 +616,7 @@ def parse_config(context, config, checks +@@ -622,7 +622,7 @@ def parse_config(context, config, checks parsed = True except OSError, e: ret = False @@ -51,7 +51,7 @@ Forwarded: https://github.com/mapnik/mapnik/pull/3774 if not parsed: if config in ('GDAL_CONFIG'): # optional deps... -@@ -652,7 +652,7 @@ def get_pkg_lib(context, config, lib): +@@ -658,7 +658,7 @@ def get_pkg_lib(context, config, lib): libname = 'gdal' except Exception, e: ret = False @@ -60,7 +60,7 @@ Forwarded: https://github.com/mapnik/mapnik/pull/3774 return None context.Result( libname ) return libname -@@ -1115,7 +1115,7 @@ if not preconfigured: +@@ -1235,7 +1235,7 @@ if not preconfigured: opts.files.append(conf) color_print(4,"SCons CONFIG found: '%s', variables will be inherited..." % conf) optfile = file(conf) @@ -69,7 +69,7 @@ Forwarded: https://github.com/mapnik/mapnik/pull/3774 optfile.close() elif not conf == SCONS_LOCAL_CONFIG: -@@ -1636,7 +1636,7 @@ if not preconfigured: +@@ -1785,7 +1785,7 @@ if not preconfigured: env['HAS_CAIRO'] = False env['SKIPPED_DEPS'].append('cairo') else: @@ -78,7 +78,7 @@ Forwarded: https://github.com/mapnik/mapnik/pull/3774 cmd = 'pkg-config --libs --cflags cairo' if env['RUNTIME_LINK'] == 'static': cmd += ' --static' -@@ -1653,7 +1653,7 @@ if not preconfigured: +@@ -1802,7 +1802,7 @@ if not preconfigured: if not inc in env['CPPPATH']: env["CAIRO_CPPPATHS"].append(inc) env['HAS_CAIRO'] = True diff --git a/debian/patches/series b/debian/patches/series index f35a2f6..e1e916a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ scons-3.0.patch -icu-59.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
