[arch-commits] Commit in mapnik/trunk (2 files)

[Sergej Pupykin]

    Date: Monday, September 1, 2014 @ 19:07:17
  Author: spupykin
Revision: 118152

upgpkg: mapnik 2.2.0-8

upd

Modified:
  mapnik/trunk/PKGBUILD
Deleted:
  mapnik/trunk/mapnik-2.1.0-compile-fix-for-boost-1.53.patch

-----------------------------------------------+
 PKGBUILD                                      |   14 +++++----
 mapnik-2.1.0-compile-fix-for-boost-1.53.patch |   36 ------------------------
 2 files changed, 8 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-01 17:02:42 UTC (rev 118151)
+++ PKGBUILD	2014-09-01 17:07:17 UTC (rev 118152)
@@ -5,7 +5,7 @@
 
 pkgname=mapnik
 pkgver=2.2.0
-pkgrel=7
+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/"
@@ -12,7 +12,7 @@
 license=('LGPL')
 depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
 	 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
-	 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl')
+	 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl' 'harfbuzz-icu')
 optdepends=('libxslt:         Web Map Service'
             'python2-lxml:    Web Map Service'
             'python2-pillow:  Web Map Service'
@@ -21,10 +21,11 @@
             'mod_fastcgi:     Web Map Service - or:'
             'mod_fcgid:       Web Map Service - or:'
             'mod_wsgi2:       Web Map Service')
-makedepends=('scons' 'boost')
+makedepends=('scons' 'boost' 'git')
 install="mapnik.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/mapnik/mapnik/archive/v$pkgver.tar.gz")
-md5sums=('b837931c7f1a4dc630d8550d3e635036')
+#source=("$pkgname-$pkgver.tar.gz::https://github.com/mapnik/mapnik/archive/v$pkgver.tar.gz")
+source=("$pkgname-$pkgver::git://github.com/mapnik/mapnik.git")
+md5sums=('SKIP')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -37,7 +38,8 @@
     PREFIX="/usr" \
     INPUT_PLUGINS=all \
     DESTDIR="$pkgdir"
-  scons $MAKEFLAGS
+#  scons $MAKEFLAGS
+  scons -j3
 }
 
 package(){

Deleted: mapnik-2.1.0-compile-fix-for-boost-1.53.patch
===================================================================
--- mapnik-2.1.0-compile-fix-for-boost-1.53.patch	2014-09-01 17:02:42 UTC (rev 118151)
+++ mapnik-2.1.0-compile-fix-for-boost-1.53.patch	2014-09-01 17:07:17 UTC (rev 118152)
@@ -1,36 +0,0 @@
-From cf70b9959a45b9ab6af4a34824a5e4e80ce1d05c Mon Sep 17 00:00:00 2001
-From: Dane Springmeyer <dane at 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
-