Date: Monday, November 22, 2021 @ 09:47:03 Author: foutrelis Revision: 1054225
upgpkg: mapnik 3.1.0-6: icu 70.1 rebuild Added: mapnik/trunk/scons4.patch Modified: mapnik/trunk/PKGBUILD --------------+ PKGBUILD | 15 ++++++++++++--- scons4.patch | 11 +++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-11-22 09:14:26 UTC (rev 1054224) +++ PKGBUILD 2021-11-22 09:47:03 UTC (rev 1054225) @@ -5,7 +5,7 @@ pkgname=mapnik pkgver=3.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="Free Toolkit for developing mapping applications and rendering beautiful maps" arch=('x86_64') url="https://mapnik.org/" @@ -13,9 +13,18 @@ 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) -sha256sums=('43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261') +source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2 + scons4.patch) +sha256sums=('43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261' + '79a85ddba3ec17b86cb216e21442611498a9f2612f03e98708057b3c3a6e8b06') +prepare() { + cd "${srcdir}"/$pkgname-v$pkgver + + # Partial fix to build with SCons 4 (https://bugs.archlinux.org/task/71630) + patch -Np1 -i ../scons4.patch +} + build() { cd "${srcdir}"/$pkgname-v$pkgver scons configure FAST=True \ Added: scons4.patch =================================================================== --- scons4.patch (rev 0) +++ scons4.patch 2021-11-22 09:47:03 UTC (rev 1054225) @@ -0,0 +1,11 @@ +diff -upr mapnik-v3.1.0.orig/SConstruct mapnik-v3.1.0/SConstruct +--- mapnik-v3.1.0.orig/SConstruct 2021-01-08 13:23:24.000000000 +0200 ++++ mapnik-v3.1.0/SConstruct 2021-11-22 11:41:03.413991679 +0200 +@@ -126,7 +126,6 @@ PLUGINS = { # plugins with external depe + + def init_environment(env): + env.Decider('MD5-timestamp') +- env.SourceCode(".", None) + if os.environ.get('RANLIB'): + env['RANLIB'] = os.environ['RANLIB'] + if os.environ.get('AR'):