| 1 |
commit: 75b81c60327b92dedd6d8a072c170d9b87105402 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 4 19:16:48 2022 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 4 21:49:32 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b81c60 |
| 7 |
|
| 8 |
sci-libs/dealii: fix build with boost 1.77 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
.../{dealii-9.3.1-r3.ebuild => dealii-9.3.1-r4.ebuild} | 5 +++-- |
| 14 |
sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch | 12 ++++++++++++ |
| 15 |
2 files changed, 15 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/dealii/dealii-9.3.1-r3.ebuild b/sci-libs/dealii/dealii-9.3.1-r4.ebuild |
| 18 |
similarity index 97% |
| 19 |
rename from sci-libs/dealii/dealii-9.3.1-r3.ebuild |
| 20 |
rename to sci-libs/dealii/dealii-9.3.1-r4.ebuild |
| 21 |
index c52bce06b69d..ebe0f99102e4 100644 |
| 22 |
--- a/sci-libs/dealii/dealii-9.3.1-r3.ebuild |
| 23 |
+++ b/sci-libs/dealii/dealii-9.3.1-r4.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2021 Gentoo Authors |
| 26 |
+# Copyright 1999-2022 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
@@ -45,7 +45,7 @@ REQUIRED_USE=" |
| 31 |
# accessible. Just fix the version for the time being. |
| 32 |
CAS_VERSION=7.5.3 |
| 33 |
|
| 34 |
-RDEPEND="<dev-libs/boost-1.77.0:= |
| 35 |
+RDEPEND="dev-libs/boost:= |
| 36 |
app-arch/bzip2 |
| 37 |
sys-libs/zlib |
| 38 |
dev-cpp/tbb:= |
| 39 |
@@ -80,6 +80,7 @@ DEPEND="${RDEPEND} |
| 40 |
|
| 41 |
PATCHES=( |
| 42 |
"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch |
| 43 |
+ "${FILESDIR}"/${PN}-9.1.1-fix_boost_177.patch |
| 44 |
) |
| 45 |
|
| 46 |
src_configure() { |
| 47 |
|
| 48 |
diff --git a/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch b/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch |
| 49 |
new file mode 100644 |
| 50 |
index 000000000000..b040e240ad61 |
| 51 |
--- /dev/null |
| 52 |
+++ b/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch |
| 53 |
@@ -0,0 +1,12 @@ |
| 54 |
+diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h |
| 55 |
+index 1b9d04d..1e1bfd2 100644 |
| 56 |
+--- a/include/deal.II/numerics/rtree.h |
| 57 |
++++ b/include/deal.II/numerics/rtree.h |
| 58 |
+@@ -26,6 +26,7 @@ |
| 59 |
+ #include <deal.II/boost_adaptors/segment.h> |
| 60 |
+ |
| 61 |
+ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS |
| 62 |
++#include <boost/geometry/algorithms/distance.hpp> |
| 63 |
+ #include <boost/geometry/index/rtree.hpp> |
| 64 |
+ #include <boost/geometry/strategies/strategies.hpp> |
| 65 |
+ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS |
Archives