From cf24486c619d7a2020cd9abdb05d3f54eb1e1758 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 6 Jan 2021 10:52:12 -0500 Subject: [PATCH] qhull: update to 2020.2. Closes: #27082. --- common/shlibs | 5 ++--- srcpkgs/qhull/template | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index aa697549809..a60e1becef3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2121,9 +2121,8 @@ libwvstreams.so.4.6 wvstreams-4.6.1_1 libespeak-ng.so.1 libespeak-ng-1.50_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 +libqhull_r.so.8.0 libqhull-2020.2_1 +libqhull.so.8.0 libqhull-2020.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 diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template index 05f15ef7d21..949d21450a0 100644 --- a/srcpkgs/qhull/template +++ b/srcpkgs/qhull/template @@ -1,19 +1,27 @@ # Template file for 'qhull' pkgname=qhull -version=2019.1 +version=2020.2 revision=1 build_style=cmake +make_build_target="all libqhull" 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" -checksum=cf7235b76244595a86b9407b906e3259502b744528318f2178155e5899d6cf9f +checksum=59356b229b768e6e2b09a701448bfa222c37b797a84f87f864f97462d8dbc7c5 post_install() { + vlicense COPYING.txt + + # Manually install libqhull which the package author has deprecated, + # but octave and matplotlib still require. + 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 + # convenience links for backwards compatibility (required by at least octave) ln -sf libqhull ${DESTDIR}/usr/include/qhull ln -sf libqhull.h ${DESTDIR}/usr/include/qhull/qhull.h }