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