From: karl-nilsson <karl-nilsson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] openscad: update to 2021.01
Date: Fri, 19 Mar 2021 04:11:02 +0100 [thread overview]
Message-ID: <20210319031102.SCamToMULXRU1rdHmf8W8qP_E5JBXpe5LKynOhIfZCQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29552@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
There is an updated pull request by karl-nilsson against master on the void-packages repository
https://github.com/karl-nilsson/void-packages openscad
https://github.com/void-linux/void-packages/pull/29552
[WIP] openscad: update to 2021.01
- [x] I generally don't use the affected packages but briefly tested this PR
#### Does it build and run successfully?
- [x] I built this PR locally for my native architecture, x64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/29552.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openscad-29552.patch --]
[-- Type: text/x-diff, Size: 4432 bytes --]
From ce99c383c5c7bdbd3c56b0909d7b2479eee974c8 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 10 Sep 2020 18:10:17 -0400
Subject: [PATCH 1/2] cgal: update to 5.2.1.
Take over maintainership
---
srcpkgs/cgal/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..0ff7413ec7f8 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,26 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.1
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+makedepends="boost-devel eigen mpfr-devel zlib-devel"
short_desc="Computational Geometry Algorithms Library"
-maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://www.cgal.org"
-distfiles="https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-${version}/CGAL-${version}.tar.xz"
-checksum=59464b1eaee892f2223ba570a7642892c999e29524ab102a6efd7c29c94a29f7
+distfiles="https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}-library.tar.xz"
+checksum=390aa87c4f21609c19397c4b14abb5ccad3edd1e33933a0089b266f67ce7b111
+
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
cgal-devel_package() {
- short_desc+=" - development files"
- depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/bin/cgal_create_cmake_script
- vmove usr/share/man/man1/cgal_create_cmake_script.1
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove usr/lib/cmake
- }
+ build_style=meta
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files (transitional dummy package)"
}
From b9e804afcf677861a0f3f2d6c294db4335963294 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 17 Mar 2021 20:16:31 -0400
Subject: [PATCH 2/2] openscad: update to 2021.01.
---
...70cc5dd1bc677176ee732cdb0ddae57e5cf0.patch | 24 -------------------
srcpkgs/openscad/template | 8 +++----
2 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch
diff --git a/srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch b/srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch
deleted file mode 100644
index f0d80d2f97eb..000000000000
--- a/srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 src/parser.y src/parser.y
-index 7f4fd56ca7..4c77c989ea 100644
---- src/parser.y
-+++ 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"
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 5e846402ddd3..b1e0c5922e62 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
-version=2019.05
-revision=3
+version=2021.01
+revision=1
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
@@ -10,5 +10,5 @@ short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2.0-or-later"
homepage="http://www.openscad.org"
-distfiles="http://files.openscad.org/${pkgname}-${version}.src.tar.gz"
-checksum=0a16c4263ce52380819dd91c609a719d38f12f6b8c4da0e828dcbe5b70996f59
+distfiles="https://files.openscad.org/${pkgname}-${version}.src.tar.gz"
+checksum=d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359
next prev parent reply other threads:[~2021-03-19 3:11 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 0:53 [PR PATCH] " karl-nilsson
2021-03-19 3:11 ` karl-nilsson [this message]
2021-03-19 4:27 ` [PR PATCH] [Updated] " karl-nilsson
2021-04-11 3:23 ` ericonr
2021-04-11 20:59 ` [PR PATCH] [Updated] " karl-nilsson
2021-04-12 0:18 ` karl-nilsson
2021-04-12 0:32 ` karl-nilsson
2021-04-12 2:26 ` [PR REVIEW] " ericonr
2021-04-12 15:16 ` [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1 karl-nilsson
2021-04-12 15:33 ` karl-nilsson
2021-04-13 13:04 ` karl-nilsson
2021-04-13 18:08 ` karl-nilsson
2021-04-13 19:25 ` karl-nilsson
2021-04-15 21:56 ` karl-nilsson
2021-04-16 18:25 ` karl-nilsson
2021-04-16 20:32 ` karl-nilsson
2021-04-18 0:32 ` ericonr
2021-04-18 0:33 ` ericonr
2021-04-18 23:19 ` karl-nilsson
2021-06-16 14:39 ` [PR PATCH] [Updated] " karl-nilsson
2021-06-16 16:26 ` karl-nilsson
2021-06-16 18:33 ` karl-nilsson
2021-06-16 20:12 ` karl-nilsson
2021-11-06 22:08 ` karl-nilsson
2022-04-22 22:12 ` [PR PATCH] [Closed]: " karl-nilsson
2022-04-22 22:12 ` karl-nilsson
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=20210319031102.SCamToMULXRU1rdHmf8W8qP_E5JBXpe5LKynOhIfZCQ@z \
--to=karl-nilsson@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).