summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
2 files changed, 11 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ac6cb8845c0e..055d2b39db5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
pkgbase = mapnik-git
pkgdesc = Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps (git version)
pkgver = 4.0.0.r13808.g2e1b325
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/mapnik/mapnik
arch = i686
arch = x86_64
- license = LGPL2.1
+ license = LGPL-2.1-or-later
makedepends = boost
makedepends = cmake
makedepends = git
makedepends = mapbox-geometry.hpp
makedepends = mapbox-polylabel
makedepends = mapbox-variant
+ makedepends = protozero
makedepends = sparsehash
depends = boost-libs
depends = cairo
@@ -26,7 +27,6 @@ pkgbase = mapnik-git
depends = libxml2
depends = postgresql-libs
depends = proj
- depends = protozero
depends = python
depends = sqlite
depends = ttf-dejavu
diff --git a/PKGBUILD b/PKGBUILD
index dba467c80e4f..79ecf18414fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,11 +7,11 @@
pkgname=mapnik-git
pkgver=4.0.0.r13808.g2e1b325
-pkgrel=4
+pkgrel=5
pkgdesc='Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps (git version)'
arch=('i686' 'x86_64')
url='https://github.com/mapnik/mapnik'
-license=('LGPL2.1')
+license=('LGPL-2.1-or-later')
depends=('boost-libs'
'cairo'
'freetype2'
@@ -25,7 +25,6 @@ depends=('boost-libs'
'libxml2'
'postgresql-libs'
'proj'
- 'protozero'
'python'
'sqlite'
'ttf-dejavu')
@@ -35,6 +34,7 @@ makedepends=('boost'
'mapbox-geometry.hpp'
'mapbox-polylabel'
'mapbox-variant'
+ 'protozero'
'sparsehash')
conflicts=('mapnik')
provides=('mapnik')
@@ -85,13 +85,17 @@ check() {
package(){
# Remove bundled dejavu fonts from cmake_install.cmake in favor of 'ttf-dejavu' package
- sed -i '/dejavu-fonts-ttf-2.37/d' "$srcdir"/mapnik_build/cmake_install.cmake
+ sed -i '/dejavu-fonts-ttf/d' "$srcdir"/mapnik_build/cmake_install.cmake
# Remove bundled sparsehash directory in favor of 'sparsehash' package
rm -rf "$srcdir"/mapnik/deps/mapnik/sparsehash
+ # Install to #DESTDIR
DESTDIR="$pkgdir" cmake --install mapnik_build --strip
+ # Remove usr/share/fonts directory
+ rm -rf "$pkgdir"/usr/share/fonts
+
# License
install -Dm644 "$srcdir"/mapnik/COPYING "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
}