* [PR PATCH] LibreCAD: fix build
@ 2022-11-21 16:08 kruceter
2022-11-21 16:11 ` [PR PATCH] [Updated] " kruceter
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: kruceter @ 2022-11-21 16:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is a new 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: 1673 bytes --]
From d21596df1d4c08b3262aef76aafe0864731c392c 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 +++++++++++++++++++
1 file changed, 29 insertions(+)
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{
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] LibreCAD: fix build
2022-11-21 16:08 [PR PATCH] LibreCAD: fix build kruceter
@ 2022-11-21 16:11 ` kruceter
2022-11-22 21:40 ` [PR REVIEW] " paper42
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: kruceter @ 2022-11-21 16:11 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] LibreCAD: fix build
2022-11-21 16:08 [PR PATCH] LibreCAD: fix build kruceter
2022-11-21 16:11 ` [PR PATCH] [Updated] " kruceter
@ 2022-11-22 21:40 ` paper42
2022-11-23 2:59 ` [PR PATCH] [Updated] " kruceter
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-11-22 21:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40668#discussion_r1029843819
Comment:
If this is only fixing the build, we don't have to revbump.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] LibreCAD: fix build
2022-11-21 16:08 [PR PATCH] LibreCAD: fix build kruceter
2022-11-21 16:11 ` [PR PATCH] [Updated] " kruceter
2022-11-22 21:40 ` [PR REVIEW] " paper42
@ 2022-11-23 2:59 ` kruceter
2022-11-23 2:59 ` [PR REVIEW] " kruceter
2022-11-24 3:09 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: kruceter @ 2022-11-23 2:59 UTC (permalink / raw)
To: ml
[-- 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: 1675 bytes --]
From dab8dadb97d96ba48e2bd87e1035fa5e21ff9d75 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 +++++++++++++++++++
1 file changed, 29 insertions(+)
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 0000000000000..e2fc513a5454d
--- /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{
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] LibreCAD: fix build
2022-11-21 16:08 [PR PATCH] LibreCAD: fix build kruceter
` (2 preceding siblings ...)
2022-11-23 2:59 ` [PR PATCH] [Updated] " kruceter
@ 2022-11-23 2:59 ` kruceter
2022-11-24 3:09 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: kruceter @ 2022-11-23 2:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40668#discussion_r1029983659
Comment:
Got it.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: LibreCAD: fix build
2022-11-21 16:08 [PR PATCH] LibreCAD: fix build kruceter
` (3 preceding siblings ...)
2022-11-23 2:59 ` [PR REVIEW] " kruceter
@ 2022-11-24 3:09 ` classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2022-11-24 3:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
There's a merged pull request on the void-packages repository
LibreCAD: fix build
https://github.com/void-linux/void-packages/pull/40668
Description:
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-24 3:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-21 16:08 [PR PATCH] LibreCAD: fix build kruceter
2022-11-21 16:11 ` [PR PATCH] [Updated] " kruceter
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
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).