Re: [PR PATCH] [Updated] [WIP] cgal: update to 5.2.1

[karl-nilsson <karl-nilsson@users.noreply.github.com>]

[-- 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"