From db33a976e10483f955de5d826a73340fec41da01 Mon Sep 17 00:00:00 2001 From: Karl Nilsson 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 " +maintainer="Karl Nilsson " 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 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 " From cc95aa37042451f14bc6ce893dca8025cc3a0515 Mon Sep 17 00:00:00 2001 From: Karl Nilsson 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 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 +--- src/contourtopartconverter.cpp ++++ src/contourtopartconverter.cpp +@@ -1,5 +1,6 @@ #include - #include + #include +#include - #include "outcome.h" - #include "meshloader.h" - #include "snapshot.h" + #include + #include + #include 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 " 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