diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/mapnik/PKGBUILD | 42 | ||||
| -rw-r--r-- | libre/mapnik/icu59.patch | 26 |
2 files changed, 18 insertions, 50 deletions
diff --git a/libre/mapnik/PKGBUILD b/libre/mapnik/PKGBUILD index d0bf01790..334f942fe 100644 --- a/libre/mapnik/PKGBUILD +++ b/libre/mapnik/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 216759 2017-03-16 16:07:32Z spupykin $ -# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> + $Id$ # Maintainer (Arch): Jaroslav Lichtblau <svetlemodry@archlinux.org> +# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor (Arch): David Dent <thewinch@gmail.com> # Contributor (Arch): orbisvicis <orbisvicis@gmail.com> -# Maintainer: André Silva <emulatorman@hyperbola.info> +# Contributor: André Silva <emulatorman@hyperbola.info> pkgname=mapnik -pkgver=3.0.13 -pkgrel=5.parabola1 -pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps, without nonfree mod_fastcgi recommendation" -arch=('i686' 'x86_64' 'armv7h') +pkgver=3.0.17 +pkgrel=2.parabola1 +pkgdesc="Free Toolkit for developing mapping applications and rendering beautiful maps, without nonfree mod_fastcgi recommendation" +arch=('x86_64' 'i686' 'armv7h') url="http://mapnik.org/" license=('LGPL') -depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' - 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'python2-cairo' - 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl') +depends=('boost-libs' 'icu' 'libpng' 'libjpeg-turbo' 'libtiff' 'freetype2' + 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'python2-cairo' + 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool') +makedepends=('scons' 'boost' 'git') optdepends=('libxslt: Web Map Service' 'python2-lxml: Web Map Service' 'python2-pillow: Web Map Service' @@ -22,20 +23,13 @@ optdepends=('libxslt: 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" - 'icu59.patch') -sha256sums=('d6213d514a0e3cd84d9bfcb6d97208d169ffcaae1f36250f6555655cdfe57bcc' - 'b391a775f28ec9bc7d5d2a8ef429789d8c6158bdf8023f395501fbfc8137cc22') - -prepare() { - cd "$srcdir/$pkgname-v$pkgver" - patch -Np1 -i ../icu59.patch -} +install=$pkgname.install +source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.bz2) +sha512sums=('c1d46a42326d5339c60c30853e573b5cf7a02870597d91e3d60f4dc1f156db27b5d1981935d262cc6d1a2d26784cb7e1ac3cf23d14abf111471a8295a7f240bd') build() { - cd "$srcdir/$pkgname-v$pkgver" + cd "${srcdir}"/$pkgname-v$pkgver + PYTHON=python2 scons configure \ PREFIX="/usr" \ @@ -43,10 +37,10 @@ build() { XMLPARSER=libxml2 \ DESTDIR="$pkgdir" \ CUSTOM_CXXFLAGS="-DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL" - scons -j1 $MAKEFLAGS + scons -j1 # $MAKEFLAGS } package(){ - cd "$srcdir/$pkgname-v$pkgver" + cd "${srcdir}"/$pkgname-v$pkgver scons install } diff --git a/libre/mapnik/icu59.patch b/libre/mapnik/icu59.patch deleted file mode 100644 index 47494a3aa..000000000 --- a/libre/mapnik/icu59.patch +++ /dev/null @@ -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 { |