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

[Evangelos Foutras]

    Date: Friday, September 5, 2014 @ 15:24:27
  Author: foutrelis
Revision: 118343

upgpkg: mapnik 2.2.0.605.g648dea6-1

Switch to 2.3.x branch to allow gpsdrive to build.

Modified:
  mapnik/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-05 13:22:46 UTC (rev 118342)
+++ PKGBUILD	2014-09-05 13:24:27 UTC (rev 118343)
@@ -4,8 +4,8 @@
 # Contributor: orbisvicis <orbisvicis at gmail.com>
 
 pkgname=mapnik
-pkgver=2.2.0
-pkgrel=8
+pkgver=2.2.0.605.g648dea6
+pkgrel=1
 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' 'harfbuzz-icu')
+	 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl')
 optdepends=('libxslt:         Web Map Service'
             'python2-lxml:    Web Map Service'
             'python2-pillow:  Web Map Service'
@@ -24,11 +24,17 @@
 makedepends=('scons' 'boost' 'git')
 install="mapnik.install"
 #source=("$pkgname-$pkgver.tar.gz::https://github.com/mapnik/mapnik/archive/v$pkgver.tar.gz")
-source=("$pkgname-$pkgver::git://github.com/mapnik/mapnik.git")
+source=("git://github.com/mapnik/mapnik.git#branch=2.3.x")
 md5sums=('SKIP')
 
+pkgver() {
+  cd "$srcdir/$pkgname"
+
+  git describe --long | cut -c2- | sed 's/-/./g'
+}
+
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
 
   sed -i 's|lib64|lib|g' SConstruct
   sed -i 's|python|python2|' \
@@ -38,11 +44,10 @@
     PREFIX="/usr" \
     INPUT_PLUGINS=all \
     DESTDIR="$pkgdir"
-#  scons $MAKEFLAGS
-  scons -j3
+  scons $MAKEFLAGS
 }
 
 package(){
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
   scons install
 }