From: olafmersmann <olafmersmann@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] qhull: update to 2020.2
Date: Thu, 17 Dec 2020 08:49:50 +0100 [thread overview]
Message-ID: <20201217074950.LFq_VR4qV1xnClmIUknUIxjcHrMNirg0TVv10AVgncU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27082@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2020-12-17 7:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 19:34 [PR PATCH] " 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 ` olafmersmann [this message]
2020-12-17 7:51 ` 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201217074950.LFq_VR4qV1xnClmIUknUIxjcHrMNirg0TVv10AVgncU@z \
--to=olafmersmann@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).