Date: Sunday, September 18, 2022 @ 03:20:34
Author: foutrelis
Revision: 1304775
Fix build with boost 1.80
Added:
mapnik/trunk/boost-1.80.patch
Modified:
mapnik/trunk/PKGBUILD
------------------+
PKGBUILD | 3 +++
boost-1.80.patch | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-18 03:19:22 UTC (rev 1304774)
+++ PKGBUILD 2022-09-18 03:20:34 UTC (rev 1304775)
@@ -14,12 +14,15 @@
'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
Added: boost-1.80.patch
===================================================================
--- boost-1.80.patch (rev 0)
+++ boost-1.80.patch 2022-09-18 03:20:34 UTC (rev 1304775)
@@ -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
+ {
