From 715cac6562d96d2a3681ee1fd6b5a18aa65f8a3b Mon Sep 17 00:00:00 2001 From: Olaf Mersmann Date: Thu, 10 Dec 2020 20:25:57 +0100 Subject: [PATCH 1/7] qhull: update to 2020.2. --- srcpkgs/qhull/template | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template index 05f15ef7d21..bf556d9b4d7 100644 --- a/srcpkgs/qhull/template +++ b/srcpkgs/qhull/template @@ -1,16 +1,21 @@ # Template file for 'qhull' pkgname=qhull -version=2019.1 +version=2020.2 revision=1 build_style=cmake short_desc="Computes volumes, surface areas and approximations to the convex hull" maintainer="Martin Riese " license="BSD" homepage="http://www.qhull.org" +changelog="http://www.qhull.org/src/Changes.txt" distfiles="https://github.com/qhull/qhull/archive/$version.tar.gz" -checksum=cf7235b76244595a86b9407b906e3259502b744528318f2178155e5899d6cf9f +checksum=59356b229b768e6e2b09a701448bfa222c37b797a84f87f864f97462d8dbc7c5 +make_build_target="all libqhull" post_install() { + # Manually install libqhull (deprecated by the package author) + cp -r ${wrksrc}/build/libqhull.so* ${DESTDIR}/usr/lib + install -Dm644 ${FILESDIR}/qhull.pc ${DESTDIR}/usr/lib/pkgconfig/qhull.pc sed -i "s|@VERSION@|${version}|" ${DESTDIR}/usr/lib/pkgconfig/qhull.pc # convenience links for backwards compatibility @@ -20,6 +25,8 @@ post_install() { libqhull_package() { short_desc+=" - runtime libraries" + make_build_target="all libqhull" + make_build_target="all libqhull" pkg_install() { vmove usr/lib/*.so.* vlicense COPYING.txt From 81708c22f3b3a765aef879ff8610d723b5600a65 Mon Sep 17 00:00:00 2001 From: Olaf Mersmann Date: Thu, 10 Dec 2020 20:28:02 +0100 Subject: [PATCH 2/7] common/shlibs: qhull --- common/shlibs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 3ba07ad0ca2..5c181ff1685 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2129,9 +2129,6 @@ libwvstreams.so.4.6 wvstreams-4.6.1_1 libespeak.so.1 libespeak-1.48.04_1 libKF5Plotting.so.5 kplotting-5.26.0_1 libpgf.so.6 libpgf-6.14.12_1 -libqhull_p.so.7 libqhull-2015.2_1 -libqhull_r.so.7 libqhull-2015.2_1 -libqhull.so.7 libqhull-2015.2_1 libKF5NetworkManagerQt.so.6 networkmanager-qt5-5.26.0_1 libfcitx-core.so.0 libfcitx-4.2.8_1 libfcitx-gclient.so.1 libfcitx-4.2.9.5_1 @@ -4000,3 +3997,5 @@ libnotcurses.so.2 notcurses-2.0.4_1 libnotcurses++.so.2 notcurses-2.0.4_1 libevemu.so.3 evemu-2.7.0_1 libantilib.so.1 libantimicrox-3.1.2_1 +libqhull_r.so.8.0 libqhull-2020.2_1 +libqhull.so.8.0 libqhull-2020.2_1 From 71b4999f28dd8cc0ba525847181912fee03a7103 Mon Sep 17 00:00:00 2001 From: Olaf Mersmann Date: Thu, 10 Dec 2020 20:30:41 +0100 Subject: [PATCH 3/7] libgdal: revbump for qhull --- srcpkgs/libgdal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index c858c4264f1..2bb083d3f5e 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,7 +1,7 @@ # Template file for 'libgdal' pkgname=libgdal version=3.0.4 -revision=6 +revision=7 wrksrc="gdal-${version}" build_style=gnu-configure configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes" From cc66ed146ef918505eb2ab5c6de9ef8cd76b2e11 Mon Sep 17 00:00:00 2001 From: Olaf Mersmann Date: Thu, 10 Dec 2020 20:30:41 +0100 Subject: [PATCH 4/7] octave: revbump for qhull --- srcpkgs/octave/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template index 1ca9e663229..faac10a9818 100644 --- a/srcpkgs/octave/template +++ b/srcpkgs/octave/template @@ -1,7 +1,7 @@ # Template file for 'octave' pkgname=octave version=5.2.0 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --with-blas=openblas --with-lapack=openblas" hostmakedepends="perl gcc-fortran pkg-config gnuplot" From 0ef2f5391b249ebaf1b3cae27a7344b24955304d Mon Sep 17 00:00:00 2001 From: Olaf Mersmann Date: Thu, 10 Dec 2020 20:30:41 +0100 Subject: [PATCH 5/7] python3-matplotlib: revbump for qhull --- srcpkgs/python3-matplotlib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template index 3940b55d0f9..dc9a7b45758 100644 --- a/srcpkgs/python3-matplotlib/template +++ b/srcpkgs/python3-matplotlib/template @@ -1,7 +1,7 @@ # Template file for 'python3-matplotlib' pkgname=python3-matplotlib version=3.3.3 -revision=1 +revision=2 wrksrc="matplotlib-${version}" build_style=python3-module build_helper="numpy" From b1446d2af2f13448bb6b521dafdefe0252d88689 Mon Sep 17 00:00:00 2001 From: Olaf Mersmann Date: Thu, 10 Dec 2020 20:32:46 +0100 Subject: [PATCH 6/7] palapeli: revbump for qhull --- srcpkgs/palapeli/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/palapeli/template b/srcpkgs/palapeli/template index 2268b5e33ea..c55578992cb 100644 --- a/srcpkgs/palapeli/template +++ b/srcpkgs/palapeli/template @@ -1,7 +1,7 @@ # Template file for 'palapeli' pkgname=palapeli version=20.08.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig kcoreaddons gettext" From ef745796bdbfd589dc71fb15694d5ee0971ad5dd Mon Sep 17 00:00:00 2001 From: Olaf Mersmann Date: Thu, 10 Dec 2020 20:38:14 +0100 Subject: [PATCH 7/7] qhull: Fix SPDX license identifier --- srcpkgs/qhull/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template index bf556d9b4d7..635b5e8ddb3 100644 --- a/srcpkgs/qhull/template +++ b/srcpkgs/qhull/template @@ -5,7 +5,7 @@ revision=1 build_style=cmake short_desc="Computes volumes, surface areas and approximations to the convex hull" maintainer="Martin Riese " -license="BSD" +license="Qhull" homepage="http://www.qhull.org" changelog="http://www.qhull.org/src/Changes.txt" distfiles="https://github.com/qhull/qhull/archive/$version.tar.gz"