author | Jelle van der Waa
<jelle@archlinux.org> 2020-11-11 15:30:27 UTC |
committer | Jelle van der Waa
<jelle@archlinux.org> 2020-11-11 15:30:27 UTC |
parent | 1ae41a75f8ebe647af4c3db8ad1b896e08e8cfb9 |
PKGBUILD | +5 | -2 |
openscad-boost-1.74.patch | +28 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index bea1d1c..5073cc4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,14 +19,17 @@ makedepends=('eigen' 'boost' 'imagemagick') checkdepends=('cmake' 'xorgproto' 'libx11' 'python') validpgpkeys=('E2EBDADD336FF516ADD51A78F3E12CCC22164A0F') source=("https://files.openscad.org/openscad-$pkgver.src.tar.gz"{,.asc} - $pkgname-boost-1.72.patch::https://github.com/openscad/openscad/commit/b6c170cc5d.patch) + $pkgname-boost-1.72.patch::https://github.com/openscad/openscad/commit/b6c170cc5d.patch + openscad-boost-1.74.patch) md5sums=('2b63e249d56e2eba62ed5b042e1d82bc' 'SKIP' - '7a4a1eb8c5bf29448bc94c1d936c0ee8') + '7a4a1eb8c5bf29448bc94c1d936c0ee8' + '6803146fcbd4405e1ee40258af1dccb7') prepare() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i ../$pkgname-boost-1.72.patch + patch -Np1 -i ../$pkgname-boost-1.74.patch } build() { diff --git a/openscad-boost-1.74.patch b/openscad-boost-1.74.patch new file mode 100644 index 0000000..74f48b4 --- /dev/null +++ b/openscad-boost-1.74.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 +