[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: openscad: Add patch to fix build.
From: |
guix-commits |
Subject: |
branch master updated: gnu: openscad: Add patch to fix build. |
Date: |
Sat, 06 Jun 2020 09:20:10 -0400 |
This is an automated email from the git hooks/post-receive script.
bricewge pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new c08a784 gnu: openscad: Add patch to fix build.
c08a784 is described below
commit c08a784c58bca8df048bc98276aa4fcf0d61d8b3
Author: Steve Sprang <scs@stevesprang.com>
AuthorDate: Fri Jun 5 11:05:06 2020 -0700
gnu: openscad: Add patch to fix build.
* gnu/packages/patches/openscad-parser-boost-1.72.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/engineering.scm (openscad)[source]: Use it.
---
gnu/local.mk | 1 +
gnu/packages/engineering.scm | 4 +++-
.../patches/openscad-parser-boost-1.72.patch | 26 ++++++++++++++++++++++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5016d16..92a2255 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1326,6 +1326,7 @@ dist_patch_DATA =
\
%D%/packages/patches/openocd-nrf52.patch \
%D%/packages/patches/openssh-hurd.patch \
%D%/packages/patches/openresolv-restartcmd-guix.patch \
+ %D%/packages/patches/openscad-parser-boost-1.72.patch \
%D%/packages/patches/openssl-runpath.patch \
%D%/packages/patches/openssl-1.1-c-rehash-in.patch \
%D%/packages/patches/openssl-c-rehash-in.patch \
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 2102f8d..9d9c67b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2263,7 +2263,9 @@ specification can be downloaded at
@url{http://3mf.io/specification/}.")
".src.tar.gz"))
(sha256
(base32
- "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha"))))
+ "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha"))
+ (patches (search-patches
+ "openscad-parser-boost-1.72.patch"))))
(build-system cmake-build-system)
(inputs
`(("boost" ,boost)
diff --git a/gnu/packages/patches/openscad-parser-boost-1.72.patch
b/gnu/packages/patches/openscad-parser-boost-1.72.patch
new file mode 100644
index 0000000..35311e6
--- /dev/null
+++ b/gnu/packages/patches/openscad-parser-boost-1.72.patch
@@ -0,0 +1,26 @@
+https://github.com/openscad/openscad/commit/b6c170cc5d.patch
+
+From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Fri, 25 Oct 2019 15:10:26 +0000
+Subject: [PATCH] Add missing header bootlegged by Boost < 1.72
+
+src/parser.y:76:6: error: no template named 'stack' in namespace 'std'
+std::stack<LocalScope *> scope_stack;
+~~~~~^
+---
+ src/parser.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/parser.y b/src/parser.y
+index 7f4fd56ca7..4c77c989ea 100644
+--- a/src/parser.y
++++ b/src/parser.y
+@@ -46,6 +46,7 @@
+ #include "printutils.h"
+ #include "memory.h"
+ #include <sstream>
++#include <stack>
+ #include <boost/filesystem.hpp>
+ #include "boost-utils.h"
+ #include "feature.h"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: openscad: Add patch to fix build.,
guix-commits <=