diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-01 09:30:54 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-01 09:30:54 +0200 |
| commit | de07e6523dc20f8974ff7252fa3cd85889edcd31 (patch) | |
| tree | 68fbecb38319faa111bf4ada3bc10deb2c426d09 /community/mapnik | |
| parent | e1e2e8d3cae181f786ecc988e86152a99ad882a8 (diff) | |
| parent | c623429f33c434cb1cb11974d9e71f48dd5a881f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/picard/PKGBUILD
community/python2-tagpy/PKGBUILD
community/sigil/PKGBUILD
extra/avogadro/PKGBUILD
extra/barcode/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/vigra/PKGBUILD
Diffstat (limited to 'community/mapnik')
| -rw-r--r-- | community/mapnik/PKGBUILD | 16 | ||||
| -rw-r--r-- | community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch | 36 |
2 files changed, 47 insertions, 5 deletions
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index f88963df0..2d1d0983e 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87049 2013-03-26 11:49:43Z foutrelis $ +# $Id: PKGBUILD 87421 2013-03-31 19:18:26Z stephane $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=2.1.0 -pkgrel=8 +pkgrel=9 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" @@ -23,11 +23,17 @@ optdepends=('libxslt: Web Map Service' 'mod_wsgi2: Web Map Service') makedepends=('scons' 'boost') install="mapnik.install" -source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2") -md5sums=('d580c558a957444873bec9e24526b0a0') +source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2" + "mapnik-2.1.0-compile-fix-for-boost-1.53.patch") +md5sums=('d580c558a957444873bec9e24526b0a0' + 'fb456216b052742319428f65f1c979d6') build() { cd "$srcdir/$pkgname-v$pkgver" + + # https://github.com/mapnik/mapnik/issues/1658 + patch -Np1 -i "$srcdir/mapnik-2.1.0-compile-fix-for-boost-1.53.patch" + sed -i 's|lib64|lib|g' SConstruct sed -i 's|python|python2|' \ utils/performance/mapnik-speed-check \ @@ -36,7 +42,7 @@ build() { PREFIX="/usr" \ INPUT_PLUGINS=all \ DESTDIR="$pkgdir" - scons + scons $MAKEFLAGS } package(){ diff --git a/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch b/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch new file mode 100644 index 000000000..00b37c08f --- /dev/null +++ b/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch @@ -0,0 +1,36 @@ +From cf70b9959a45b9ab6af4a34824a5e4e80ce1d05c Mon Sep 17 00:00:00 2001 +From: Dane Springmeyer <dane@dbsgeo.com> +Date: Sun, 10 Feb 2013 07:24:35 -0800 +Subject: [PATCH] fix compile of json feature_collection grammar when building + against >= boost 1.52 - refs #1658 and #1716 + +--- + src/json/feature_collection_parser.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/json/feature_collection_parser.cpp b/src/json/feature_collection_parser.cpp +index 3faeda7..51ad824 100644 +--- a/src/json/feature_collection_parser.cpp ++++ b/src/json/feature_collection_parser.cpp +@@ -20,12 +20,17 @@ + * + *****************************************************************************/ + ++// TODO https://github.com/mapnik/mapnik/issues/1658 ++#include <boost/version.hpp> ++#if BOOST_VERSION >= 105200 ++#define BOOST_SPIRIT_USE_PHOENIX_V3 ++#endif ++ + // mapnik + #include <mapnik/json/feature_collection_parser.hpp> + #include <mapnik/json/feature_collection_grammar.hpp> + + // boost +-#include <boost/version.hpp> + #include <boost/spirit/include/qi.hpp> + #include <boost/spirit/include/support_multi_pass.hpp> + +-- +1.8.1.5 + |