Date: Monday, July 8, 2013 @ 15:03:09
Author: spupykin
Revision: 93689
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
mapnik/repos/community-staging-i686/
mapnik/repos/community-staging-i686/PKGBUILD
(from rev 93688, mapnik/trunk/PKGBUILD)
mapnik/repos/community-staging-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(from rev 93688, mapnik/trunk/mapnik-2.1.0-compile-fix-for-boost-1.53.patch)
mapnik/repos/community-staging-i686/mapnik.install
(from rev 93688, mapnik/trunk/mapnik.install)
mapnik/repos/community-staging-x86_64/
mapnik/repos/community-staging-x86_64/PKGBUILD
(from rev 93688, mapnik/trunk/PKGBUILD)
mapnik/repos/community-staging-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(from rev 93688, mapnik/trunk/mapnik-2.1.0-compile-fix-for-boost-1.53.patch)
mapnik/repos/community-staging-x86_64/mapnik.install
(from rev 93688, mapnik/trunk/mapnik.install)
------------------------------------------------------------------------+
community-staging-i686/PKGBUILD | 46
++++++++++
community-staging-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch | 36
+++++++
community-staging-i686/mapnik.install | 11
++
community-staging-x86_64/PKGBUILD | 46
++++++++++
community-staging-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch | 36
+++++++
community-staging-x86_64/mapnik.install | 11
++
6 files changed, 186 insertions(+)
Copied: mapnik/repos/community-staging-i686/PKGBUILD (from rev 93688,
mapnik/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-07-08 13:03:09 UTC (rev 93689)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: David Dent <thewi...@gmail.com>
+# Contributor: orbisvicis <orbisvi...@gmail.com>
+
+pkgname=mapnik
+pkgver=2.2.0
+pkgrel=3
+pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is
about rendering beautiful maps"
+arch=('i686' 'x86_64')
+url="http://mapnik.org/";
+license=('LGPL')
+depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
+ 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
+ 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl')
+optdepends=('libxslt: Web Map Service'
+ 'python2-lxml: Web Map Service'
+ 'python-imaging: Web Map Service'
+ 'python-nose: Web Map Service'
+ 'apache: Web Map Service'
+ 'mod_fastcgi: Web Map Service - or:'
+ 'mod_fcgid: Web Map Service - or:'
+ 'mod_wsgi2: Web Map Service')
+makedepends=('scons' 'boost')
+install="mapnik.install"
+source=("https://github.com/mapnik/mapnik/archive/v$pkgver.tar.gz";)
+md5sums=('b837931c7f1a4dc630d8550d3e635036')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ sed -i 's|lib64|lib|g' SConstruct
+ sed -i 's|python|python2|' \
+ utils/performance/mapnik-speed-check \
+ utils/upgrade_map_xml/*.py
+ scons configure \
+ PREFIX="/usr" \
+ INPUT_PLUGINS=all \
+ DESTDIR="$pkgdir"
+ scons $MAKEFLAGS
+}
+
+package(){
+ cd "$srcdir/$pkgname-$pkgver"
+ scons install
+}
Copied:
mapnik/repos/community-staging-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(from rev 93688, mapnik/trunk/mapnik-2.1.0-compile-fix-for-boost-1.53.patch)
===================================================================
--- community-staging-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(rev 0)
+++ community-staging-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
2013-07-08 13:03:09 UTC (rev 93689)
@@ -0,0 +1,36 @@
+From cf70b9959a45b9ab6af4a34824a5e4e80ce1d05c Mon Sep 17 00:00:00 2001
+From: Dane Springmeyer <d...@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
+
Copied: mapnik/repos/community-staging-i686/mapnik.install (from rev 93688,
mapnik/trunk/mapnik.install)
===================================================================
--- community-staging-i686/mapnik.install (rev 0)
+++ community-staging-i686/mapnik.install 2013-07-08 13:03:09 UTC (rev
93689)
@@ -0,0 +1,11 @@
+post_install() {
+ /sbin/ldconfig
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: mapnik/repos/community-staging-x86_64/PKGBUILD (from rev 93688,
mapnik/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-07-08 13:03:09 UTC (rev 93689)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: David Dent <thewi...@gmail.com>
+# Contributor: orbisvicis <orbisvi...@gmail.com>
+
+pkgname=mapnik
+pkgver=2.2.0
+pkgrel=3
+pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is
about rendering beautiful maps"
+arch=('i686' 'x86_64')
+url="http://mapnik.org/";
+license=('LGPL')
+depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
+ 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
+ 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl')
+optdepends=('libxslt: Web Map Service'
+ 'python2-lxml: Web Map Service'
+ 'python-imaging: Web Map Service'
+ 'python-nose: Web Map Service'
+ 'apache: Web Map Service'
+ 'mod_fastcgi: Web Map Service - or:'
+ 'mod_fcgid: Web Map Service - or:'
+ 'mod_wsgi2: Web Map Service')
+makedepends=('scons' 'boost')
+install="mapnik.install"
+source=("https://github.com/mapnik/mapnik/archive/v$pkgver.tar.gz";)
+md5sums=('b837931c7f1a4dc630d8550d3e635036')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ sed -i 's|lib64|lib|g' SConstruct
+ sed -i 's|python|python2|' \
+ utils/performance/mapnik-speed-check \
+ utils/upgrade_map_xml/*.py
+ scons configure \
+ PREFIX="/usr" \
+ INPUT_PLUGINS=all \
+ DESTDIR="$pkgdir"
+ scons $MAKEFLAGS
+}
+
+package(){
+ cd "$srcdir/$pkgname-$pkgver"
+ scons install
+}
Copied:
mapnik/repos/community-staging-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(from rev 93688, mapnik/trunk/mapnik-2.1.0-compile-fix-for-boost-1.53.patch)
===================================================================
--- community-staging-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(rev 0)
+++ community-staging-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
2013-07-08 13:03:09 UTC (rev 93689)
@@ -0,0 +1,36 @@
+From cf70b9959a45b9ab6af4a34824a5e4e80ce1d05c Mon Sep 17 00:00:00 2001
+From: Dane Springmeyer <d...@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
+
Copied: mapnik/repos/community-staging-x86_64/mapnik.install (from rev 93688,
mapnik/trunk/mapnik.install)
===================================================================
--- community-staging-x86_64/mapnik.install (rev 0)
+++ community-staging-x86_64/mapnik.install 2013-07-08 13:03:09 UTC (rev
93689)
@@ -0,0 +1,11 @@
+post_install() {
+ /sbin/ldconfig
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
