Date: Friday, November 25, 2022 @ 00:39:50
Author: kgizdov
Revision: 1353632
archrelease: copy trunk to community-x86_64
Added:
mapnik/repos/community-x86_64/PKGBUILD
(from rev 1353631, mapnik/trunk/PKGBUILD)
mapnik/repos/community-x86_64/boost-1.80.patch
(from rev 1353631, mapnik/trunk/boost-1.80.patch)
mapnik/repos/community-x86_64/scons4.patch
(from rev 1353631, mapnik/trunk/scons4.patch)
Deleted:
mapnik/repos/community-x86_64/PKGBUILD
mapnik/repos/community-x86_64/boost-1.80.patch
mapnik/repos/community-x86_64/scons4.patch
------------------+
PKGBUILD | 94 ++++++++++++++++++++++++++---------------------------
boost-1.80.patch | 76 +++++++++++++++++++++---------------------
scons4.patch | 22 ++++++------
3 files changed, 96 insertions(+), 96 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-25 00:39:41 UTC (rev 1353631)
+++ PKGBUILD 2022-11-25 00:39:50 UTC (rev 1353632)
@@ -1,47 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <[email protected]>
-# Contributor: Sergej Pupykin <[email protected]>
-# Contributor: David Dent <[email protected]>
-# Contributor: orbisvicis <[email protected]>
-
-pkgname=mapnik
-pkgver=3.1.0
-pkgrel=14
-pkgdesc="Free Toolkit for developing mapping applications and rendering
beautiful maps"
-arch=('x86_64')
-url="https://mapnik.org/";
-license=('LGPL')
-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
- boost-1.80.patch
- scons4.patch)
-sha256sums=('43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261'
- 'b80085fba71ea6ecd86ff98ebdf652490bf56507cb798076192ab3ce136f5eeb'
- '79a85ddba3ec17b86cb216e21442611498a9f2612f03e98708057b3c3a6e8b06')
-
-prepare() {
- cd "${srcdir}"/$pkgname-v$pkgver
- patch -Np1 -i ../boost-1.80.patch
-
- # Partial fix to build with SCons 4 (https://bugs.archlinux.org/task/71630)
- patch -Np1 -i ../scons4.patch
-}
-
-build() {
- cd "${srcdir}"/$pkgname-v$pkgver
- scons configure FAST=True \
- PREFIX="/usr" \
- INPUT_PLUGINS=all \
- XMLPARSER=libxml2 \
- DESTDIR="$pkgdir" \
- CUSTOM_CXXFLAGS="$CXXFLAGS -ffat-lto-objects" \
- CUSTOM_LDFLAGS="$LDFLAGS" \
- CUSTOM_DEFINES="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
- scons $(expr "$MAKEFLAGS" : '.*\(\-j[0-9]\+\)')
-}
-
-package(){
- cd "${srcdir}"/$pkgname-v$pkgver
- scons install
-}
Copied: mapnik/repos/community-x86_64/PKGBUILD (from rev 1353631,
mapnik/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-11-25 00:39:50 UTC (rev 1353632)
@@ -0,0 +1,47 @@
+# Maintainer: Jaroslav Lichtblau <[email protected]>
+# Contributor: Sergej Pupykin <[email protected]>
+# Contributor: David Dent <[email protected]>
+# Contributor: orbisvicis <[email protected]>
+
+pkgname=mapnik
+pkgver=3.1.0
+pkgrel=15
+pkgdesc="Free Toolkit for developing mapping applications and rendering
beautiful maps"
+arch=('x86_64')
+url="https://mapnik.org/";
+license=('LGPL')
+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
+ boost-1.80.patch
+ scons4.patch)
+sha256sums=('43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261'
+ 'b80085fba71ea6ecd86ff98ebdf652490bf56507cb798076192ab3ce136f5eeb'
+ '79a85ddba3ec17b86cb216e21442611498a9f2612f03e98708057b3c3a6e8b06')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-v$pkgver
+ patch -Np1 -i ../boost-1.80.patch
+
+ # Partial fix to build with SCons 4 (https://bugs.archlinux.org/task/71630)
+ patch -Np1 -i ../scons4.patch
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-v$pkgver
+ scons configure FAST=True \
+ PREFIX="/usr" \
+ INPUT_PLUGINS=all \
+ XMLPARSER=libxml2 \
+ DESTDIR="$pkgdir" \
+ CUSTOM_CXXFLAGS="$CXXFLAGS -ffat-lto-objects" \
+ CUSTOM_LDFLAGS="$LDFLAGS" \
+ CUSTOM_DEFINES="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
+ scons $(expr "$MAKEFLAGS" : '.*\(\-j[0-9]\+\)')
+}
+
+package(){
+ cd "${srcdir}"/$pkgname-v$pkgver
+ scons install
+}
Deleted: boost-1.80.patch
===================================================================
--- boost-1.80.patch 2022-11-25 00:39:41 UTC (rev 1353631)
+++ boost-1.80.patch 2022-11-25 00:39:50 UTC (rev 1353632)
@@ -1,38 +0,0 @@
-From f741d58fd686d71896b9107049108c1a4414dba4 Mon Sep 17 00:00:00 2001
-From: Artem Pavlenko <[email protected]>
-Date: Tue, 30 Aug 2022 10:40:25 +0100
-Subject: [PATCH] Fix building with boost_1_80 (#4340)
-
-(cherry picked from commit 81103491b467e17218140f50bc0bb9dc8c1f0317)
----
- test/unit/serialization/wkb_test.cpp | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/test/unit/serialization/wkb_test.cpp
b/test/unit/serialization/wkb_test.cpp
-index 8a617df26..26b019951 100644
---- a/test/unit/serialization/wkb_test.cpp
-+++ b/test/unit/serialization/wkb_test.cpp
-@@ -57,6 +57,23 @@ struct spatially_equal_visitor
- return true;
- }
-
-+ result_type operator()(mapnik::geometry::multi_line_string<double> const&
lhs,
-+ mapnik::geometry::multi_line_string<double> const&
rhs) const
-+ {
-+
-+ std::size_t size0 = lhs.size();
-+ std::size_t size1 = rhs.size();
-+ if (size0 != size1)
-+ return false;
-+
-+ for (std::size_t index = 0; index < size0; ++index)
-+ {
-+ if (!boost::geometry::equals(lhs[index], rhs[index]))
-+ return false;
-+ }
-+ return true;
-+ }
-+
- template <typename T>
- result_type operator() (T const& lhs, T const& rhs) const
- {
Copied: mapnik/repos/community-x86_64/boost-1.80.patch (from rev 1353631,
mapnik/trunk/boost-1.80.patch)
===================================================================
--- boost-1.80.patch (rev 0)
+++ boost-1.80.patch 2022-11-25 00:39:50 UTC (rev 1353632)
@@ -0,0 +1,38 @@
+From f741d58fd686d71896b9107049108c1a4414dba4 Mon Sep 17 00:00:00 2001
+From: Artem Pavlenko <[email protected]>
+Date: Tue, 30 Aug 2022 10:40:25 +0100
+Subject: [PATCH] Fix building with boost_1_80 (#4340)
+
+(cherry picked from commit 81103491b467e17218140f50bc0bb9dc8c1f0317)
+---
+ test/unit/serialization/wkb_test.cpp | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/test/unit/serialization/wkb_test.cpp
b/test/unit/serialization/wkb_test.cpp
+index 8a617df26..26b019951 100644
+--- a/test/unit/serialization/wkb_test.cpp
++++ b/test/unit/serialization/wkb_test.cpp
+@@ -57,6 +57,23 @@ struct spatially_equal_visitor
+ return true;
+ }
+
++ result_type operator()(mapnik::geometry::multi_line_string<double> const&
lhs,
++ mapnik::geometry::multi_line_string<double> const&
rhs) const
++ {
++
++ std::size_t size0 = lhs.size();
++ std::size_t size1 = rhs.size();
++ if (size0 != size1)
++ return false;
++
++ for (std::size_t index = 0; index < size0; ++index)
++ {
++ if (!boost::geometry::equals(lhs[index], rhs[index]))
++ return false;
++ }
++ return true;
++ }
++
+ template <typename T>
+ result_type operator() (T const& lhs, T const& rhs) const
+ {
Deleted: scons4.patch
===================================================================
--- scons4.patch 2022-11-25 00:39:41 UTC (rev 1353631)
+++ scons4.patch 2022-11-25 00:39:50 UTC (rev 1353632)
@@ -1,11 +0,0 @@
-diff -upr mapnik-v3.1.0.orig/SConstruct mapnik-v3.1.0/SConstruct
---- mapnik-v3.1.0.orig/SConstruct 2021-01-08 13:23:24.000000000 +0200
-+++ mapnik-v3.1.0/SConstruct 2021-11-22 11:41:03.413991679 +0200
-@@ -126,7 +126,6 @@ PLUGINS = { # plugins with external depe
-
- def init_environment(env):
- env.Decider('MD5-timestamp')
-- env.SourceCode(".", None)
- if os.environ.get('RANLIB'):
- env['RANLIB'] = os.environ['RANLIB']
- if os.environ.get('AR'):
Copied: mapnik/repos/community-x86_64/scons4.patch (from rev 1353631,
mapnik/trunk/scons4.patch)
===================================================================
--- scons4.patch (rev 0)
+++ scons4.patch 2022-11-25 00:39:50 UTC (rev 1353632)
@@ -0,0 +1,11 @@
+diff -upr mapnik-v3.1.0.orig/SConstruct mapnik-v3.1.0/SConstruct
+--- mapnik-v3.1.0.orig/SConstruct 2021-01-08 13:23:24.000000000 +0200
++++ mapnik-v3.1.0/SConstruct 2021-11-22 11:41:03.413991679 +0200
+@@ -126,7 +126,6 @@ PLUGINS = { # plugins with external depe
+
+ def init_environment(env):
+ env.Decider('MD5-timestamp')
+- env.SourceCode(".", None)
+ if os.environ.get('RANLIB'):
+ env['RANLIB'] = os.environ['RANLIB']
+ if os.environ.get('AR'):
