diff options
| author |   M.Dinslage | 2022-02-16 08:50:07 +0100 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2022-02-17 06:59:46 +0100 |
| commit | bda7caf4efa6812e363193365d9506e17ec75dc0 (patch) | |
| tree | 9a7a97ceb5ecbb9a17d7b2d8c957a94f17c01fa8 /graphics/librecad | |
| parent | 04676d1a383514b6797c3c762fdeeabf38f36e20 (diff) | |
| download | slackbuilds-bda7caf4efa6812e363193365d9506e17ec75dc0.tar.gz | |
graphics/librecad: Fix building with the newer boost.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'graphics/librecad')
| -rw-r--r-- | graphics/librecad/0003-add-boost-tuple-include-to-fix-build.patch | 29 | ||||
| -rw-r--r-- | graphics/librecad/librecad.SlackBuild | 3 |
2 files changed, 32 insertions, 0 deletions
diff --git a/graphics/librecad/0003-add-boost-tuple-include-to-fix-build.patch b/graphics/librecad/0003-add-boost-tuple-include-to-fix-build.patch new file mode 100644 index 0000000000..2500bab79b --- /dev/null +++ b/graphics/librecad/0003-add-boost-tuple-include-to-fix-build.patch @@ -0,0 +1,29 @@ +From 1fd07fcd847659d518efa0897a9f603de83fe362 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby <jslaby@suse.cz> +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{ diff --git a/graphics/librecad/librecad.SlackBuild b/graphics/librecad/librecad.SlackBuild index e13b4003ac..4e33f0cbb8 100644 --- a/graphics/librecad/librecad.SlackBuild +++ b/graphics/librecad/librecad.SlackBuild @@ -84,6 +84,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# thnx Archlinux! +patch -p1 < $CWD/0003-add-boost-tuple-include-to-fix-build.patch + qmake-qt5 $PRGNAM.pro QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" make |