From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] arb: update to 2.21.0.
Date: Tue, 28 Sep 2021 21:26:04 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33170@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 738 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages arb
https://github.com/void-linux/void-packages/pull/33170
arb: update to 2.21.0.
I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- Added a (temporary) patch to fix test on 32bit, already merged upstream, see https://github.com/fredrik-johansson/arb/issues/379
- conditional for musl not needed anymore after https://github.com/fredrik-johansson/arb/commit/c713d91280472d572fc43a64db43def73d650d11 (see https://github.com/fredrik-johansson/arb/pull/376)
A patch file from https://github.com/void-linux/void-packages/pull/33170.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-arb-33170.patch --]
[-- Type: text/x-diff, Size: 4171 bytes --]
From e426549975f72612d2363c97e05425e49162d07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 28 Sep 2021 15:34:48 -0300
Subject: [PATCH] arb: update to 2.21.0.
---
...35a84a40acc1871cd84f1caf2ea47c11a18c.patch | 73 +++++++++++++++++++
srcpkgs/arb/template | 9 +--
2 files changed, 76 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/arb/patches/450435a84a40acc1871cd84f1caf2ea47c11a18c.patch
diff --git a/srcpkgs/arb/patches/450435a84a40acc1871cd84f1caf2ea47c11a18c.patch b/srcpkgs/arb/patches/450435a84a40acc1871cd84f1caf2ea47c11a18c.patch
new file mode 100644
index 000000000000..179ba8887f32
--- /dev/null
+++ b/srcpkgs/arb/patches/450435a84a40acc1871cd84f1caf2ea47c11a18c.patch
@@ -0,0 +1,73 @@
+From 450435a84a40acc1871cd84f1caf2ea47c11a18c Mon Sep 17 00:00:00 2001
+From: fredrik <fredrik.johansson@gmail.com>
+Date: Tue, 28 Sep 2021 12:07:45 +0200
+Subject: [PATCH] fix (hopefully) spurious test failures for gamma_fmpq
+
+---
+ arb_hypgeom/gamma_fmpq.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/arb_hypgeom/gamma_fmpq.c b/arb_hypgeom/gamma_fmpq.c
+index 996a87e5..ee750d0d 100644
+--- a/arb_hypgeom/gamma_fmpq.c
++++ b/arb_hypgeom/gamma_fmpq.c
+@@ -529,22 +529,22 @@ arb_hypgeom_gamma_fmpq_outward(arb_t y, const fmpq_t x, slong prec)
+
+ if (q == 1 || q == 2 || q == 3 || q == 4 || q == 6)
+ {
+- arb_hypgeom_gamma_small_frac(t, p, q, prec);
++ arb_hypgeom_gamma_small_frac(t, p, q, prec + 4 * (m != 0));
+ }
+ else
+ {
+- arb_hypgeom_gamma_fmpq_hyp(t, a, prec);
++ arb_hypgeom_gamma_fmpq_hyp(t, a, prec + 4 * (m != 0));
+ }
+
+ /* argument reduction */
+ if (m >= 0)
+ {
+- arb_rising_fmpq_ui(u, a, m, prec);
++ arb_rising_fmpq_ui(u, a, m, prec + 4);
+ arb_mul(y, t, u, prec);
+ }
+ else
+ {
+- arb_rising_fmpq_ui(u, x, -m, prec);
++ arb_rising_fmpq_ui(u, x, -m, prec + 4);
+ arb_div(y, t, u, prec);
+ }
+
+@@ -602,7 +602,7 @@ arb_hypgeom_gamma_fmpq_taylor(arb_t y, const fmpq_t x, slong prec)
+ }
+
+ arb_set_fmpq(t, a, prec + 4);
+- success = arb_hypgeom_gamma_taylor(t, t, 0, prec);
++ success = arb_hypgeom_gamma_taylor(t, t, 0, prec + 4);
+
+ if (success)
+ {
+@@ -611,12 +611,12 @@ arb_hypgeom_gamma_fmpq_taylor(arb_t y, const fmpq_t x, slong prec)
+
+ if (m >= 0)
+ {
+- arb_rising_fmpq_ui(u, a, m, prec);
++ arb_rising_fmpq_ui(u, a, m, prec + 4);
+ arb_mul(y, t, u, prec);
+ }
+ else
+ {
+- arb_rising_fmpq_ui(u, x, -m, prec);
++ arb_rising_fmpq_ui(u, x, -m, prec + 4);
+ arb_div(y, t, u, prec);
+ }
+
+@@ -684,7 +684,7 @@ arb_hypgeom_gamma_fmpq(arb_t y, const fmpq_t x, slong prec)
+ wp = (slong) fmpz_bits(fmpq_numref(x)) - (slong) fmpz_bits(fmpq_denref(x));
+ wp = FLINT_MAX(wp, 0);
+ wp = FLINT_MIN(wp, 4 * prec);
+- wp += prec;
++ wp += prec + 4;
+
+ arb_set_fmpq(y, x, wp);
+
diff --git a/srcpkgs/arb/template b/srcpkgs/arb/template
index f195d8babf12..2c6981319352 100644
--- a/srcpkgs/arb/template
+++ b/srcpkgs/arb/template
@@ -1,6 +1,6 @@
# Template file for 'arb'
pkgname=arb
-version=2.20.0
+version=2.21.0
revision=1
build_style=configure
configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr --with-flint=/usr"
@@ -10,12 +10,9 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="LGPL-2.1-or-later"
homepage="https://arblib.org"
distfiles="https://github.com/fredrik-johansson/arb/archive/${version}.tar.gz"
-checksum=d2f186b10590c622c11d1ca190c01c3da08bac9bc04e84cb591534b917faffe7
+checksum=6493ebcfb1772458db4ca66da4c5536968484a3815cf75d2bb33c600b4471910
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- # on glibc this would give a conflict with function fdiv()
- CFLAGS="-D_GNU_SOURCE" # needed for cpu_set_t
-fi
+CFLAGS="-D_GNU_SOURCE" # needed for cpu_set_t
arb-devel_package() {
depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
next reply other threads:[~2021-09-28 19:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 19:26 tornaria [this message]
2021-09-28 19:35 ` tornaria
2021-09-28 20:53 ` Chocimier
2021-09-29 18:39 ` [PR PATCH] [Merged]: " ericonr
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33170@inbox.vuxu.org \
--to=tornaria@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).