Date: Sunday, January 10, 2021 @ 20:54:27 Author: jlichtblau Revision: 817452
upgpkg: mapnik 3.1.0-1 - new upstream release Modified: mapnik/trunk/PKGBUILD Deleted: mapnik/trunk/mapnik-std-c++14.patch ------------------------+ PKGBUILD | 15 +------ mapnik-std-c++14.patch | 89 ----------------------------------------------- 2 files changed, 3 insertions(+), 101 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-01-10 20:35:43 UTC (rev 817451) +++ PKGBUILD 2021-01-10 20:54:27 UTC (rev 817452) @@ -4,7 +4,7 @@ # Contributor: orbisvicis <[email protected]> pkgname=mapnik -pkgver=3.0.24 +pkgver=3.1.0 pkgrel=1 pkgdesc="Free Toolkit for developing mapping applications and rendering beautiful maps" arch=('x86_64') @@ -13,18 +13,9 @@ depends=('boost-libs' 'cairo' 'freetype2' 'gdal' 'harfbuzz' 'icu' 'libjpeg-turbo' 'libpng' 'libtiff' 'libwebp' 'libxml2' 'postgresql-libs' 'proj' 'sqlite' 'zlib') makedepends=('boost' 'scons') -source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2 - mapnik-std-c++14.patch) -sha256sums=('75520a98ff688f48e4dd36e86199530ea084b296f2d4972478db1fcb3475d71c' - '89b6f6be54feca2ba120516a39e20d3ae9706b7fbde140d73538f2727ab31fbe') +source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2) +sha256sums=('43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261') -prepare() { - cd "${srcdir}"/$pkgname-v$pkgver - - # C++14 mode required by Boost.Geometry 1.75 - patch -Np1 -i ../mapnik-std-c++14.patch -} - build() { cd "${srcdir}"/$pkgname-v$pkgver scons configure FAST=True \ Deleted: mapnik-std-c++14.patch =================================================================== --- mapnik-std-c++14.patch 2021-01-10 20:35:43 UTC (rev 817451) +++ mapnik-std-c++14.patch 2021-01-10 20:54:27 UTC (rev 817452) @@ -1,89 +0,0 @@ -From 3b184fb55efbf36511c7bb453a284b1c1afdd595 Mon Sep 17 00:00:00 2001 -From: artemp <[email protected]> -Date: Thu, 8 Dec 2016 10:43:25 +0100 -Subject: [PATCH] SConstruct - require c++14 - -(cherry picked from commit 1372ca48ef841e548241552671831ac1736e91e6) ---- - SConstruct | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 960c9087e..f47f268a6 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -42,8 +42,8 @@ ICU_LIBS_DEFAULT='/usr/' - - DEFAULT_CC = "cc" - DEFAULT_CXX = "c++" --DEFAULT_CXX11_CXXFLAGS = " -std=c++11 -DU_USING_ICU_NAMESPACE=0" --DEFAULT_CXX11_LINKFLAGS = "" -+DEFAULT_CXX14_CXXFLAGS = " -std=c++14 -DU_USING_ICU_NAMESPACE=0" -+DEFAULT_CXX14_LINKFLAGS = "" - if sys.platform == 'darwin': - # homebrew default - ICU_INCLUDES_DEFAULT='/usr/local/opt/icu4c/include/' -@@ -1168,12 +1168,12 @@ int main() - return True - return False - --def supports_cxx11(context,silent=False): -+def supports_cxx14(context,silent=False): - ret = context.TryRun(""" - - int main() - { --#if __cplusplus >= 201103 -+#if __cplusplus >= 201402L - return 0; - #else - return -1; -@@ -1182,7 +1182,7 @@ int main() - - """, '.cpp') - if not silent: -- context.Message('Checking if compiler (%s) supports -std=c++11 flag... ' % context.env.get('CXX','CXX')) -+ context.Message('Checking if compiler (%s) supports -std=c++14 flag... ' % context.env.get('CXX','CXX')) - if silent: - context.did_show_result=1 - context.Result(ret[0]) -@@ -1214,7 +1214,7 @@ conf_tests = { 'prioritize_paths' : prioritize_paths, - 'harfbuzz_with_freetype_support': harfbuzz_with_freetype_support, - 'boost_regex_has_icu' : boost_regex_has_icu, - 'sqlite_has_rtree' : sqlite_has_rtree, -- 'supports_cxx11' : supports_cxx11, -+ 'supports_cxx14' : supports_cxx14, - 'CheckBoostScopedEnum' : CheckBoostScopedEnum, - } - -@@ -1351,13 +1351,13 @@ if not preconfigured: - - # set any custom cxxflags and ldflags to come first - if sys.platform == 'darwin' and not env['HOST']: -- DEFAULT_CXX11_CXXFLAGS += ' -stdlib=libc++' -- DEFAULT_CXX11_LINKFLAGS = ' -stdlib=libc++' -+ DEFAULT_CXX14_CXXFLAGS += ' -stdlib=libc++' -+ DEFAULT_CXX14_LINKFLAGS = ' -stdlib=libc++' - env.Append(CPPDEFINES = env['CUSTOM_DEFINES']) -- env.Append(CXXFLAGS = DEFAULT_CXX11_CXXFLAGS) -+ env.Append(CXXFLAGS = DEFAULT_CXX14_CXXFLAGS) - env.Append(CXXFLAGS = env['CUSTOM_CXXFLAGS']) - env.Append(CFLAGS = env['CUSTOM_CFLAGS']) -- env.Append(LINKFLAGS = DEFAULT_CXX11_LINKFLAGS) -+ env.Append(LINKFLAGS = DEFAULT_CXX14_LINKFLAGS) - env.Append(LINKFLAGS = env['CUSTOM_LDFLAGS']) - - ### platform specific bits -@@ -1488,9 +1488,9 @@ if not preconfigured: - if env['PRIORITIZE_LINKING']: - conf.prioritize_paths(silent=True) - -- # test for C++11 support, which is required -- if not env['HOST'] and not conf.supports_cxx11(): -- color_print(1,"C++ compiler does not support C++11 standard (-std=c++11), which is required. Please upgrade your compiler") -+ # test for C++14 support, which is required -+ if not env['HOST'] and not conf.supports_cxx14(): -+ color_print(1,"C++ compiler does not support C++14 standard (-std=c++14), which is required. Please upgrade your compiler") - Exit(1) - - if not env['HOST']:
