Date: Thursday, June 10, 2021 @ 19:47:36 Author: eworm Revision: 961668
upgpkg: librecad 2.1.3-6: fix build with recent boost Added: librecad/trunk/0003-add-boost-tuple-include-to-fix-build.patch Modified: librecad/trunk/PKGBUILD -------------------------------------------------+ 0003-add-boost-tuple-include-to-fix-build.patch | 29 ++++++++++++++++++++++ PKGBUILD | 9 ++++-- 2 files changed, 35 insertions(+), 3 deletions(-) Added: 0003-add-boost-tuple-include-to-fix-build.patch =================================================================== --- 0003-add-boost-tuple-include-to-fix-build.patch (rev 0) +++ 0003-add-boost-tuple-include-to-fix-build.patch 2021-06-10 19:47:36 UTC (rev 961668) @@ -0,0 +1,29 @@ +From 1fd07fcd847659d518efa0897a9f603de83fe362 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby <[email protected]> +Date: Tue, 4 May 2021 09:25:03 +0200 +Subject: [PATCH] add boost tuple include to fix build + +With boost 1.76, we see: +lib/engine/rs_ellipse.cpp:70:15: error: 'tuple' in namespace 'boost::math' does not name a template type + 70 | boost::math::tuple<double, double, double> operator()(double const& z) const { + | ^~~~~ + +Fix this by including the proper boost header. +--- + librecad/src/lib/engine/rs_ellipse.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/librecad/src/lib/engine/rs_ellipse.cpp b/librecad/src/lib/engine/rs_ellipse.cpp +index 291f734ea..d47bf6ca4 100644 +--- a/librecad/src/lib/engine/rs_ellipse.cpp ++++ b/librecad/src/lib/engine/rs_ellipse.cpp +@@ -48,6 +48,9 @@ + #include <boost/version.hpp> + #include <boost/math/tools/roots.hpp> + #include <boost/math/special_functions/ellint_2.hpp> ++#if BOOST_VERSION > 104500 ++#include <boost/math/tools/tuple.hpp> ++#endif + #endif + + namespace{ Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-10 19:47:24 UTC (rev 961667) +++ PKGBUILD 2021-06-10 19:47:36 UTC (rev 961668) @@ -5,7 +5,7 @@ pkgname=librecad pkgver=2.1.3 -pkgrel=5 +pkgrel=6 pkgdesc='A 2D CAD drawing tool based on the community edition of QCad' arch=('x86_64') url='https://www.librecad.org/' @@ -16,10 +16,12 @@ replaces=('librecad-svn' 'caduntu' 'caduntu-svn') source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreCAD/LibreCAD/archive/${pkgver}.tar.gz"; '0001-fix-build-with-Qt-5.11.patch' - '0002-fix-build-with-Qt-5.15.patch') + '0002-fix-build-with-Qt-5.15.patch' + '0003-add-boost-tuple-include-to-fix-build.patch') sha256sums=('74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06' '7590015c964888673844b1342e684e417b8bd2a5baacecebfbdc2f9aa0749360' - 'a5c37f871ce88a4efd0236c6329a19afe7993be96df9fe02b3affd79a44314bb') + 'a5c37f871ce88a4efd0236c6329a19afe7993be96df9fe02b3affd79a44314bb' + '84e9440b18ae28c22e7becf9e1f20f9ea38687d2112f38a1186b03a2278ce23a') prepare() { cd "${srcdir}/LibreCAD-${pkgver}" @@ -27,6 +29,7 @@ # fix build with recent Qt patch -Np1 < ../0001-fix-build-with-Qt-5.11.patch patch -Np1 < ../0002-fix-build-with-Qt-5.15.patch + patch -Np1 < ../0003-add-boost-tuple-include-to-fix-build.patch } build() {
