summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-08-02 12:08:59 +0200
committerDavid Seifert <soap@gentoo.org>2020-08-02 12:08:59 +0200
commit5d603d40b77add4605fb84ae93599d2a03aafb35 (patch)
tree33c6fa7ac8d460a178e308c205dbac76e3dbabda /dev-libs/boost
parentdev-python/pypy3: fix gentoo-path.patch and rev bump (diff)
downloadgentoo-5d603d40b77add4605fb84ae93599d2a03aafb35.tar.gz
gentoo-5d603d40b77add4605fb84ae93599d2a03aafb35.tar.bz2
gentoo-5d603d40b77add4605fb84ae93599d2a03aafb35.zip
dev-libs/boost: Add boost::geometry inheritance patch
Closes: https://bugs.gentoo.org/735092 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-libs/boost')
-rw-r--r--dev-libs/boost/boost-1.73.0.ebuild2
-rw-r--r--dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch23
2 files changed, 25 insertions, 0 deletions
diff --git a/dev-libs/boost/boost-1.73.0.ebuild b/dev-libs/boost/boost-1.73.0.ebuild
index bcc792402694..e5b91ab30530 100644
--- a/dev-libs/boost/boost-1.73.0.ebuild
+++ b/dev-libs/boost/boost-1.73.0.ebuild
@@ -60,6 +60,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
# Remove annoying #pragma message
"${FILESDIR}"/${PN}-1.73-property-tree-include.patch
+ # https://github.com/boostorg/geometry/issues/721
+ "${FILESDIR}"/${PN}-1.73-geometry-private-inheritance.patch
)
python_bindings_needed() {
diff --git a/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch b/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch
new file mode 100644
index 000000000000..fef7bafec8ff
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch
@@ -0,0 +1,23 @@
+From aafbceccc76dccb75963dd4f596fd1f10ee34b03 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <boost@kayari.org>
+Date: Fri, 5 Jun 2020 19:29:27 +0100
+Subject: [PATCH] Make index::detail::rtree::visitors::insert base class public
+
+Fixes #721
+---
+ boost/geometry/index/detail/rtree/visitors/insert.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boost/geometry/index/detail/rtree/visitors/insert.hpp b/boost/geometry/index/detail/rtree/visitors/insert.hpp
+index 2d324cb7f4..5709a930cc 100644
+--- a/boost/geometry/index/detail/rtree/visitors/insert.hpp
++++ b/boost/geometry/index/detail/rtree/visitors/insert.hpp
+@@ -265,7 +265,7 @@ struct insert_traverse_data
+ // Default insert visitor
+ template <typename Element, typename MembersHolder>
+ class insert
+- : MembersHolder::visitor
++ : public MembersHolder::visitor
+ {
+ protected:
+ typedef typename MembersHolder::box_type box_type;