summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFritzOnFire2017-09-28 17:05:47 +0200
committerFritzOnFire2017-09-28 17:05:47 +0200
commit64c113f4b98b1b18b43884e8e30d95f92a4bb1ed (patch)
tree7dd9460d547a0a4be33c73e6dd4034c543aae723
parent2c27a8e72af6a100aca556a42f376601b9f81660 (diff)
downloadaur-64c113f4b98b1b18b43884e8e30d95f92a4bb1ed.tar.gz
Fixed pycairo, boost-libs version, compiling error
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD21
2 files changed, 17 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8edb9c37b3d5..840f139dfda7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mapnik-git
pkgdesc = Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps (git version)
- pkgver = 3.0.0.rc1.105.g569a539
+ pkgver = 3.0.12.645.g377253bcc
pkgrel = 1
url = http://mapnik.org/
install = mapnik.install
@@ -10,7 +10,7 @@ pkgbase = mapnik-git
makedepends = scons
makedepends = boost
makedepends = git
- depends = boost-libs
+ depends = boost-libs<=1.64.0
depends = icu
depends = libpng
depends = libjpeg
@@ -21,7 +21,7 @@ pkgbase = mapnik-git
depends = proj
depends = cairo
depends = cairomm
- depends = pycairo
+ depends = python-cairo
depends = postgresql-libs
depends = postgis
depends = gdal
@@ -36,7 +36,7 @@ pkgbase = mapnik-git
optdepends = mod_fastcgi: Web Map Service - or:
optdepends = mod_fcgid: Web Map Service - or:
optdepends = mod_wsgi2: Web Map Service
- provides = mapnik=3.0.0
+ provides = mapnik=3.0.12
conflicts = mapnik
options = staticlibs
source = git://github.com/mapnik/mapnik.git
diff --git a/PKGBUILD b/PKGBUILD
index 9effdbff0e53..587ab8a92e77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,18 @@
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: David Dent <thewinch@gmail.com>
# Contributor: orbisvicis <orbisvicis@gmail.com>
+# Contributor: Fritz Engelbrecht <fritz.engl+arch@gmail.com>
pkgname=mapnik-git
_pkgname=mapnik
-pkgver=3.0.0.rc1.105.g569a539
+pkgver=3.0.12.645.g377253bcc
pkgrel=1
pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps (git version)"
arch=('i686' 'x86_64')
url="http://mapnik.org/"
license=('LGPL')
depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
- 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
+ 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'python-cairo'
'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl' 'libwebp')
optdepends=('libxslt: Web Map Service'
'python2-lxml: Web Map Service'
@@ -25,7 +26,7 @@ optdepends=('libxslt: Web Map Service'
'mod_wsgi2: Web Map Service')
makedepends=('scons' 'boost' 'git')
conflicts=('mapnik')
-provides=('mapnik=3.0.0')
+provides=('mapnik=3.0.12')
options=(staticlibs)
install="mapnik.install"
source=("git://github.com/mapnik/mapnik.git")
@@ -37,13 +38,17 @@ pkgver() {
git describe --long | cut -c2- | sed 's/-/./g'
}
+prepare() {
+ cd "$srcdir/$_pkgname"
+
+ git submodule update --init deps/mapbox/geometry
+ git submodule update --init deps/mapbox/protozero
+ git submodule update --init deps/mapbox/variant
+}
+
build() {
cd "$srcdir/$_pkgname"
- 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 \
@@ -53,5 +58,5 @@ build() {
package(){
cd "$srcdir/$_pkgname"
- scons install
+ make PYTHON=python2 DESTDIR="$pkgdir" install
}