Date: Sunday, March 31, 2013 @ 21:18:26
Author: stephane
Revision: 87421
db-move: moved mapnik from [community-testing] to [community] (i686, x86_64)
Added:
mapnik/repos/community-i686/PKGBUILD
(from rev 87401, mapnik/repos/community-testing-i686/PKGBUILD)
mapnik/repos/community-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(from rev 87401,
mapnik/repos/community-testing-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch)
mapnik/repos/community-i686/mapnik.install
(from rev 87401, mapnik/repos/community-testing-i686/mapnik.install)
mapnik/repos/community-x86_64/PKGBUILD
(from rev 87401, mapnik/repos/community-testing-x86_64/PKGBUILD)
mapnik/repos/community-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(from rev 87401,
mapnik/repos/community-testing-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch)
mapnik/repos/community-x86_64/mapnik.install
(from rev 87401, mapnik/repos/community-testing-x86_64/mapnik.install)
Deleted:
mapnik/repos/community-i686/PKGBUILD
mapnik/repos/community-i686/mapnik.install
mapnik/repos/community-testing-i686/
mapnik/repos/community-testing-x86_64/
mapnik/repos/community-x86_64/PKGBUILD
mapnik/repos/community-x86_64/mapnik.install
----------------------------------------------------------------+
/PKGBUILD | 102
++++++++++
/mapnik.install | 22 ++
community-i686/PKGBUILD | 45 ----
community-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch | 36 +++
community-i686/mapnik.install | 11 -
community-x86_64/PKGBUILD | 45 ----
community-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch | 36 +++
community-x86_64/mapnik.install | 11 -
8 files changed, 196 insertions(+), 112 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-03-31 19:18:25 UTC (rev 87420)
+++ community-i686/PKGBUILD 2013-03-31 19:18:26 UTC (rev 87421)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: David Dent <thewi...@gmail.com>
-# Contributor: orbisvicis <orbisvi...@gmail.com>
-
-pkgname=mapnik
-pkgver=2.1.0
-pkgrel=8
-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/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2";)
-md5sums=('d580c558a957444873bec9e24526b0a0')
-
-build() {
- cd "$srcdir/$pkgname-v$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
-}
-
-package(){
- cd "$srcdir/$pkgname-v$pkgver"
- scons install
-}
Copied: mapnik/repos/community-i686/PKGBUILD (from rev 87401,
mapnik/repos/community-testing-i686/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-03-31 19:18:26 UTC (rev 87421)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: David Dent <thewi...@gmail.com>
+# Contributor: orbisvicis <orbisvi...@gmail.com>
+
+pkgname=mapnik
+pkgver=2.1.0
+pkgrel=9
+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/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 \
+ utils/upgrade_map_xml/*.py
+ scons configure \
+ PREFIX="/usr" \
+ INPUT_PLUGINS=all \
+ DESTDIR="$pkgdir"
+ scons $MAKEFLAGS
+}
+
+package(){
+ cd "$srcdir/$pkgname-v$pkgver"
+ scons install
+}
Copied:
mapnik/repos/community-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch (from
rev 87401,
mapnik/repos/community-testing-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch)
===================================================================
--- community-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(rev 0)
+++ community-i686/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
2013-03-31 19:18:26 UTC (rev 87421)
@@ -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
+
Deleted: community-i686/mapnik.install
===================================================================
--- community-i686/mapnik.install 2013-03-31 19:18:25 UTC (rev 87420)
+++ community-i686/mapnik.install 2013-03-31 19:18:26 UTC (rev 87421)
@@ -1,11 +0,0 @@
-post_install() {
- /sbin/ldconfig
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mapnik/repos/community-i686/mapnik.install (from rev 87401,
mapnik/repos/community-testing-i686/mapnik.install)
===================================================================
--- community-i686/mapnik.install (rev 0)
+++ community-i686/mapnik.install 2013-03-31 19:18:26 UTC (rev 87421)
@@ -0,0 +1,11 @@
+post_install() {
+ /sbin/ldconfig
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-03-31 19:18:25 UTC (rev 87420)
+++ community-x86_64/PKGBUILD 2013-03-31 19:18:26 UTC (rev 87421)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: David Dent <thewi...@gmail.com>
-# Contributor: orbisvicis <orbisvi...@gmail.com>
-
-pkgname=mapnik
-pkgver=2.1.0
-pkgrel=8
-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/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2";)
-md5sums=('d580c558a957444873bec9e24526b0a0')
-
-build() {
- cd "$srcdir/$pkgname-v$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
-}
-
-package(){
- cd "$srcdir/$pkgname-v$pkgver"
- scons install
-}
Copied: mapnik/repos/community-x86_64/PKGBUILD (from rev 87401,
mapnik/repos/community-testing-x86_64/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-03-31 19:18:26 UTC (rev 87421)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: David Dent <thewi...@gmail.com>
+# Contributor: orbisvicis <orbisvi...@gmail.com>
+
+pkgname=mapnik
+pkgver=2.1.0
+pkgrel=9
+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/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 \
+ utils/upgrade_map_xml/*.py
+ scons configure \
+ PREFIX="/usr" \
+ INPUT_PLUGINS=all \
+ DESTDIR="$pkgdir"
+ scons $MAKEFLAGS
+}
+
+package(){
+ cd "$srcdir/$pkgname-v$pkgver"
+ scons install
+}
Copied:
mapnik/repos/community-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(from rev 87401,
mapnik/repos/community-testing-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch)
===================================================================
--- community-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
(rev 0)
+++ community-x86_64/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
2013-03-31 19:18:26 UTC (rev 87421)
@@ -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
+
Deleted: community-x86_64/mapnik.install
===================================================================
--- community-x86_64/mapnik.install 2013-03-31 19:18:25 UTC (rev 87420)
+++ community-x86_64/mapnik.install 2013-03-31 19:18:26 UTC (rev 87421)
@@ -1,11 +0,0 @@
-post_install() {
- /sbin/ldconfig
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mapnik/repos/community-x86_64/mapnik.install (from rev 87401,
mapnik/repos/community-testing-x86_64/mapnik.install)
===================================================================
--- community-x86_64/mapnik.install (rev 0)
+++ community-x86_64/mapnik.install 2013-03-31 19:18:26 UTC (rev 87421)
@@ -0,0 +1,11 @@
+post_install() {
+ /sbin/ldconfig
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
