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

[Balló György]

    Date: Thursday, August 29, 2019 @ 08:59:26
  Author: bgyorgy
Revision: 504689

upgpkg: mapnik 3.0.22-2

Re-enable proj support (FS#63253), remove unused dependencies

Modified:
  mapnik/trunk/PKGBUILD
Deleted:
  mapnik/trunk/mapnik.install

----------------+
 PKGBUILD       |   32 +++++++++++---------------------
 mapnik.install |   11 -----------
 2 files changed, 11 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-29 08:59:22 UTC (rev 504688)
+++ PKGBUILD	2019-08-29 08:59:26 UTC (rev 504689)
@@ -5,40 +5,29 @@
 
 pkgname=mapnik
 pkgver=3.0.22
-pkgrel=1
+pkgrel=2
 pkgdesc="Free Toolkit for developing mapping applications and rendering beautiful maps"
 arch=('x86_64')
 url="https://mapnik.org/"
 license=('LGPL')
-depends=('boost-libs' 'icu' 'libpng' 'libjpeg-turbo' 'libtiff' 'freetype2'
-         'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'python2-cairo'
-         'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool' 'libwebp')
-makedepends=('scons' 'boost' 'git' 'patch')
-optdepends=('libxslt:         Web Map Service'
-            'python2-lxml:    Web Map Service'
-            'python2-pillow:  Web Map Service'
-            'python-nose:     Web Map Service'
-            'apache:          Web Map Service'
-            'mod_fcgid:       Web Map Service - or:'
-            'mod_wsgi2:       Web Map Service')
-install=$pkgname.install
+depends=('boost-libs' 'cairo' 'freetype2' 'gdal' 'harfbuzz' 'icu' 'libjpeg-turbo' 'libpng'
+         'libtiff' 'libwebp' 'libxml2' 'postgresql-libs' 'proj' 'sqlite' 'zlib')
+makedepends=('boost' 'scons')
 source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2
-        https://github.com/mapnik/mapnik/pull/3892.patch)
+        mapnik-freetype2.patch::https://github.com/mapnik/mapnik/pull/3892.patch)
 sha256sums=('930612ad9e604b6a29b9cea1bc1de85cf7cf2b2b8211f57ec8b6b94463128ab9'
             '774a8590b698e9dc2a483e6ff48781ed0400ba06b901f12a1ed50c9114833d47')
 
 prepare() {
   cd "${srcdir}"/$pkgname-v$pkgver
-  patch -Np1 -i "${srcdir}"/3892.patch
+
+  # Use pkg-config to find FreeType2 if available
+  # https://github.com/mapnik/mapnik/pull/3892
+  patch -Np1 -i "${srcdir}"/mapnik-freetype2.patch
 }
 
 build() {
   cd "${srcdir}"/$pkgname-v$pkgver
-
-  # http://site.icu-project.org/download/61#TOC-Migration-Issues
-  CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
-
-  PYTHON=python2
   scons configure  FAST=True \
     PREFIX="/usr" \
     INPUT_PLUGINS=all \
@@ -45,7 +34,8 @@
     XMLPARSER=libxml2 \
     DESTDIR="$pkgdir" \
     CUSTOM_CXXFLAGS="$CXXFLAGS" \
-    CUSTOM_LDFLAGS="$LDFLAGS"
+    CUSTOM_LDFLAGS="$LDFLAGS" \
+    CUSTOM_DEFINES="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
   scons $(expr "$MAKEFLAGS" : '.*\(\-j[0-9]\+\)')
 }
 

Deleted: mapnik.install
===================================================================
--- mapnik.install	2019-08-29 08:59:22 UTC (rev 504688)
+++ mapnik.install	2019-08-29 08:59:26 UTC (rev 504689)
@@ -1,11 +0,0 @@
-post_install() {
-  /sbin/ldconfig
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}