Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] qhull: update to 2020.2
@ 2020-12-10 19:34 olafmersmann
  2020-12-10 19:38 ` [PR PATCH] [Updated] " olafmersmann
                   ` (19 more replies)
  0 siblings, 20 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-10 19:34 UTC (permalink / raw)
  To: ml

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

There is a new 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: 4897 bytes --]

From 79e6525b9ba0d62b42b7bd928a4d580228ebebcf 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/6] qhull: update to 2020.2.

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

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 05f15ef7d21..065206df78f 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,14 +1,15 @@
 # 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 <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() {
 	install -Dm644 ${FILESDIR}/qhull.pc ${DESTDIR}/usr/lib/pkgconfig/qhull.pc

From ca1e3d273d92470eca4bdd7f821fc84273030b64 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 2/6] common/shlibs: qhull

---
 common/shlibs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..714692c7e45 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,4 @@ 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

From 8011877e4af27a591c27465126014ecf409ca318 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 3/6] 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 f16348bfaa1b690bd7f36c7c92a8c52f561525e1 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/6] 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 cbe5ad68f630732e300d2112a26b9535b3412afb 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/6] 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 4711fe894427ece201858eafbc8837b7c1ed3bcc 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 6/6] 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"

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR PATCH] [Updated] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
@ 2020-12-10 19:38 ` olafmersmann
  2020-12-10 21:25 ` olafmersmann
                   ` (18 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-10 19:38 UTC (permalink / raw)
  To: ml

[-- 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: 5704 bytes --]

From 79e6525b9ba0d62b42b7bd928a4d580228ebebcf 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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 05f15ef7d21..065206df78f 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,14 +1,15 @@
 # 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 <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() {
 	install -Dm644 ${FILESDIR}/qhull.pc ${DESTDIR}/usr/lib/pkgconfig/qhull.pc

From ca1e3d273d92470eca4bdd7f821fc84273030b64 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 2/7] common/shlibs: qhull

---
 common/shlibs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..714692c7e45 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,4 @@ 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

From 8011877e4af27a591c27465126014ecf409ca318 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 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 f16348bfaa1b690bd7f36c7c92a8c52f561525e1 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] 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 cbe5ad68f630732e300d2112a26b9535b3412afb 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] 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 4711fe894427ece201858eafbc8837b7c1ed3bcc 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 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 2efcd5b85b6b561566bd7a847c2bee26f1294099 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 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 065206df78f..e3324c6fd87 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 <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"

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR PATCH] [Updated] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
  2020-12-10 19:38 ` [PR PATCH] [Updated] " olafmersmann
@ 2020-12-10 21:25 ` olafmersmann
  2020-12-10 21:29 ` olafmersmann
                   ` (17 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-10 21:25 UTC (permalink / raw)
  To: ml

[-- 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: 6263 bytes --]

From 715cac6562d96d2a3681ee1fd6b5a18aa65f8a3b 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 | 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 <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
+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 <olafm@p-value.net>
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 <olafm@p-value.net>
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 <olafm@p-value.net>
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 <olafm@p-value.net>
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 <olafm@p-value.net>
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 <olafm@p-value.net>
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 <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"

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR PATCH] [Updated] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
  2020-12-10 19:38 ` [PR PATCH] [Updated] " olafmersmann
  2020-12-10 21:25 ` olafmersmann
@ 2020-12-10 21:29 ` olafmersmann
  2020-12-14 12:12 ` olafmersmann
                   ` (16 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-10 21:29 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR PATCH] [Updated] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (2 preceding siblings ...)
  2020-12-10 21:29 ` olafmersmann
@ 2020-12-14 12:12 ` olafmersmann
  2020-12-14 12:15 ` olafmersmann
                   ` (15 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-14 12:12 UTC (permalink / raw)
  To: ml

[-- 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: 5645 bytes --]

From 9a654a16e17a4c27977355e566571cbf4f636024 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/6] qhull: update to 2020.2.

---
 common/shlibs          | 5 ++---
 srcpkgs/qhull/template | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 622c7e8d560..11b46a1e614 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2129,9 +2129,8 @@ 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
+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..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 57a479bacfc2bb2794d9ae2e60a8b111fa3156d1 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/6] 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 71a96c4e350a59f3a5b0ba44084d3f3285b295aa 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 3/6] 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 0feeea37d25728626eb1f389b67e75f8bc20b7de 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/6] 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 39a34039f054dcaf98d704e8ab038627d5630cc5 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/6] 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 c8f5177bf42668ef5cfa616d891b69f568ceab9e 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 6/6] 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"

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR PATCH] [Updated] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (3 preceding siblings ...)
  2020-12-14 12:12 ` olafmersmann
@ 2020-12-14 12:15 ` olafmersmann
  2020-12-14 14:22 ` olafmersmann
                   ` (14 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-14 12:15 UTC (permalink / raw)
  To: ml

[-- 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: 4872 bytes --]

From bc66c215c0e4888204ff37be6185ac19990174a3 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/5] qhull: update to 2020.2.

Also fix SPDX license identifier.
---
 common/shlibs          |  5 ++---
 srcpkgs/qhull/template | 11 ++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 622c7e8d560..11b46a1e614 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2129,9 +2129,8 @@ 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
+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..9c4d2209a48 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"
+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() {
+	# 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 7a183f6098d00fdb42ef98b9aaec5af9aa54ae35 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 2/5] 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 5aa35a00237ab1afa5f220844fa9ead3d13ae380 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 3/5] 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 f07a0e86c25262562b31900c290ea8085c60ce2c 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/5] 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 f103fb5a05df41309a3a23ff5143006fcc50145e 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 5/5] 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"

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (4 preceding siblings ...)
  2020-12-14 12:15 ` olafmersmann
@ 2020-12-14 14:22 ` olafmersmann
  2020-12-14 14:22 ` olafmersmann
                   ` (13 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-14 14:22 UTC (permalink / raw)
  To: ml

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

New comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#issuecomment-744472628

Comment:
The build failures seem to stem from the changes in commit b8044ce629 and are unrelated to the changes in this merge request.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (5 preceding siblings ...)
  2020-12-14 14:22 ` olafmersmann
@ 2020-12-14 14:22 ` olafmersmann
  2020-12-14 14:24 ` ericonr
                   ` (12 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-14 14:22 UTC (permalink / raw)
  To: ml

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

New comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#issuecomment-744472628

Comment:
The build failures (`do_check()` for `python3-matplotlib` fails) seem to stem from the changes in commit b8044ce629 and are unrelated to the changes in this merge request.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (6 preceding siblings ...)
  2020-12-14 14:22 ` olafmersmann
@ 2020-12-14 14:24 ` ericonr
  2020-12-14 14:28 ` olafmersmann
                   ` (11 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: ericonr @ 2020-12-14 14:24 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#issuecomment-744474184

Comment:
Try adding `python3-pytest` to `checkdepends` for it.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (7 preceding siblings ...)
  2020-12-14 14:24 ` ericonr
@ 2020-12-14 14:28 ` olafmersmann
  2020-12-14 14:37 ` ericonr
                   ` (10 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-14 14:28 UTC (permalink / raw)
  To: ml

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

New comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#issuecomment-744477200

Comment:
> Try adding `python3-pytest` to `checkdepends` for it.

I tried that in `master`:
```
❯ git diff
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 3940b55d0f..c6acaf5861 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -9,6 +9,7 @@ hostmakedepends="pkg-config python3-setuptools python3-certifi python3-numpy"
 makedepends="python3-devel freetype-devel libpng-devel libqhull-devel"
 depends="python3-certifi python3-cycler python3-kiwisolver
  python3-numpy python3-Pillow python3-parsing python3-dateutil"
+checkdepends="$depends python3-pytest>=3.6"
 short_desc="Python3 2D/3D plotting library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
```
but still get
```
❯ ./xbps-src check -f python3-matplotlib
*snip*
lib/matplotlib/__init__.py:174: in <module>
    _check_versions()
lib/matplotlib/__init__.py:159: in _check_versions
    from . import ft2font
E   ImportError: cannot import name 'ft2font' from partially initialized module 'matplotlib' (most likely due to a circular import) (/builddir
/matplotlib-3.3.3/lib/matplotlib/__init__.py)
=========================== short test summary info ============================
ERROR  - ImportError: cannot import name 'ft2font' from partially initialized...
!!!!!!!!!!!!!!!!!!!! Interrupted: 1 error during collection !!!!!!!!!!!!!!!!!!!!
=============================== 1 error in 0.30s ===============================
=> ERROR: python3-matplotlib-3.3.3_1: do_check: 'python3 -m pytest ${make_check_args} ${make_check_target}' exited with 2
=> ERROR:   in do_check() at common/build-style/python3-module.sh:28
```

I'll investigate further. If I find a solution, it would go into a separate merge request, right?

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (8 preceding siblings ...)
  2020-12-14 14:28 ` olafmersmann
@ 2020-12-14 14:37 ` ericonr
  2020-12-14 21:31 ` [PR PATCH] [Updated] " olafmersmann
                   ` (9 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: ericonr @ 2020-12-14 14:37 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#issuecomment-744483039

Comment:
Not necessary, it can go in this same PR. Specifying a pytest version isn't necessary (and is actually wrong), it will always use the one specified in `srcpkgs/`.

Try cleaning the directories and running `./xbps-src -Q pkg python3-matplotlib` to be sure.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR PATCH] [Updated] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (9 preceding siblings ...)
  2020-12-14 14:37 ` ericonr
@ 2020-12-14 21:31 ` olafmersmann
  2020-12-16 21:18 ` [PR REVIEW] " ahesford
                   ` (8 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-14 21:31 UTC (permalink / raw)
  To: ml

[-- 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: 5773 bytes --]

From a4bbdee40054f760ccbecd8e7261518dd1eb2c8e 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/5] qhull: update to 2020.2.

Also fix SPDX license identifier.
---
 common/shlibs          |  5 ++---
 srcpkgs/qhull/template | 11 ++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..f5d187fc9ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2124,9 +2124,8 @@ 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
+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..9c4d2209a48 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"
+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() {
+	# 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 213b73ef76cad3b89a96a99bc6dcf0caf6b4e815 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 2/5] 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 53fd20db9e5a257d10657bb29e59febe15a427a8 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 3/5] 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 3b99816ccb60f9bf1f9529d70856f4418f980915 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/5] python3-matplotlib: revbump for qhull

Also disable running tests because the fail when matplotlib is built
with system freetype.
---
 srcpkgs/python3-matplotlib/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 3940b55d0f9..3df295a6be9 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"
@@ -9,6 +9,7 @@ hostmakedepends="pkg-config python3-setuptools python3-certifi python3-numpy"
 makedepends="python3-devel freetype-devel libpng-devel libqhull-devel"
 depends="python3-certifi python3-cycler python3-kiwisolver
  python3-numpy python3-Pillow python3-parsing python3-dateutil"
+checkdepends="$depends python3-pytest inkscape ghostscript xvfb-run"
 short_desc="Python3 2D/3D plotting library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
@@ -25,6 +26,12 @@ pre_build() {
 	EOF
 }
 
+# XXX: About 1 in 7 tests fail when built with the system freetype library
+#      because matplotlib ships source-of-truth images in its test suite.
+do_check() {
+	:
+}
+
 post_install() {
 	vdoc "${FILESDIR}/README.voidlinux"
 	vlicense LICENSE/LICENSE

From 9dd6d6636ee04e909695df83fc2e748d54319e1d 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 5/5] 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"

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR REVIEW] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (10 preceding siblings ...)
  2020-12-14 21:31 ` [PR PATCH] [Updated] " olafmersmann
@ 2020-12-16 21:18 ` ahesford
  2020-12-16 21:18 ` ahesford
                   ` (7 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2020-12-16 21:18 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#discussion_r544627803

Comment:
Have you tried dropping the `libqhull` target and removing `${FILESDIR}/qhull.pc` to see if the dependants will link against the non-deprecated `libqhull_r`? If everything we ship links against the new library, we should drop the deprecated, non-default targets.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR REVIEW] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (11 preceding siblings ...)
  2020-12-16 21:18 ` [PR REVIEW] " ahesford
@ 2020-12-16 21:18 ` ahesford
  2020-12-16 21:18 ` ahesford
                   ` (6 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2020-12-16 21:18 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#discussion_r544630003

Comment:
Can you confirm that the "compatibility links" in in `/usr/include` are necessary to build the dependants? If not, they should be dropped.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR REVIEW] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (12 preceding siblings ...)
  2020-12-16 21:18 ` ahesford
@ 2020-12-16 21:18 ` ahesford
  2020-12-17  7:49 ` [PR PATCH] [Updated] " olafmersmann
                   ` (5 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2020-12-16 21:18 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#discussion_r544622775

Comment:
You will need to `vlicense` a copy of this license in `post_install`, as per the terms of the license.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR PATCH] [Updated] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (13 preceding siblings ...)
  2020-12-16 21:18 ` ahesford
@ 2020-12-17  7:49 ` olafmersmann
  2020-12-17  7:51 ` [PR REVIEW] " olafmersmann
                   ` (4 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-17  7:49 UTC (permalink / raw)
  To: ml

[-- 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: 6041 bytes --]

From 1dfd3c3d2d0e267d576d315f29df9ec83b436fc5 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/5] qhull: update to 2020.2.

Also fix SPDX license identifier.
---
 common/shlibs          |  5 ++---
 srcpkgs/qhull/template | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 01cc7e86e1f..9c46b03e3fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2124,9 +2124,8 @@ 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
+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 <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"
-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
 }

From fde1b0055acb12648eabfb20064d07238dc06751 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 2/5] 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 1a0725506377a00ce2538030b7d307f04e6111e3 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 3/5] 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 8311bd48070915176a3f16a2f25d839e1ca58bd3 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/5] python3-matplotlib: revbump for qhull

Also disable running tests because the fail when matplotlib is built
with system freetype.
---
 srcpkgs/python3-matplotlib/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 3940b55d0f9..3df295a6be9 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"
@@ -9,6 +9,7 @@ hostmakedepends="pkg-config python3-setuptools python3-certifi python3-numpy"
 makedepends="python3-devel freetype-devel libpng-devel libqhull-devel"
 depends="python3-certifi python3-cycler python3-kiwisolver
  python3-numpy python3-Pillow python3-parsing python3-dateutil"
+checkdepends="$depends python3-pytest inkscape ghostscript xvfb-run"
 short_desc="Python3 2D/3D plotting library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
@@ -25,6 +26,12 @@ pre_build() {
 	EOF
 }
 
+# XXX: About 1 in 7 tests fail when built with the system freetype library
+#      because matplotlib ships source-of-truth images in its test suite.
+do_check() {
+	:
+}
+
 post_install() {
 	vdoc "${FILESDIR}/README.voidlinux"
 	vlicense LICENSE/LICENSE

From 17da52ad51d0fee7b4194c30bf6efa062b11899c 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 5/5] 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"

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR REVIEW] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (14 preceding siblings ...)
  2020-12-17  7:49 ` [PR PATCH] [Updated] " olafmersmann
@ 2020-12-17  7:51 ` olafmersmann
  2020-12-17  7:52 ` olafmersmann
                   ` (3 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-17  7:51 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#discussion_r544878486

Comment:
Done.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR REVIEW] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (15 preceding siblings ...)
  2020-12-17  7:51 ` [PR REVIEW] " olafmersmann
@ 2020-12-17  7:52 ` olafmersmann
  2020-12-17  7:53 ` olafmersmann
                   ` (2 subsequent siblings)
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-17  7:52 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#discussion_r544879166

Comment:
Yes. At least `octave` and `python3-matplotlib` still require `libqhull`.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR REVIEW] qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (16 preceding siblings ...)
  2020-12-17  7:52 ` olafmersmann
@ 2020-12-17  7:53 ` olafmersmann
  2021-01-06 16:34 ` ahesford
  2021-01-06 17:26 ` [PR PATCH] [Closed]: " ahesford
  19 siblings, 0 replies; 21+ messages in thread
From: olafmersmann @ 2020-12-17  7:53 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#discussion_r544879394

Comment:
Yes, required for `octave`.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (17 preceding siblings ...)
  2020-12-17  7:53 ` olafmersmann
@ 2021-01-06 16:34 ` ahesford
  2021-01-06 17:26 ` [PR PATCH] [Closed]: " ahesford
  19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2021-01-06 16:34 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/27082#issuecomment-755411270

Comment:
I have rolled this into some other updates and will merge soon. The `python3-matplotlib` tests are problematic for several reasons:
- The `PYTHONPATH` would need to be set to find compiled extensions, which is the source of the failure here.
- If you set `PYTHONPATH` to include `build/lib*` where the compiled extensions are, the `matplotlib` module does not include the baseline images needed for the tests.
- Copying the shared objects from `build/lib*` to the corresponding directories of `lib` and setting `PYTHONPATH=lib` allows the tests to run.

Unfortunately, `matplotlib` tests are evaluated by comparing output images to baseline images produced upstream, which is incredibly fragile because of differences in fonts and layout. Just disabling the tests is the right thing to do here.

Of course, if you're disabling tests, there is no value in pulling in `checkdepends`, so I've dropped that change.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PR PATCH] [Closed]: qhull: update to 2020.2
  2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
                   ` (18 preceding siblings ...)
  2021-01-06 16:34 ` ahesford
@ 2021-01-06 17:26 ` ahesford
  19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2021-01-06 17:26 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

qhull: update to 2020.2
https://github.com/void-linux/void-packages/pull/27082

Description:
Update qhull and revbump all reverse dependencies.

^ permalink raw reply	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2021-01-06 17:26 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-10 19:34 [PR PATCH] qhull: update to 2020.2 olafmersmann
2020-12-10 19:38 ` [PR PATCH] [Updated] " olafmersmann
2020-12-10 21:25 ` olafmersmann
2020-12-10 21:29 ` olafmersmann
2020-12-14 12:12 ` olafmersmann
2020-12-14 12:15 ` olafmersmann
2020-12-14 14:22 ` olafmersmann
2020-12-14 14:22 ` olafmersmann
2020-12-14 14:24 ` ericonr
2020-12-14 14:28 ` olafmersmann
2020-12-14 14:37 ` ericonr
2020-12-14 21:31 ` [PR PATCH] [Updated] " olafmersmann
2020-12-16 21:18 ` [PR REVIEW] " ahesford
2020-12-16 21:18 ` ahesford
2020-12-16 21:18 ` ahesford
2020-12-17  7:49 ` [PR PATCH] [Updated] " olafmersmann
2020-12-17  7:51 ` [PR REVIEW] " olafmersmann
2020-12-17  7:52 ` olafmersmann
2020-12-17  7:53 ` olafmersmann
2021-01-06 16:34 ` ahesford
2021-01-06 17:26 ` [PR PATCH] [Closed]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).