1 |
commit: 5d603d40b77add4605fb84ae93599d2a03aafb35 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 2 10:08:59 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 2 10:08:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d603d40 |
7 |
|
8 |
dev-libs/boost: Add boost::geometry inheritance patch |
9 |
|
10 |
Closes: https://bugs.gentoo.org/735092 |
11 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
dev-libs/boost/boost-1.73.0.ebuild | 2 ++ |
15 |
.../boost-1.73-geometry-private-inheritance.patch | 23 ++++++++++++++++++++++ |
16 |
2 files changed, 25 insertions(+) |
17 |
|
18 |
diff --git a/dev-libs/boost/boost-1.73.0.ebuild b/dev-libs/boost/boost-1.73.0.ebuild |
19 |
index bcc79240269..e5b91ab3053 100644 |
20 |
--- a/dev-libs/boost/boost-1.73.0.ebuild |
21 |
+++ b/dev-libs/boost/boost-1.73.0.ebuild |
22 |
@@ -60,6 +60,8 @@ PATCHES=( |
23 |
"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch |
24 |
# Remove annoying #pragma message |
25 |
"${FILESDIR}"/${PN}-1.73-property-tree-include.patch |
26 |
+ # https://github.com/boostorg/geometry/issues/721 |
27 |
+ "${FILESDIR}"/${PN}-1.73-geometry-private-inheritance.patch |
28 |
) |
29 |
|
30 |
python_bindings_needed() { |
31 |
|
32 |
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 |
33 |
new file mode 100644 |
34 |
index 00000000000..fef7bafec8f |
35 |
--- /dev/null |
36 |
+++ b/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch |
37 |
@@ -0,0 +1,23 @@ |
38 |
+From aafbceccc76dccb75963dd4f596fd1f10ee34b03 Mon Sep 17 00:00:00 2001 |
39 |
+From: Jonathan Wakely <boost@××××××.org> |
40 |
+Date: Fri, 5 Jun 2020 19:29:27 +0100 |
41 |
+Subject: [PATCH] Make index::detail::rtree::visitors::insert base class public |
42 |
+ |
43 |
+Fixes #721 |
44 |
+--- |
45 |
+ boost/geometry/index/detail/rtree/visitors/insert.hpp | 2 +- |
46 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
47 |
+ |
48 |
+diff --git a/boost/geometry/index/detail/rtree/visitors/insert.hpp b/boost/geometry/index/detail/rtree/visitors/insert.hpp |
49 |
+index 2d324cb7f4..5709a930cc 100644 |
50 |
+--- a/boost/geometry/index/detail/rtree/visitors/insert.hpp |
51 |
++++ b/boost/geometry/index/detail/rtree/visitors/insert.hpp |
52 |
+@@ -265,7 +265,7 @@ struct insert_traverse_data |
53 |
+ // Default insert visitor |
54 |
+ template <typename Element, typename MembersHolder> |
55 |
+ class insert |
56 |
+- : MembersHolder::visitor |
57 |
++ : public MembersHolder::visitor |
58 |
+ { |
59 |
+ protected: |
60 |
+ typedef typename MembersHolder::box_type box_type; |