From: kruceter <kruceter@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] LibreCAD: fix build
Date: Mon, 21 Nov 2022 17:11:31 +0100 [thread overview]
Message-ID: <20221121161131.3Hkj5eEpc7G_hLFSRv3V9zJkzhg8LfWbSyj2Hpjahlc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40668@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages librecad
https://github.com/void-linux/void-packages/pull/40668
LibreCAD: fix build
Related to #39083.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/40668.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-librecad-40668.patch --]
[-- Type: text/x-diff, Size: 2186 bytes --]
From 4721049e24bc331b61584a535288ba3db9cd762f Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 21 Nov 2022 18:55:38 +0300
Subject: [PATCH] LibreCAD: fix build
---
.../LibreCAD/patches/fix-boost-tuple.patch | 29 +++++++++++++++++++
srcpkgs/LibreCAD/template | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/LibreCAD/patches/fix-boost-tuple.patch
diff --git a/srcpkgs/LibreCAD/patches/fix-boost-tuple.patch b/srcpkgs/LibreCAD/patches/fix-boost-tuple.patch
new file mode 100644
index 000000000000..e2fc513a5454
--- /dev/null
+++ b/srcpkgs/LibreCAD/patches/fix-boost-tuple.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 291f734ea6..d47bf6ca4a 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/srcpkgs/LibreCAD/template b/srcpkgs/LibreCAD/template
index 36f326bf40ea..a2146404768d 100644
--- a/srcpkgs/LibreCAD/template
+++ b/srcpkgs/LibreCAD/template
@@ -1,7 +1,7 @@
# Template file for 'LibreCAD'
pkgname=LibreCAD
version=2.1.3
-revision=5
+revision=6
build_style=qmake
hostmakedepends="qt5-qmake pkg-config ImageMagick qt5-host-tools"
makedepends="qt5-devel qt5-svg-devel boost-devel muparser-devel librsvg-devel"
next prev parent reply other threads:[~2022-11-21 16:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 16:08 [PR PATCH] " kruceter
2022-11-21 16:11 ` kruceter [this message]
2022-11-22 21:40 ` [PR REVIEW] " paper42
2022-11-23 2:59 ` [PR PATCH] [Updated] " kruceter
2022-11-23 2:59 ` [PR REVIEW] " kruceter
2022-11-24 3:09 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221121161131.3Hkj5eEpc7G_hLFSRv3V9zJkzhg8LfWbSyj2Hpjahlc@z \
--to=kruceter@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).