From ce99c383c5c7bdbd3c56b0909d7b2479eee974c8 Mon Sep 17 00:00:00 2001 From: Karl Nilsson 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 " +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 + +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 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 -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 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 -+#include - #include - #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 " 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