Re: [PR PATCH] [Updated] qhull: update to 2020.2

[olafmersmann <olafmersmann@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

There is an updated pull request by olafmersmann against master on the void-packages repository

https://github.com/olafmersmann/void-packages qhull
https://github.com/void-linux/void-packages/pull/27082

qhull: update to 2020.2
Update qhull and revbump all reverse dependencies.

A patch file from https://github.com/void-linux/void-packages/pull/27082.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qhull-27082.patch --]
[-- Type: text/x-diff, Size: 6047 bytes --]

From a06e091ec5266fdecf896ac8cce88ea2cae63b79 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 10 Dec 2020 20:25:57 +0100
Subject: [PATCH 1/7] qhull: update to 2020.2.

---
 srcpkgs/qhull/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 05f15ef7d21..2980e3003ed 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
+make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 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
 
 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

From 7be3c3a5c30ee544456429f500e1f5f919898d3d Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 10 Dec 2020 20:38:14 +0100
Subject: [PATCH 2/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 2980e3003ed..9c4d2209a48 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -6,7 +6,7 @@ build_style=cmake
 make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-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"

From b071f784d06b614dfe3e8d605b2f444ab383a686 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 10 Dec 2020 20:28:02 +0100
Subject: [PATCH 3/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 240ad40a7b9780bfd3167e33bf6e8a767e01ffb1 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 10 Dec 2020 20:30:41 +0100
Subject: [PATCH 4/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 826ae1d87becc0bae1d98445750de9442aaee6e3 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 10 Dec 2020 20:30:41 +0100
Subject: [PATCH 5/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 c9dbada9c61bd603e41ff47a9497aabc5d09cb8f Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 10 Dec 2020 20:30:41 +0100
Subject: [PATCH 6/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 d93378b9bf5b36dbf4ce6f4a835e66f80a89164f Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Thu, 10 Dec 2020 20:32:46 +0100
Subject: [PATCH 7/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"