* Re: [PR PATCH] [Updated] [WIP] openscad: update to 2021.01
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
@ 2021-03-19 3:11 ` karl-nilsson
2021-03-19 4:27 ` karl-nilsson
` (23 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-03-19 3:11 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] openscad: update to 2021.01
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
2021-03-19 3:11 ` [PR PATCH] [Updated] " karl-nilsson
@ 2021-03-19 4:27 ` karl-nilsson
2021-04-11 3:23 ` ericonr
` (22 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-03-19 4:27 UTC (permalink / raw)
To: ml
[-- 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: 4482 bytes --]
From 62e623095afb100f25943bcdcc370e5e87cc48f8 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..bed3c978a0a8 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} boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+ short_desc+=" - development files (transitional dummy package)"
}
From 1ba07fd5bf8f227b86fd7a5d4f5e6360a7e15500 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
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [WIP] openscad: update to 2021.01
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
2021-03-19 3:11 ` [PR PATCH] [Updated] " karl-nilsson
2021-03-19 4:27 ` karl-nilsson
@ 2021-04-11 3:23 ` ericonr
2021-04-11 20:59 ` [PR PATCH] [Updated] " karl-nilsson
` (21 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-04-11 3:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29552#issuecomment-817240626
Comment:
I believe this PR will be repurposed to a cgal update?
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] openscad: update to 2021.01
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (2 preceding siblings ...)
2021-04-11 3:23 ` ericonr
@ 2021-04-11 20:59 ` karl-nilsson
2021-04-12 0:18 ` karl-nilsson
` (20 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-11 20:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 637 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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
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: 2028 bytes --]
From 45747071fd15caa134edc5af7461e848b57ce3fa 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] 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..bed3c978a0a8 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} boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+ short_desc+=" - development files (transitional dummy package)"
}
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [WIP] openscad: update to 2021.01
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (3 preceding siblings ...)
2021-04-11 20:59 ` [PR PATCH] [Updated] " karl-nilsson
@ 2021-04-12 0:18 ` karl-nilsson
2021-04-12 0:32 ` karl-nilsson
` (19 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-12 0:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New comment by karl-nilsson on void-packages repository
https://github.com/void-linux/void-packages/pull/29552#issuecomment-817400826
Comment:
@ericonr yes, and I intend to move the CGAL package over to header-only, as building shared libraries is deprecated, and will likely be removed in a future release.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [WIP] openscad: update to 2021.01
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (4 preceding siblings ...)
2021-04-12 0:18 ` karl-nilsson
@ 2021-04-12 0:32 ` karl-nilsson
2021-04-12 2:26 ` [PR REVIEW] " ericonr
` (18 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-12 0:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
New comment by karl-nilsson on void-packages repository
https://github.com/void-linux/void-packages/pull/29552#issuecomment-817400826
Comment:
@ericonr yes, and I intend to move the CGAL package over to header-only, as building shared libraries is deprecated, and will likely be removed in a future release.
What's the best way to go about this?
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR REVIEW] [WIP] openscad: update to 2021.01
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (5 preceding siblings ...)
2021-04-12 0:32 ` karl-nilsson
@ 2021-04-12 2:26 ` ericonr
2021-04-12 15:16 ` [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1 karl-nilsson
` (17 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-04-12 2:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29552#discussion_r611291421
Comment:
I think these depends should be moved to the main package? Actually, we can simply remove the subpackage and add `replaces="cgal-devel>=0"` to the template; it will be pulled in automatically, since the previous `cgal-devel` already depended on it.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (6 preceding siblings ...)
2021-04-12 2:26 ` [PR REVIEW] " ericonr
@ 2021-04-12 15:16 ` karl-nilsson
2021-04-12 15:33 ` karl-nilsson
` (16 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-12 15:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 631 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
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: 1863 bytes --]
From 3ab2584bf097395b6fc10545c75f8f025c3489d5 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] cgal: update to 5.2.1.
Take over maintainership
---
srcpkgs/cgal/template | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..c41e21b1a81d 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,21 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.1
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel 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
+replaces="cgal-devel>=0"
-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
- }
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (7 preceding siblings ...)
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
` (15 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-12 15:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 631 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
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: 4815 bytes --]
From 3ab2584bf097395b6fc10545c75f8f025c3489d5 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/4] cgal: update to 5.2.1.
Take over maintainership
---
srcpkgs/cgal/template | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..c41e21b1a81d 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,21 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.1
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel 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
+replaces="cgal-devel>=0"
-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
- }
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
From 394303d4c77a36b62c3043b7ddd69b8da6eaeeb3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 2/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..105b21776faf 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,12 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
From ed9dd06bd004e146891696b26e0025ed559f0490 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 3/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From cf9004fd46b4e3c36117968f56552bdc3345b120 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 4/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (8 preceding siblings ...)
2021-04-12 15:33 ` karl-nilsson
@ 2021-04-13 13:04 ` karl-nilsson
2021-04-13 18:08 ` karl-nilsson
` (14 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-13 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 631 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
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: 4838 bytes --]
From db33a976e10483f955de5d826a73340fec41da01 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/4] cgal: update to 5.2.1.
Take over maintainership
---
srcpkgs/cgal/template | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..5663f157546b 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,22 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.1
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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
+replaces="cgal-devel>=0"
-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
- }
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
From db316558a986af922962f505904b93e93636118e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 2/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..105b21776faf 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,12 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
From da466d07d65ca8e3ac6e8b7adb750de3d17d35fc Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 3/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From a23f2eae49509f5e48bc3eb2c815f9a7efc2a2ea Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 4/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (9 preceding siblings ...)
2021-04-13 13:04 ` karl-nilsson
@ 2021-04-13 18:08 ` karl-nilsson
2021-04-13 19:25 ` karl-nilsson
` (13 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-13 18:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
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: 6778 bytes --]
From db33a976e10483f955de5d826a73340fec41da01 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/4] cgal: update to 5.2.1.
Take over maintainership
---
srcpkgs/cgal/template | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..5663f157546b 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,22 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.1
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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
+replaces="cgal-devel>=0"
-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
- }
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
From b5c3bd51574ad60b774d9cfe98325dff8797b448 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 2/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From cc95aa37042451f14bc6ce893dca8025cc3a0515 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 3/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
From dcf51592f2dfd72079d440808eaf0b424c79ca3a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 4/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/patches/QPainterPath.patch | 15 +++++++--------
srcpkgs/dust3d/patches/cgal_header_only.patch | 12 ++++++++++++
srcpkgs/dust3d/template | 11 ++++++-----
3 files changed, 25 insertions(+), 13 deletions(-)
create mode 100644 srcpkgs/dust3d/patches/cgal_header_only.patch
diff --git a/srcpkgs/dust3d/patches/QPainterPath.patch b/srcpkgs/dust3d/patches/QPainterPath.patch
index 4c42b45cc3be..04ecb2aabb42 100644
--- a/srcpkgs/dust3d/patches/QPainterPath.patch
+++ b/srcpkgs/dust3d/patches/QPainterPath.patch
@@ -1,10 +1,9 @@
---- src/texturegenerator.h 2019-07-11 15:02:38.000000000 +0200
-+++ src/texturegenerator.h 2020-09-01 01:01:14.662510375 +0200
-@@ -4,6 +4,7 @@
- #include <vector>
+--- src/contourtopartconverter.cpp
++++ src/contourtopartconverter.cpp
+@@ -1,5 +1,6 @@
#include <QImage>
- #include <QColor>
+ #include <QPainter>
+#include <QPainterPath>
- #include "outcome.h"
- #include "meshloader.h"
- #include "snapshot.h"
+ #include <cmath>
+ #include <QUuid>
+ #include <cmath>
diff --git a/srcpkgs/dust3d/patches/cgal_header_only.patch b/srcpkgs/dust3d/patches/cgal_header_only.patch
new file mode 100644
index 000000000000..93364873461d
--- /dev/null
+++ b/srcpkgs/dust3d/patches/cgal_header_only.patch
@@ -0,0 +1,12 @@
+# Use CGAL as a header-only library
+
+--- dust3d.pro
++++ dust3d.pro
+@@ -907,7 +907,6 @@ LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME
+
+ INCLUDEPATH += $$CGAL_INCLUDEDIR
+ INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR
+-LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME
+
+ target.path = ./
+ INSTALLS += target
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..3fcd4473a248 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,18 +1,19 @@
# Template file for 'dust3d'
pkgname=dust3d
-version=1.0.0b21
+version=1.0.0rc6
revision=1
-_version="${version/b/-beta.}"
+_version="${version/rc/-rc.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
+configure_args="CONFIG+=c++14"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://dust3d.org/"
-distfiles="https://github.com/huxingyi/dust3d/archive/${_version}.tar.gz"
-checksum=7c29e1153e6b568459ab8a8fadbec3398a43b5d60f295018c3f0cdcad2d2b4b1
+distfiles="https://github.com/huxingyi/dust3d/archive/refs/tags/${_version}.tar.gz"
+checksum=171a12dad39ffd40551126e304a05f036958145fab2a45631929831e2c6bbee9
do_install() {
vbin dust3d
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (10 preceding siblings ...)
2021-04-13 18:08 ` karl-nilsson
@ 2021-04-13 19:25 ` karl-nilsson
2021-04-15 21:56 ` karl-nilsson
` (12 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-13 19:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
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: 6097 bytes --]
From 48603175759855ce06dc134648cbbb4b5fe2087a 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/4] cgal: update to 5.2.1.
Take over maintainership
---
common/shlibs | 3 ---
srcpkgs/cgal/template | 28 ++++++++++++----------------
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2e3a395214ca..6186fd19528c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2910,9 +2910,6 @@ libimagequant.so.0 libimagequant-2.8.2_1
libDOtherSide.so.0.7 dotherside-0.7.1_1
libstlink.so.1 stlink-1.5.1_1
libopencsg.so.1 opencsg-1.4.2_1
-libCGAL.so.13 cgal-4.10_1
-libCGAL_Core.so.13 cgal-4.10_1
-libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
libQtAVWidgets.so.1 qtav-1.12.0_1
libQtAV.so.1 qtav-1.12.0_1
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..5663f157546b 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,22 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.1
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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
+replaces="cgal-devel>=0"
-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
- }
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
From 52122891906213347783d291a172665ecd2c76c2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 2/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From 02b035d908363a38b4eb79984a23502bf2038c19 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 3/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
From b2c27386be40985d62d3425a6f9e5f1ce4761b3c Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 4/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/patches/cgal_header_only.patch | 12 ++++++++++++
srcpkgs/dust3d/template | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/dust3d/patches/cgal_header_only.patch
diff --git a/srcpkgs/dust3d/patches/cgal_header_only.patch b/srcpkgs/dust3d/patches/cgal_header_only.patch
new file mode 100644
index 000000000000..93364873461d
--- /dev/null
+++ b/srcpkgs/dust3d/patches/cgal_header_only.patch
@@ -0,0 +1,12 @@
+# Use CGAL as a header-only library
+
+--- dust3d.pro
++++ dust3d.pro
+@@ -907,7 +907,6 @@ LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME
+
+ INCLUDEPATH += $$CGAL_INCLUDEDIR
+ INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR
+-LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME
+
+ target.path = ./
+ INSTALLS += target
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..f325b9bfdd90 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,13 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
+configure_args="CONFIG+=c++14"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (11 preceding siblings ...)
2021-04-13 19:25 ` karl-nilsson
@ 2021-04-15 21:56 ` karl-nilsson
2021-04-16 18:25 ` karl-nilsson
` (11 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-15 21:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
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: 6097 bytes --]
From ba34030317b7197afc3d8212350bf71824bc20a5 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/4] cgal: update to 5.2.1.
Take over maintainership
---
common/shlibs | 3 ---
srcpkgs/cgal/template | 28 ++++++++++++----------------
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bb2b60e1f247..ac6f8f40d5c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2904,9 +2904,6 @@ libimagequant.so.0 libimagequant-2.8.2_1
libDOtherSide.so.0.7 dotherside-0.7.1_1
libstlink.so.1 stlink-1.5.1_1
libopencsg.so.1 opencsg-1.4.2_1
-libCGAL.so.13 cgal-4.10_1
-libCGAL_Core.so.13 cgal-4.10_1
-libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
libQtAVWidgets.so.1 qtav-1.12.0_1
libQtAV.so.1 qtav-1.12.0_1
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..5663f157546b 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,22 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.1
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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
+replaces="cgal-devel>=0"
-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
- }
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
From fecf91bb5c7f160ce62434a8f0843b865ebaf33b Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 2/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From 2068ec940498f8cbca9f3d01c26543e8bda253f3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 3/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
From c57782598fa7c92dae0f0d5014fc5bded49215d1 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 4/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/patches/cgal_header_only.patch | 12 ++++++++++++
srcpkgs/dust3d/template | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/dust3d/patches/cgal_header_only.patch
diff --git a/srcpkgs/dust3d/patches/cgal_header_only.patch b/srcpkgs/dust3d/patches/cgal_header_only.patch
new file mode 100644
index 000000000000..93364873461d
--- /dev/null
+++ b/srcpkgs/dust3d/patches/cgal_header_only.patch
@@ -0,0 +1,12 @@
+# Use CGAL as a header-only library
+
+--- dust3d.pro
++++ dust3d.pro
+@@ -907,7 +907,6 @@ LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME
+
+ INCLUDEPATH += $$CGAL_INCLUDEDIR
+ INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR
+-LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME
+
+ target.path = ./
+ INSTALLS += target
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..f325b9bfdd90 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,13 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
+configure_args="CONFIG+=c++14"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (12 preceding siblings ...)
2021-04-15 21:56 ` karl-nilsson
@ 2021-04-16 18:25 ` karl-nilsson
2021-04-16 20:32 ` karl-nilsson
` (10 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-16 18:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
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: 6097 bytes --]
From 11a8b6312138b34bf47493bf2b62f25af202bbbc 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/4] cgal: update to 5.2.1.
Take over maintainership
---
common/shlibs | 3 ---
srcpkgs/cgal/template | 28 ++++++++++++----------------
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bb2b60e1f247..ac6f8f40d5c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2904,9 +2904,6 @@ libimagequant.so.0 libimagequant-2.8.2_1
libDOtherSide.so.0.7 dotherside-0.7.1_1
libstlink.so.1 stlink-1.5.1_1
libopencsg.so.1 opencsg-1.4.2_1
-libCGAL.so.13 cgal-4.10_1
-libCGAL_Core.so.13 cgal-4.10_1
-libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
libQtAVWidgets.so.1 qtav-1.12.0_1
libQtAV.so.1 qtav-1.12.0_1
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..5663f157546b 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,22 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.1
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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
+replaces="cgal-devel>=0"
-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
- }
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
From 63f9d3c9c51a8b02b96d3892953f6f22348c4a88 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 2/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From 8122494cbd2368757140cf83631db0de10a9c319 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 3/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
From 753ceaa8cdec190620ff5acab99c1840fd0d9934 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 4/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/patches/cgal_header_only.patch | 12 ++++++++++++
srcpkgs/dust3d/template | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/dust3d/patches/cgal_header_only.patch
diff --git a/srcpkgs/dust3d/patches/cgal_header_only.patch b/srcpkgs/dust3d/patches/cgal_header_only.patch
new file mode 100644
index 000000000000..93364873461d
--- /dev/null
+++ b/srcpkgs/dust3d/patches/cgal_header_only.patch
@@ -0,0 +1,12 @@
+# Use CGAL as a header-only library
+
+--- dust3d.pro
++++ dust3d.pro
+@@ -907,7 +907,6 @@ LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME
+
+ INCLUDEPATH += $$CGAL_INCLUDEDIR
+ INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR
+-LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME
+
+ target.path = ./
+ INSTALLS += target
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..f325b9bfdd90 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,13 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
+configure_args="CONFIG+=c++14"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (13 preceding siblings ...)
2021-04-16 18:25 ` karl-nilsson
@ 2021-04-16 20:32 ` karl-nilsson
2021-04-18 0:32 ` ericonr
` (9 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-16 20:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
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: 6364 bytes --]
From 5b41905d68d443df0cddca2e9781bf5d5fc50d7d 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/4] cgal: update to 5.2.1.
Take over maintainership
---
common/shlibs | 3 ---
srcpkgs/cgal-devel | 1 -
srcpkgs/cgal/template | 28 ++++++++++++----------------
3 files changed, 12 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/cgal-devel
diff --git a/common/shlibs b/common/shlibs
index bb2b60e1f247..ac6f8f40d5c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2904,9 +2904,6 @@ libimagequant.so.0 libimagequant-2.8.2_1
libDOtherSide.so.0.7 dotherside-0.7.1_1
libstlink.so.1 stlink-1.5.1_1
libopencsg.so.1 opencsg-1.4.2_1
-libCGAL.so.13 cgal-4.10_1
-libCGAL_Core.so.13 cgal-4.10_1
-libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
libQtAVWidgets.so.1 qtav-1.12.0_1
libQtAV.so.1 qtav-1.12.0_1
diff --git a/srcpkgs/cgal-devel b/srcpkgs/cgal-devel
deleted file mode 120000
index 300787889a58..000000000000
--- a/srcpkgs/cgal-devel
+++ /dev/null
@@ -1 +0,0 @@
-cgal
\ No newline at end of file
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..5663f157546b 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,22 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.1
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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
+replaces="cgal-devel>=0"
-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
- }
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
From ca17b3b6091381414543bef9e97d1f69948ec048 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 2/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From 2da420779a5d7b93842c479366d71cb058887dbe Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 3/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
From dd1ec4006327e24b2d5642ffa84ec3a98fff29f3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 4/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/patches/cgal_header_only.patch | 12 ++++++++++++
srcpkgs/dust3d/template | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/dust3d/patches/cgal_header_only.patch
diff --git a/srcpkgs/dust3d/patches/cgal_header_only.patch b/srcpkgs/dust3d/patches/cgal_header_only.patch
new file mode 100644
index 000000000000..93364873461d
--- /dev/null
+++ b/srcpkgs/dust3d/patches/cgal_header_only.patch
@@ -0,0 +1,12 @@
+# Use CGAL as a header-only library
+
+--- dust3d.pro
++++ dust3d.pro
+@@ -907,7 +907,6 @@ LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME
+
+ INCLUDEPATH += $$CGAL_INCLUDEDIR
+ INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR
+-LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME
+
+ target.path = ./
+ INSTALLS += target
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..f325b9bfdd90 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,13 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
+configure_args="CONFIG+=c++14"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (14 preceding siblings ...)
2021-04-16 20:32 ` karl-nilsson
@ 2021-04-18 0:32 ` ericonr
2021-04-18 0:33 ` ericonr
` (8 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-04-18 0:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 882 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29552#issuecomment-821908325
Comment:
```
2021-04-16T20:54:12.6865564Z thirdparty/nodemesh/nodemesh/combiner.cpp: In constructor 'nodemesh::Combiner::Mesh::Mesh(const std::vector<QVector3D>&, const std::vector<std::vector<long unsigned int> >&, bool)':
2021-04-16T20:54:12.6867891Z thirdparty/nodemesh/nodemesh/combiner.cpp:31:61: error: 'remove_self_intersections' is not a member of 'CGAL::Polygon_mesh_processing'; did you mean 'self_intersections'?
2021-04-16T20:54:12.6869289Z 31 | if (!CGAL::Polygon_mesh_processing::remove_self_intersections(*cgalMesh)) {
2021-04-16T20:54:12.6870025Z | ^~~~~~~~~~~~~~~~~~~~~~~~~
```
CGAL has apparently broken compatibility with `dust3d`
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (15 preceding siblings ...)
2021-04-18 0:32 ` ericonr
@ 2021-04-18 0:33 ` ericonr
2021-04-18 23:19 ` karl-nilsson
` (7 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-04-18 0:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29552#issuecomment-821908325
Comment:
```
2021-04-16T20:54:12.6865564Z thirdparty/nodemesh/nodemesh/combiner.cpp: In constructor 'nodemesh::Combiner::Mesh::Mesh(const std::vector<QVector3D>&, const std::vector<std::vector<long unsigned int> >&, bool)':
2021-04-16T20:54:12.6867891Z thirdparty/nodemesh/nodemesh/combiner.cpp:31:61: error: 'remove_self_intersections' is not a member of 'CGAL::Polygon_mesh_processing'; did you mean 'self_intersections'?
2021-04-16T20:54:12.6869289Z 31 | if (!CGAL::Polygon_mesh_processing::remove_self_intersections(*cgalMesh)) {
2021-04-16T20:54:12.6870025Z | ^~~~~~~~~~~~~~~~~~~~~~~~~
```
CGAL has apparently broken compatibility with (our version of) `dust3d`
Maybe try to look at this file's history in their repo to see if you spot any possible patches to import?
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (16 preceding siblings ...)
2021-04-18 0:33 ` ericonr
@ 2021-04-18 23:19 ` karl-nilsson
2021-06-16 14:39 ` [PR PATCH] [Updated] " karl-nilsson
` (6 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-04-18 23:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]
New comment by karl-nilsson on void-packages repository
https://github.com/void-linux/void-packages/pull/29552#issuecomment-822081852
Comment:
> ```
> 2021-04-16T20:54:12.6865564Z thirdparty/nodemesh/nodemesh/combiner.cpp: In constructor 'nodemesh::Combiner::Mesh::Mesh(const std::vector<QVector3D>&, const std::vector<std::vector<long unsigned int> >&, bool)':
> 2021-04-16T20:54:12.6867891Z thirdparty/nodemesh/nodemesh/combiner.cpp:31:61: error: 'remove_self_intersections' is not a member of 'CGAL::Polygon_mesh_processing'; did you mean 'self_intersections'?
> 2021-04-16T20:54:12.6869289Z 31 | if (!CGAL::Polygon_mesh_processing::remove_self_intersections(*cgalMesh)) {
> 2021-04-16T20:54:12.6870025Z | ^~~~~~~~~~~~~~~~~~~~~~~~~
> ```
>
> CGAL has apparently broken compatibility with (our version of) `dust3d`
>
> Maybe try to look at this file's history in their repo to see if you spot any possible patches to import?
Will do
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (17 preceding siblings ...)
2021-04-18 23:19 ` karl-nilsson
@ 2021-06-16 14:39 ` karl-nilsson
2021-06-16 16:26 ` karl-nilsson
` (5 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-06-16 14:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
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: 6364 bytes --]
From c49e303fe24037d817337df6e25b54c14f8f89d1 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/4] cgal: update to 5.2.2.
Take over maintainership
---
common/shlibs | 3 ---
srcpkgs/cgal-devel | 1 -
srcpkgs/cgal/template | 28 ++++++++++++----------------
3 files changed, 12 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/cgal-devel
diff --git a/common/shlibs b/common/shlibs
index bb2b60e1f247..ac6f8f40d5c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2904,9 +2904,6 @@ libimagequant.so.0 libimagequant-2.8.2_1
libDOtherSide.so.0.7 dotherside-0.7.1_1
libstlink.so.1 stlink-1.5.1_1
libopencsg.so.1 opencsg-1.4.2_1
-libCGAL.so.13 cgal-4.10_1
-libCGAL_Core.so.13 cgal-4.10_1
-libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
libQtAVWidgets.so.1 qtav-1.12.0_1
libQtAV.so.1 qtav-1.12.0_1
diff --git a/srcpkgs/cgal-devel b/srcpkgs/cgal-devel
deleted file mode 120000
index 300787889a58..000000000000
--- a/srcpkgs/cgal-devel
+++ /dev/null
@@ -1 +0,0 @@
-cgal
\ No newline at end of file
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..2c236d1624c0 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,22 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.2
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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=deea9d708f9bfbe2cac526cc07dbbba55969c16ff6d733044357be0db56401eb
+replaces="cgal-devel>=0"
-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
- }
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
From 2b6d454f999044c26be7df7362d6b8981e7c5a22 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 2/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From 5e2e6ea34b8d7272d2dff42d9cde61e6c13ab0a8 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 3/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
From f0d9b4645982f44e6fd20bf84947276ea26098e2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 4/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/patches/cgal_header_only.patch | 12 ++++++++++++
srcpkgs/dust3d/template | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/dust3d/patches/cgal_header_only.patch
diff --git a/srcpkgs/dust3d/patches/cgal_header_only.patch b/srcpkgs/dust3d/patches/cgal_header_only.patch
new file mode 100644
index 000000000000..93364873461d
--- /dev/null
+++ b/srcpkgs/dust3d/patches/cgal_header_only.patch
@@ -0,0 +1,12 @@
+# Use CGAL as a header-only library
+
+--- dust3d.pro
++++ dust3d.pro
+@@ -907,7 +907,6 @@ LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME
+
+ INCLUDEPATH += $$CGAL_INCLUDEDIR
+ INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR
+-LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME
+
+ target.path = ./
+ INSTALLS += target
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..f325b9bfdd90 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,13 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
+configure_args="CONFIG+=c++14"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (18 preceding siblings ...)
2021-06-16 14:39 ` [PR PATCH] [Updated] " karl-nilsson
@ 2021-06-16 16:26 ` karl-nilsson
2021-06-16 18:33 ` karl-nilsson
` (4 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-06-16 16:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
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: 6364 bytes --]
From dddd35b1961fc259bf762463dc0e9253dcc51faf 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/4] cgal: update to 5.2.2.
Take over maintainership
---
common/shlibs | 3 ---
srcpkgs/cgal-devel | 1 -
srcpkgs/cgal/template | 28 ++++++++++++----------------
3 files changed, 12 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/cgal-devel
diff --git a/common/shlibs b/common/shlibs
index 179fe27443be..fa8e8dd3ba12 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2947,9 +2947,6 @@ libimagequant.so.0 libimagequant-2.8.2_1
libDOtherSide.so.0.7 dotherside-0.7.1_1
libstlink.so.1 stlink-1.5.1_1
libopencsg.so.1 opencsg-1.4.2_1
-libCGAL.so.13 cgal-4.10_1
-libCGAL_Core.so.13 cgal-4.10_1
-libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
libQtAVWidgets.so.1 qtav-1.12.0_1
libQtAV.so.1 qtav-1.12.0_1
diff --git a/srcpkgs/cgal-devel b/srcpkgs/cgal-devel
deleted file mode 120000
index 300787889a58..000000000000
--- a/srcpkgs/cgal-devel
+++ /dev/null
@@ -1 +0,0 @@
-cgal
\ No newline at end of file
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..2c236d1624c0 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,22 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.2
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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=deea9d708f9bfbe2cac526cc07dbbba55969c16ff6d733044357be0db56401eb
+replaces="cgal-devel>=0"
-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
- }
+do_check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
From 80885b48a664ac50672201ac6a36beef625a62fd Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 2/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From f6479e1abc23fe120fd83c989ad4b54e6898752e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 3/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
From 325bf0e6f8239550490b2260aca518e4bd5d8b47 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 4/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/patches/cgal_header_only.patch | 12 ++++++++++++
srcpkgs/dust3d/template | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/dust3d/patches/cgal_header_only.patch
diff --git a/srcpkgs/dust3d/patches/cgal_header_only.patch b/srcpkgs/dust3d/patches/cgal_header_only.patch
new file mode 100644
index 000000000000..93364873461d
--- /dev/null
+++ b/srcpkgs/dust3d/patches/cgal_header_only.patch
@@ -0,0 +1,12 @@
+# Use CGAL as a header-only library
+
+--- dust3d.pro
++++ dust3d.pro
+@@ -907,7 +907,6 @@ LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME
+
+ INCLUDEPATH += $$CGAL_INCLUDEDIR
+ INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR
+-LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME
+
+ target.path = ./
+ INSTALLS += target
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..f325b9bfdd90 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,13 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
+configure_args="CONFIG+=c++14"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (19 preceding siblings ...)
2021-06-16 16:26 ` karl-nilsson
@ 2021-06-16 18:33 ` karl-nilsson
2021-06-16 20:12 ` karl-nilsson
` (3 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-06-16 18:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] cgal: tests not working
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
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: 6300 bytes --]
From 9d1922748c20601436beb4022cf9547bc320c948 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/4] cgal: update to 5.2.2.
Take over maintainership
---
common/shlibs | 3 ---
srcpkgs/cgal-devel | 1 -
srcpkgs/cgal/template | 27 +++++++++------------------
3 files changed, 9 insertions(+), 22 deletions(-)
delete mode 120000 srcpkgs/cgal-devel
diff --git a/common/shlibs b/common/shlibs
index 179fe27443be..fa8e8dd3ba12 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2947,9 +2947,6 @@ libimagequant.so.0 libimagequant-2.8.2_1
libDOtherSide.so.0.7 dotherside-0.7.1_1
libstlink.so.1 stlink-1.5.1_1
libopencsg.so.1 opencsg-1.4.2_1
-libCGAL.so.13 cgal-4.10_1
-libCGAL_Core.so.13 cgal-4.10_1
-libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
libQtAVWidgets.so.1 qtav-1.12.0_1
libQtAV.so.1 qtav-1.12.0_1
diff --git a/srcpkgs/cgal-devel b/srcpkgs/cgal-devel
deleted file mode 120000
index 300787889a58..000000000000
--- a/srcpkgs/cgal-devel
+++ /dev/null
@@ -1 +0,0 @@
-cgal
\ No newline at end of file
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..7e89389fc331 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,17 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.2
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+configure_args="-DCGAL_HEADER_ONLY=ON -DBUILD_TESTING=ON"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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
-
-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
- }
-}
+distfiles="https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}-library.tar.xz"
+checksum=deea9d708f9bfbe2cac526cc07dbbba55969c16ff6d733044357be0db56401eb
+replaces="cgal-devel>=0"
From e02ff42de023bdd6a31a15eb8f28f97392917e8d Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 2/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From 3e195728c5209c5156ccbca5022e8cca63d010eb Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 3/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
From 594856ecd60b8ba3f249f2d6fe88e3faa6b5017f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 4/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/patches/cgal_header_only.patch | 12 ++++++++++++
srcpkgs/dust3d/template | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/dust3d/patches/cgal_header_only.patch
diff --git a/srcpkgs/dust3d/patches/cgal_header_only.patch b/srcpkgs/dust3d/patches/cgal_header_only.patch
new file mode 100644
index 000000000000..93364873461d
--- /dev/null
+++ b/srcpkgs/dust3d/patches/cgal_header_only.patch
@@ -0,0 +1,12 @@
+# Use CGAL as a header-only library
+
+--- dust3d.pro
++++ dust3d.pro
+@@ -907,7 +907,6 @@ LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME
+
+ INCLUDEPATH += $$CGAL_INCLUDEDIR
+ INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR
+-LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME
+
+ target.path = ./
+ INSTALLS += target
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..f325b9bfdd90 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,13 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
+configure_args="CONFIG+=c++14"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (20 preceding siblings ...)
2021-06-16 18:33 ` karl-nilsson
@ 2021-06-16 20:12 ` karl-nilsson
2021-11-06 22:08 ` karl-nilsson
` (2 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-06-16 20:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 810 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] ~~cgal: tests not working~~ [testsuite not included in releases](https://github.com/CGAL/cgal/wiki/Testing#test-suite-directory)
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
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: 6240 bytes --]
From 005c07067d197015da4996875cbf983cba9154e9 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/4] cgal: update to 5.2.2.
Take over maintainership
---
common/shlibs | 3 ---
srcpkgs/cgal-devel | 1 -
srcpkgs/cgal/template | 26 ++++++++------------------
3 files changed, 8 insertions(+), 22 deletions(-)
delete mode 120000 srcpkgs/cgal-devel
diff --git a/common/shlibs b/common/shlibs
index 179fe27443be..fa8e8dd3ba12 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2947,9 +2947,6 @@ libimagequant.so.0 libimagequant-2.8.2_1
libDOtherSide.so.0.7 dotherside-0.7.1_1
libstlink.so.1 stlink-1.5.1_1
libopencsg.so.1 opencsg-1.4.2_1
-libCGAL.so.13 cgal-4.10_1
-libCGAL_Core.so.13 cgal-4.10_1
-libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
libQtAVWidgets.so.1 qtav-1.12.0_1
libQtAV.so.1 qtav-1.12.0_1
diff --git a/srcpkgs/cgal-devel b/srcpkgs/cgal-devel
deleted file mode 120000
index 300787889a58..000000000000
--- a/srcpkgs/cgal-devel
+++ /dev/null
@@ -1 +0,0 @@
-cgal
\ No newline at end of file
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..c912891958e4 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,16 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.2
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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
-
-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
- }
-}
+distfiles="https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}-library.tar.xz"
+checksum=deea9d708f9bfbe2cac526cc07dbbba55969c16ff6d733044357be0db56401eb
+replaces="cgal-devel>=0"
From e2fc54a2c220ad5a988b0578ed79efc3aef281a7 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 2/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,10 +1,10 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=1
+revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From ba47d7e2d3024f17aeba23fdae80d4fb8503f331 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 3/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
From 424d61a067032efaef1763b1bec64ca7fb36f57f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 4/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/patches/cgal_header_only.patch | 12 ++++++++++++
srcpkgs/dust3d/template | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/dust3d/patches/cgal_header_only.patch
diff --git a/srcpkgs/dust3d/patches/cgal_header_only.patch b/srcpkgs/dust3d/patches/cgal_header_only.patch
new file mode 100644
index 000000000000..93364873461d
--- /dev/null
+++ b/srcpkgs/dust3d/patches/cgal_header_only.patch
@@ -0,0 +1,12 @@
+# Use CGAL as a header-only library
+
+--- dust3d.pro
++++ dust3d.pro
+@@ -907,7 +907,6 @@ LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME
+
+ INCLUDEPATH += $$CGAL_INCLUDEDIR
+ INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR
+-LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME
+
+ target.path = ./
+ INSTALLS += target
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..f325b9bfdd90 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,13 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
+configure_args="CONFIG+=c++14"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (21 preceding siblings ...)
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
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2021-11-06 22:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 810 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] cgal: update to 5.2.1
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] ~~cgal: tests not working~~ [testsuite not included in releases](https://github.com/CGAL/cgal/wiki/Testing#test-suite-directory)
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
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: 6171 bytes --]
From c3fc17b33d1f819db40029ecfcf022942bad4636 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/4] cgal: update to 5.2.2.
Take over maintainership
---
common/shlibs | 3 ---
srcpkgs/cgal-devel | 1 -
srcpkgs/cgal/template | 26 ++++++++------------------
3 files changed, 8 insertions(+), 22 deletions(-)
delete mode 120000 srcpkgs/cgal-devel
diff --git a/common/shlibs b/common/shlibs
index 60647122b3dd..d7ec28515638 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2950,9 +2950,6 @@ libimagequant.so.0 libimagequant-2.8.2_1
libDOtherSide.so.0.7 dotherside-0.7.1_1
libstlink.so.1 stlink-1.5.1_1
libopencsg.so.1 opencsg-1.4.2_1
-libCGAL.so.13 cgal-4.10_1
-libCGAL_Core.so.13 cgal-4.10_1
-libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
libQtAVWidgets.so.1 qtav-1.12.0_1
libQtAV.so.1 qtav-1.12.0_1
diff --git a/srcpkgs/cgal-devel b/srcpkgs/cgal-devel
deleted file mode 120000
index 300787889a58..000000000000
--- a/srcpkgs/cgal-devel
+++ /dev/null
@@ -1 +0,0 @@
-cgal
\ No newline at end of file
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 60eaa4bc61c2..c912891958e4 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,26 +1,16 @@
# Template file for 'cgal'
pkgname=cgal
-version=4.14
-revision=2
+version=5.2.2
+revision=1
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
-makedepends="boost-devel eigen mpfr-devel"
+makedepends="boost-devel eigen gmp-devel mpfr-devel zlib-devel"
+depends=$makedepends
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
-
-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
- }
-}
+distfiles="https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}-library.tar.xz"
+checksum=deea9d708f9bfbe2cac526cc07dbbba55969c16ff6d733044357be0db56401eb
+replaces="cgal-devel>=0"
From d9bbf02db0d153532f73ade0fe6cf5cfe896604e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:43 -0400
Subject: [PATCH 2/4] openscad: revbump for cgal
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 60d45d60615f..862091cf2fd9 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -4,7 +4,7 @@ version=2021.01
revision=2
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
-makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
+makedepends="cgal harfbuzz-devel opencsg-devel qscintilla-qt5-devel
qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
From 0ae2dc83f9e9bf0a6ca731824d162d56b71804e6 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:32:44 -0400
Subject: [PATCH 3/4] PrusaSlicer: revbump for cgal
---
srcpkgs/PrusaSlicer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c6aec9a24052 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,13 +1,13 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.3.0
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+makedepends=" boost-devel cereal cgal dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
wxWidgets-gtk3-devel"
From ba72c473299746397ce9bfae952b51010a33f3e2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 12 Apr 2021 11:31:03 -0400
Subject: [PATCH 4/4] dust3d: revbump for cgal
---
srcpkgs/dust3d/patches/cgal_header_only.patch | 12 ++++++++++++
srcpkgs/dust3d/template | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/dust3d/patches/cgal_header_only.patch
diff --git a/srcpkgs/dust3d/patches/cgal_header_only.patch b/srcpkgs/dust3d/patches/cgal_header_only.patch
new file mode 100644
index 000000000000..93364873461d
--- /dev/null
+++ b/srcpkgs/dust3d/patches/cgal_header_only.patch
@@ -0,0 +1,12 @@
+# Use CGAL as a header-only library
+
+--- dust3d.pro
++++ dust3d.pro
+@@ -907,7 +907,6 @@ LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME
+
+ INCLUDEPATH += $$CGAL_INCLUDEDIR
+ INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR
+-LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME
+
+ target.path = ./
+ INSTALLS += target
diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template
index 9ad934499983..f325b9bfdd90 100644
--- a/srcpkgs/dust3d/template
+++ b/srcpkgs/dust3d/template
@@ -1,12 +1,13 @@
# Template file for 'dust3d'
pkgname=dust3d
version=1.0.0b21
-revision=1
+revision=2
_version="${version/b/-beta.}"
wrksrc="$pkgname-${_version}"
build_style=qmake
+configure_args="CONFIG+=c++14"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel cgal-devel"
+makedepends="qt5-devel cgal"
short_desc="3D Modeling software"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Closed]: [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (22 preceding siblings ...)
2021-11-06 22:08 ` karl-nilsson
@ 2022-04-22 22:12 ` karl-nilsson
2022-04-22 22:12 ` karl-nilsson
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2022-04-22 22:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 643 bytes --]
There's a closed pull request on the void-packages repository
[WIP] cgal: update to 5.2.1
https://github.com/void-linux/void-packages/pull/29552
Description:
- [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
#### TODO
- [ ] cgal: missing cgal_create_cmake_script
- [ ] ~~cgal: tests not working~~ [testsuite not included in releases](https://github.com/CGAL/cgal/wiki/Testing#test-suite-directory)
- [ ] bump cgal rdeps
- [x] openscad
- [x] PrusaSlicer
- [ ] dust3d (rebuild fails)
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [WIP] cgal: update to 5.2.1
2021-03-18 0:53 [PR PATCH] [WIP] openscad: update to 2021.01 karl-nilsson
` (23 preceding siblings ...)
2022-04-22 22:12 ` [PR PATCH] [Closed]: " karl-nilsson
@ 2022-04-22 22:12 ` karl-nilsson
24 siblings, 0 replies; 26+ messages in thread
From: karl-nilsson @ 2022-04-22 22:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New comment by karl-nilsson on void-packages repository
https://github.com/void-linux/void-packages/pull/29552#issuecomment-1106933523
Comment:
This PR is too stale, I'm closing it.
^ permalink raw reply [flat|nested] 26+ messages in thread