Date: Thursday, April 28, 2022 @ 20:00:45 Author: arojas Revision: 1191709
archrelease: copy trunk to community-x86_64 Added: mapnik/repos/community-x86_64/PKGBUILD (from rev 1191708, mapnik/trunk/PKGBUILD) mapnik/repos/community-x86_64/scons4.patch (from rev 1191708, mapnik/trunk/scons4.patch) Deleted: mapnik/repos/community-x86_64/PKGBUILD mapnik/repos/community-x86_64/scons4.patch --------------+ PKGBUILD | 88 ++++++++++++++++++++++++++++----------------------------- scons4.patch | 22 +++++++------- 2 files changed, 55 insertions(+), 55 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-04-28 20:00:32 UTC (rev 1191708) +++ PKGBUILD 2022-04-28 20:00:45 UTC (rev 1191709) @@ -1,44 +0,0 @@ -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: David Dent <thewi...@gmail.com> -# Contributor: orbisvicis <orbisvi...@gmail.com> - -pkgname=mapnik -pkgver=3.1.0 -pkgrel=9 -pkgdesc="Free Toolkit for developing mapping applications and rendering beautiful maps" -arch=('x86_64') -url="https://mapnik.org/" -license=('LGPL') -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 - 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 \ - PREFIX="/usr" \ - INPUT_PLUGINS=all \ - XMLPARSER=libxml2 \ - DESTDIR="$pkgdir" \ - CUSTOM_CXXFLAGS="$CXXFLAGS" \ - CUSTOM_LDFLAGS="$LDFLAGS" \ - CUSTOM_DEFINES="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" - scons $(expr "$MAKEFLAGS" : '.*\(\-j[0-9]\+\)') -} - -package(){ - cd "${srcdir}"/$pkgname-v$pkgver - scons install -} Copied: mapnik/repos/community-x86_64/PKGBUILD (from rev 1191708, mapnik/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-04-28 20:00:45 UTC (rev 1191709) @@ -0,0 +1,44 @@ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: David Dent <thewi...@gmail.com> +# Contributor: orbisvicis <orbisvi...@gmail.com> + +pkgname=mapnik +pkgver=3.1.0 +pkgrel=10 +pkgdesc="Free Toolkit for developing mapping applications and rendering beautiful maps" +arch=('x86_64') +url="https://mapnik.org/" +license=('LGPL') +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 + 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 \ + PREFIX="/usr" \ + INPUT_PLUGINS=all \ + XMLPARSER=libxml2 \ + DESTDIR="$pkgdir" \ + CUSTOM_CXXFLAGS="$CXXFLAGS -ffat-lto-objects" \ + CUSTOM_LDFLAGS="$LDFLAGS" \ + CUSTOM_DEFINES="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" + scons $(expr "$MAKEFLAGS" : '.*\(\-j[0-9]\+\)') +} + +package(){ + cd "${srcdir}"/$pkgname-v$pkgver + scons install +} Deleted: scons4.patch =================================================================== --- scons4.patch 2022-04-28 20:00:32 UTC (rev 1191708) +++ scons4.patch 2022-04-28 20:00:45 UTC (rev 1191709) @@ -1,11 +0,0 @@ -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'): Copied: mapnik/repos/community-x86_64/scons4.patch (from rev 1191708, mapnik/trunk/scons4.patch) =================================================================== --- scons4.patch (rev 0) +++ scons4.patch 2022-04-28 20:00:45 UTC (rev 1191709) @@ -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'):