From 9d8ab473c9ed9d803b3b513badc3a5a3e6d5d6ed Mon Sep 17 00:00:00 2001 From: Florian Franzmann Date: Sat, 13 Feb 2021 20:52:15 +0100 Subject: science/openscad: version 2021.01 --- science/openscad/DETAILS | 4 ++-- science/openscad/HISTORY | 7 ++++++ science/openscad/PRE_BUILD | 3 +-- ...ad-2019.05-0001-Fix-build-with-boost-1.73.patch | 28 ---------------------- .../openscad-2019.05_fix-boost-1.72.0-build.patch | 27 --------------------- 5 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 science/openscad/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch delete mode 100644 science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch (limited to 'science') diff --git a/science/openscad/DETAILS b/science/openscad/DETAILS index b0f4cd3c5b..8d69a9be86 100755 --- a/science/openscad/DETAILS +++ b/science/openscad/DETAILS @@ -1,8 +1,8 @@ SPELL=openscad - VERSION=2019.05 + VERSION=2021.01 SOURCE="${SPELL}-${VERSION}.src.tar.gz" SOURCE_URL[0]=https://files.${SPELL}.org/${SOURCE} - SOURCE_HASH=sha512:073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13 + SOURCE_HASH=sha512:8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="https://www.openscad.org" LICENSE[0]=GPL diff --git a/science/openscad/HISTORY b/science/openscad/HISTORY index bb43425e90..fcd700ca8d 100644 --- a/science/openscad/HISTORY +++ b/science/openscad/HISTORY @@ -1,3 +1,9 @@ +2021-02-13 Florian Franzmann + * DETAILS: version 2021.01 + * openscad-2019.05-0001-Fix-build-with-boost-1.73.patch, + openscad-2019.05_fix-boost-1.72.0-build.patch, PRE_BUILD: remove + obsolete patches + 2021-01-20 Ismael Luceno * DEPENDS, PRE_BUILD: added dependency on lib3mf * DEPENDS: added missing dependency on qtmultimedia @@ -16,3 +22,4 @@ 2019-07-14 Florian Franzmann * BUILD, DEPENDS, DETAILS: spell created +openscad-2019.05-0001-Fix-build-with-boost-1.73.patch openscad-2019.05_fix-boost-1.72.0-build.patch diff --git a/science/openscad/PRE_BUILD b/science/openscad/PRE_BUILD index 7c3e6d32c8..b7453ba3ad 100755 --- a/science/openscad/PRE_BUILD +++ b/science/openscad/PRE_BUILD @@ -1,6 +1,5 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && -patch -p1 < "$SPELL_DIRECTORY/openscad-2019.05_fix-boost-1.72.0-build.patch" && -patch -p1 < "$SPELL_DIRECTORY/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch" && + # Fix .pc name for lib3mf sedit '/^ *find_package/s/Lib3MF/lib3mf/' CMakeLists.txt diff --git a/science/openscad/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch b/science/openscad/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch deleted file mode 100644 index 74f48b4c1a..0000000000 --- a/science/openscad/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Fri, 15 May 2020 19:09:10 +0200 -Subject: [PATCH] Fix build with boost-1.73 - -Thanks to William T Wilson for reporting and providing the patch. - -Signed-off-by: Bernd Waibel ---- - src/import.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/import.cc b/src/import.cc -index eef1323..08e46ff 100644 ---- a/src/import.cc -+++ b/src/import.cc -@@ -50,7 +50,7 @@ namespace fs = boost::filesystem; - #include - using namespace boost::assign; // bring 'operator+=()' into scope - --#include -+#include - #include - - extern PolySet * import_amf(std::string, const Location &loc); --- -2.26.2 - diff --git a/science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch b/science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch deleted file mode 100644 index 28d3285a73..0000000000 --- a/science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001 -From: Jan Beich -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 scope_stack; -~~~~~^ ---- - src/parser.y | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/parser.y b/src/parser.y -index 7f4fd56c..4c77c989 100644 ---- a/src/parser.y -+++ b/src/parser.y -@@ -46,6 +46,7 @@ - #include "printutils.h" - #include "memory.h" - #include -+#include - #include - #include "boost-utils.h" - #include "feature.h" --- -2.24.1 - -- cgit v1.2.3