Date: Thursday, November 16, 2017 @ 19:31:16 Author: jlichtblau Revision: 267016
archrelease: copy trunk to community-x86_64 Added: mapnik/repos/community-x86_64/PKGBUILD (from rev 267015, mapnik/trunk/PKGBUILD) mapnik/repos/community-x86_64/mapnik.install (from rev 267015, mapnik/trunk/mapnik.install) Deleted: mapnik/repos/community-x86_64/PKGBUILD mapnik/repos/community-x86_64/icu59.patch mapnik/repos/community-x86_64/mapnik.install ----------------+ PKGBUILD | 96 +++++++++++++++++++++++++------------------------------ icu59.patch | 26 -------------- mapnik.install | 22 ++++++------ 3 files changed, 55 insertions(+), 89 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-11-16 19:26:54 UTC (rev 267015) +++ PKGBUILD 2017-11-16 19:31:16 UTC (rev 267016) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Contributor: David Dent <thewi...@gmail.com> -# Contributor: orbisvicis <orbisvi...@gmail.com> - -pkgname=mapnik -pkgver=3.0.13 -pkgrel=7 -pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" -arch=('i686' 'x86_64') -url="http://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') -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_fastcgi: Web Map Service - or:' - 'mod_fcgid: Web Map Service - or:' - 'mod_wsgi2: Web Map Service') -makedepends=('scons' 'boost' 'git') -install="mapnik.install" -source=("https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2" - 'icu59.patch') -sha256sums=('d6213d514a0e3cd84d9bfcb6d97208d169ffcaae1f36250f6555655cdfe57bcc' - 'b391a775f28ec9bc7d5d2a8ef429789d8c6158bdf8023f395501fbfc8137cc22') - -prepare() { - cd "$srcdir/$pkgname-v$pkgver" - patch -Np1 -i ../icu59.patch -} - -build() { - cd "$srcdir/$pkgname-v$pkgver" - PYTHON=python2 - scons configure \ - PREFIX="/usr" \ - INPUT_PLUGINS=all \ - XMLPARSER=libxml2 \ - DESTDIR="$pkgdir" \ - CUSTOM_CXXFLAGS="-DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL" - scons -j1 # $MAKEFLAGS -} - -package(){ - cd "$srcdir/$pkgname-v$pkgver" - scons install -} Copied: mapnik/repos/community-x86_64/PKGBUILD (from rev 267015, mapnik/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-11-16 19:31:16 UTC (rev 267016) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: David Dent <thewi...@gmail.com> +# Contributor: orbisvicis <orbisvi...@gmail.com> + +pkgname=mapnik +pkgver=3.0.16 +pkgrel=1 +pkgdesc="Free Toolkit for developing mapping applications and rendering beautiful maps" +arch=('x86_64') +url="http://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') +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') +makedepends=('scons' 'boost' 'git') +install="mapnik.install" +source=("https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2") +sha256sums=('0a0e6351d1a32922327555b9835d4843aade752adecadde309fa856b72dfb1b1') + +build() { + cd "$srcdir/$pkgname-v$pkgver" + PYTHON=python2 + scons configure \ + PREFIX="/usr" \ + INPUT_PLUGINS=all \ + XMLPARSER=libxml2 \ + DESTDIR="$pkgdir" \ + CUSTOM_CXXFLAGS="-DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL" + scons -j1 # $MAKEFLAGS +} + +package(){ + cd "$srcdir/$pkgname-v$pkgver" + scons install +} Deleted: icu59.patch =================================================================== --- icu59.patch 2017-11-16 19:26:54 UTC (rev 267015) +++ icu59.patch 2017-11-16 19:31:16 UTC (rev 267016) @@ -1,26 +0,0 @@ -diff -upr mapnik-v3.0.13.orig/include/mapnik/text/harfbuzz_shaper.hpp mapnik-v3.0.13/include/mapnik/text/harfbuzz_shaper.hpp ---- mapnik-v3.0.13.orig/include/mapnik/text/harfbuzz_shaper.hpp 2017-02-08 15:13:58.000000000 +0200 -+++ mapnik-v3.0.13/include/mapnik/text/harfbuzz_shaper.hpp 2017-04-26 12:14:46.156921035 +0300 -@@ -55,11 +55,7 @@ static inline hb_script_t _icu_script_to - static inline const uint16_t * uchar_to_utf16(const UChar* src) - { - static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t"); --#if defined(_MSC_VER) - return reinterpret_cast<const uint16_t *>(src); --#else -- return src; --#endif - } - - struct harfbuzz_shaper -diff -upr mapnik-v3.0.13.orig/src/unicode.cpp mapnik-v3.0.13/src/unicode.cpp ---- mapnik-v3.0.13.orig/src/unicode.cpp 2017-02-08 15:13:58.000000000 +0200 -+++ mapnik-v3.0.13/src/unicode.cpp 2017-04-26 12:14:20.346507663 +0300 -@@ -30,6 +30,7 @@ - #pragma GCC diagnostic push - #include <mapnik/warning_ignore.hpp> - #include <unicode/ucnv.h> -+#include <unicode/unistr.h> - #pragma GCC diagnostic pop - - namespace mapnik { Deleted: mapnik.install =================================================================== --- mapnik.install 2017-11-16 19:26:54 UTC (rev 267015) +++ mapnik.install 2017-11-16 19:31:16 UTC (rev 267016) @@ -1,11 +0,0 @@ -post_install() { - /sbin/ldconfig -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: mapnik/repos/community-x86_64/mapnik.install (from rev 267015, mapnik/trunk/mapnik.install) =================================================================== --- mapnik.install (rev 0) +++ mapnik.install 2017-11-16 19:31:16 UTC (rev 267016) @@ -0,0 +1,11 @@ +post_install() { + /sbin/ldconfig +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}