[arch-commits] Commit in mapnik/repos (12 files)
Sergej Pupykin
spupykin at archlinux.org
Mon May 22 14:04:15 UTC 2017
Date: Monday, May 22, 2017 @ 14:04:14
Author: spupykin
Revision: 229111
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
mapnik/repos/community-staging-i686/PKGBUILD
(from rev 229110, mapnik/trunk/PKGBUILD)
mapnik/repos/community-staging-i686/icu59.patch
(from rev 229110, mapnik/trunk/icu59.patch)
mapnik/repos/community-staging-i686/mapnik.install
(from rev 229110, mapnik/trunk/mapnik.install)
mapnik/repos/community-staging-x86_64/PKGBUILD
(from rev 229110, mapnik/trunk/PKGBUILD)
mapnik/repos/community-staging-x86_64/icu59.patch
(from rev 229110, mapnik/trunk/icu59.patch)
mapnik/repos/community-staging-x86_64/mapnik.install
(from rev 229110, mapnik/trunk/mapnik.install)
Deleted:
mapnik/repos/community-staging-i686/PKGBUILD
mapnik/repos/community-staging-i686/icu59.patch
mapnik/repos/community-staging-i686/mapnik.install
mapnik/repos/community-staging-x86_64/PKGBUILD
mapnik/repos/community-staging-x86_64/icu59.patch
mapnik/repos/community-staging-x86_64/mapnik.install
-----------------------------------------+
/PKGBUILD | 104 ++++++++++++++++++++++++++++++
/icu59.patch | 52 +++++++++++++++
/mapnik.install | 22 ++++++
community-staging-i686/PKGBUILD | 52 ---------------
community-staging-i686/icu59.patch | 26 -------
community-staging-i686/mapnik.install | 11 ---
community-staging-x86_64/PKGBUILD | 52 ---------------
community-staging-x86_64/icu59.patch | 26 -------
community-staging-x86_64/mapnik.install | 11 ---
9 files changed, 178 insertions(+), 178 deletions(-)
Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD 2017-05-22 14:03:48 UTC (rev 229110)
+++ community-staging-i686/PKGBUILD 2017-05-22 14:04:14 UTC (rev 229111)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: David Dent <thewinch at gmail.com>
-# Contributor: orbisvicis <orbisvicis at gmail.com>
-
-pkgname=mapnik
-pkgver=3.0.13
-pkgrel=3
-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' 'libtiff' 'freetype2'
- 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
- 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl')
-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 $MAKEFLAGS
-}
-
-package(){
- cd "$srcdir/$pkgname-v$pkgver"
- scons install
-}
Copied: mapnik/repos/community-staging-i686/PKGBUILD (from rev 229110, mapnik/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-05-22 14:04:14 UTC (rev 229111)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: David Dent <thewinch at gmail.com>
+# Contributor: orbisvicis <orbisvicis at gmail.com>
+
+pkgname=mapnik
+pkgver=3.0.13
+pkgrel=5
+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' 'libtiff' 'freetype2'
+ 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'python2-cairo'
+ 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl')
+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
+}
Deleted: community-staging-i686/icu59.patch
===================================================================
--- community-staging-i686/icu59.patch 2017-05-22 14:03:48 UTC (rev 229110)
+++ community-staging-i686/icu59.patch 2017-05-22 14:04:14 UTC (rev 229111)
@@ -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 {
Copied: mapnik/repos/community-staging-i686/icu59.patch (from rev 229110, mapnik/trunk/icu59.patch)
===================================================================
--- community-staging-i686/icu59.patch (rev 0)
+++ community-staging-i686/icu59.patch 2017-05-22 14:04:14 UTC (rev 229111)
@@ -0,0 +1,26 @@
+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: community-staging-i686/mapnik.install
===================================================================
--- community-staging-i686/mapnik.install 2017-05-22 14:03:48 UTC (rev 229110)
+++ community-staging-i686/mapnik.install 2017-05-22 14:04:14 UTC (rev 229111)
@@ -1,11 +0,0 @@
-post_install() {
- /sbin/ldconfig
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mapnik/repos/community-staging-i686/mapnik.install (from rev 229110, mapnik/trunk/mapnik.install)
===================================================================
--- community-staging-i686/mapnik.install (rev 0)
+++ community-staging-i686/mapnik.install 2017-05-22 14:04:14 UTC (rev 229111)
@@ -0,0 +1,11 @@
+post_install() {
+ /sbin/ldconfig
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-staging-x86_64/PKGBUILD
===================================================================
--- community-staging-x86_64/PKGBUILD 2017-05-22 14:03:48 UTC (rev 229110)
+++ community-staging-x86_64/PKGBUILD 2017-05-22 14:04:14 UTC (rev 229111)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: David Dent <thewinch at gmail.com>
-# Contributor: orbisvicis <orbisvicis at gmail.com>
-
-pkgname=mapnik
-pkgver=3.0.13
-pkgrel=3
-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' 'libtiff' 'freetype2'
- 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
- 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl')
-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 $MAKEFLAGS
-}
-
-package(){
- cd "$srcdir/$pkgname-v$pkgver"
- scons install
-}
Copied: mapnik/repos/community-staging-x86_64/PKGBUILD (from rev 229110, mapnik/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-05-22 14:04:14 UTC (rev 229111)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: David Dent <thewinch at gmail.com>
+# Contributor: orbisvicis <orbisvicis at gmail.com>
+
+pkgname=mapnik
+pkgver=3.0.13
+pkgrel=5
+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' 'libtiff' 'freetype2'
+ 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'python2-cairo'
+ 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl')
+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
+}
Deleted: community-staging-x86_64/icu59.patch
===================================================================
--- community-staging-x86_64/icu59.patch 2017-05-22 14:03:48 UTC (rev 229110)
+++ community-staging-x86_64/icu59.patch 2017-05-22 14:04:14 UTC (rev 229111)
@@ -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 {
Copied: mapnik/repos/community-staging-x86_64/icu59.patch (from rev 229110, mapnik/trunk/icu59.patch)
===================================================================
--- community-staging-x86_64/icu59.patch (rev 0)
+++ community-staging-x86_64/icu59.patch 2017-05-22 14:04:14 UTC (rev 229111)
@@ -0,0 +1,26 @@
+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: community-staging-x86_64/mapnik.install
===================================================================
--- community-staging-x86_64/mapnik.install 2017-05-22 14:03:48 UTC (rev 229110)
+++ community-staging-x86_64/mapnik.install 2017-05-22 14:04:14 UTC (rev 229111)
@@ -1,11 +0,0 @@
-post_install() {
- /sbin/ldconfig
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mapnik/repos/community-staging-x86_64/mapnik.install (from rev 229110, mapnik/trunk/mapnik.install)
===================================================================
--- community-staging-x86_64/mapnik.install (rev 0)
+++ community-staging-x86_64/mapnik.install 2017-05-22 14:04:14 UTC (rev 229111)
@@ -0,0 +1,11 @@
+post_install() {
+ /sbin/ldconfig
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list