guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: librecad: Fix build with boost 1.76.


From: guix-commits
Subject: branch master updated: gnu: librecad: Fix build with boost 1.76.
Date: Tue, 01 Feb 2022 14:07:14 -0500

This is an automated email from the git hooks/post-receive script.

glv pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 787b13a5d9 gnu: librecad: Fix build with boost 1.76.
787b13a5d9 is described below

commit 787b13a5d9df8f0cc7170de1b80cead68b516c66
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Tue Feb 1 20:00:31 2022 +0100

    gnu: librecad: Fix build with boost 1.76.
    
    Fixes <https://issues.guix.gnu.org/53694>.
    
    * gnu/packages/patches/librecad-support-for-boost-1.76.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/engineering.scm (librecad)[source]: Use it.
---
 gnu/local.mk                                            |  1 +
 gnu/packages/engineering.scm                            |  4 +++-
 .../patches/librecad-support-for-boost-1.76.patch       | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 1788c4e110..9969bc67cb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1408,6 +1408,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch   \
   %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch        \
   %D%/packages/patches/libquicktime-ffmpeg.patch               \
+  %D%/packages/patches/librecad-support-for-boost-1.76.patch   \
   %D%/packages/patches/libssh2-CVE-2019-17498.patch            \
   %D%/packages/patches/libtar-CVE-2013-4420.patch              \
   %D%/packages/patches/libtgvoip-disable-sse2.patch            \
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 8e4614590b..04f5ba88b9 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -147,7 +147,9 @@
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "08cl4935c9vznz9qdw1zgd86rn7hl64zpfayxl07x21bhf53pn24"))))
+                "08cl4935c9vznz9qdw1zgd86rn7hl64zpfayxl07x21bhf53pn24"))
+              (patches
+               (search-patches "librecad-support-for-boost-1.76.patch"))))
     (build-system qt-build-system)
     (arguments
      '(#:test-target "check"
diff --git a/gnu/packages/patches/librecad-support-for-boost-1.76.patch 
b/gnu/packages/patches/librecad-support-for-boost-1.76.patch
new file mode 100644
index 0000000000..aa352e669f
--- /dev/null
+++ b/gnu/packages/patches/librecad-support-for-boost-1.76.patch
@@ -0,0 +1,17 @@
+Upstream commit e02f3580311d50b617427652ff77988f6bd62d9d adding Boost 1.76
+compatibility.
+
+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{



reply via email to

[Prev in Thread] Current Thread [Next in Thread]