Re: [PR PATCH] [Updated] giac: makedepend on mpfr-devel and pari-devel

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

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

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

https://github.com/tornaria/void-packages giac
https://github.com/void-linux/void-packages/pull/29141

giac: makedepend on mpfr-devel and pari-devel
 - mpfr is used for arbitrary precision floats, otherwise they are
   limited to double precision (53 bits ~ 13 digits)

 - pari is used for number theory functions

In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.

With this commit, make check goes from 12 tests failed to 1 test failed.

See #28989.

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

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

From eac54a22082671c4ba3e575752fdb4e9f68341fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Feb 2021 20:02:13 -0300
Subject: [PATCH 1/2] giac: makedepend on mpfr-devel and pari-devel

 - mpfr is used for arbitrary precision floats, otherwise they are
   limited to double precision (53 bits ~ 13 digits)

 - pari is used for number theory functions

In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.

With this commit, make check goes from 12 tests failed to 1 test failed.

See #28989.
---
 common/shlibs                        |  1 +
 srcpkgs/giac/patches/pari_2_11.patch | 17 +++++++++++++++++
 srcpkgs/giac/template                |  4 ++--
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/giac/patches/pari_2_11.patch

diff --git a/common/shlibs b/common/shlibs
index 959f1692961..0e5287889f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,3 +3924,4 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libtree-sitter.so.0 tree-sitter-0.18.2_1
+libpari-gmp.so.7 pari-2.13.0_1
diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch
new file mode 100644
index 00000000000..7bd12dd1ce7
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- check/TP11-sol.cas.out1	2014-10-21 10:51:48.000000000 +0200
++++ check/TP11-sol.cas.out1	2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ba2d1a55b73..2eb82c5d62b 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,11 +1,11 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=3
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
- libjpeg-turbo-devel libpng-devel readline-devel"
+ libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Free computer algebra system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 89889c65403f558567dabc163bb95961e0734f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 2 Mar 2021 18:25:47 -0300
Subject: [PATCH 2/2] giac: fix stack size issue in musl

---
 srcpkgs/giac/patches/stacksize.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/giac/patches/stacksize.patch

diff --git a/srcpkgs/giac/patches/stacksize.patch b/srcpkgs/giac/patches/stacksize.patch
new file mode 100644
index 00000000000..3f700f6638d
--- /dev/null
+++ b/srcpkgs/giac/patches/stacksize.patch
@@ -0,0 +1,11 @@
+--- src/gen.cc.orig	2020-02-10 16:46:44.000000000 -0300
++++ src/gen.cc	2021-03-02 18:19:23.426972309 -0300
+@@ -11803,7 +11803,7 @@
+ 	return 1;
+       }
+     }
+-#if !defined(WIN32) && defined(HAVE_PTHREAD_H)
++#if !defined(WIN32) && defined(HAVE_PTHREAD_H) && defined __GLIBC__
+     if (contextptr && thread_param_ptr(contextptr)->stackaddr && thread_param_ptr(contextptr)->stacksize/2){
+       gen er;
+       short int err=s.size();