diff options
| author | Florian Franzmann | 2020-10-31 00:42:09 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2020-11-05 20:49:33 +0100 |
| commit | 55cee461fa9b76f9de1254fcfdef37dfa2994f72 (patch) | |
| tree | 31ece36887716a8f67d9190e6eb34b649917e086 /science | |
| parent | a3bc36ac80375e090b6804fd0240904aa188942b (diff) | |
science/openscad: fix build against boost 1.74
Diffstat (limited to 'science')
| -rw-r--r-- | science/openscad/HISTORY | 4 | ||||
| -rwxr-xr-x | science/openscad/PRE_BUILD | 3 | ||||
| -rw-r--r-- | science/openscad/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch | 28 |
3 files changed, 34 insertions, 1 deletions
diff --git a/science/openscad/HISTORY b/science/openscad/HISTORY index fac7bbfd67..ca440f6013 100644 --- a/science/openscad/HISTORY +++ b/science/openscad/HISTORY @@ -1,3 +1,7 @@ +2020-10-31 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, openscad-2019.05-0001-Fix-build-with-boost-1.73.patch: + add patch from gentoo to fix build against boost 1.74 + 2020-01-19 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * PRE_BUILD, openscad-2019.05_fix-boost-1.72.0-build.patch: add patch from gentoo to fix build with boost 1.72.0 diff --git a/science/openscad/PRE_BUILD b/science/openscad/PRE_BUILD index cdec0b7e69..b471a4021e 100755 --- a/science/openscad/PRE_BUILD +++ b/science/openscad/PRE_BUILD @@ -1,5 +1,6 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && -patch -p1 < "$SPELL_DIRECTORY/openscad-2019.05_fix-boost-1.72.0-build.patch" +patch -p1 < "$SPELL_DIRECTORY/openscad-2019.05_fix-boost-1.72.0-build.patch" && +patch -p1 < "$SPELL_DIRECTORY/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch" diff --git a/science/openscad/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch b/science/openscad/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch new file mode 100644 index 0000000000..74f48b4c1a --- /dev/null +++ b/science/openscad/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch @@ -0,0 +1,28 @@ +From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl@gmail.com> +Date: Fri, 15 May 2020 19:09:10 +0200 +Subject: [PATCH] Fix build with boost-1.73 + +Thanks to William T Wilson for reporting and providing the patch. + +Signed-off-by: Bernd Waibel <waebbl@gmail.com> +--- + src/import.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/import.cc b/src/import.cc +index eef1323..08e46ff 100644 +--- a/src/import.cc ++++ b/src/import.cc +@@ -50,7 +50,7 @@ namespace fs = boost::filesystem; + #include <boost/assign/std/vector.hpp> + using namespace boost::assign; // bring 'operator+=()' into scope + +-#include <boost/detail/endian.hpp> ++#include <boost/endian/arithmetic.hpp> + #include <cstdint> + + extern PolySet * import_amf(std::string, const Location &loc); +-- +2.26.2 + |