[PR PATCH] giac: update to 1.7.0.25.

[PR PATCH] giac: update to 1.7.0.25.

[tornaria]

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

There is a new 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/32558

giac: update to 1.7.0.25.
<!-- Mark items with [x] where applicable -->
- [x] I generally don't use the affected packages but briefly tested this PR


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

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

From 4065eff629483ffb533d9e26ad6e3e78f3a61a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 11 Aug 2021 19:39:04 -0300
Subject: [PATCH] giac: update to 1.7.0.25.

---
 srcpkgs/giac/patches/malloc.patch    |  6 +++---
 srcpkgs/giac/patches/pari_2_13.patch | 16 ----------------
 srcpkgs/giac/template                |  7 ++++---
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch

diff --git a/srcpkgs/giac/patches/malloc.patch b/srcpkgs/giac/patches/malloc.patch
index fed46d63d736..52d70e0ad21b 100644
--- a/srcpkgs/giac/patches/malloc.patch
+++ b/srcpkgs/giac/patches/malloc.patch
@@ -1,11 +1,11 @@
 --- a/src/History.cc	2017-10-02 10:23:46.000000000 +0200
 +++ b/src/History.cc	2017-11-14 15:42:12.119849965 +0100
-@@ -3828,7 +3828,7 @@
+@@ -4633,7 +4633,7 @@
        // mode_s += "Time: ";
        // double t=double(clock());
        // mode_s += xcas::print_DOUBLE_(t/CLOCKS_PER_SEC);
--#ifdef HAVE_MALLOC_H //
-+#if defined HAVE_MALLOC_H && defined __GLIBC__ //
+-#if defined(HAVE_MALLOC_H) && !defined(__MINGW_H)
++#if defined(HAVE_MALLOC_H) && !defined(__MINGW_H) && defined(__GLIBC__)
        struct mallinfo mem=mallinfo();
        double memd=mem.arena+mem.hblkhd;
        mode_s +=xcas::print_DOUBLE_(memd/1048576);
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..3fc5eb17c661 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,9 +1,10 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.5.0.87
-revision=5
+version=1.7.0.25
+revision=1
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
+configure_args="--disable-micropy --disable-quickjs"
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
  libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
 depends="desktop-file-utils hicolor-icon-theme"
@@ -12,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4
+checksum=948dfc369f22ca068ff29be7222eb8e7aea3f004b0541f87b8a5591735d42134
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"

Re: giac: update to 1.7.0.25.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32558#issuecomment-900650049

Comment:
I've compiled sage-9.4.rc1 with this version of giac, and it seems to work ok. All the sage testsuite passes except for a single test in `src/sage/symbolic/integration/integral.py` which is a false alarm and already fixed upstream https://trac.sagemath.org/ticket/32275.

This PR is roughly the same as the giac part of #29635, but updated to the more recent version of giac.

Re: [PR REVIEW] giac: update to 1.7.0.25.

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32558#discussion_r690855796

Comment:
They could just test for the function instead of the header >.<

Re: giac: update to 1.7.0.25.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32558#issuecomment-900767378

Comment:
LGTM, will allow @dkwo to manifest if they wish to.

Re: giac: update to 1.7.0.25.

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/32558#issuecomment-900943852

Comment:
Looks good to me.

Re: [PR REVIEW] giac: update to 1.7.0.25.

[tornaria]

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

New review comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/32558#discussion_r691304177

Comment:
This means adding `AC_CHECK_FUNCS(mallinfo)` in `configure.ac` and replacing the test by `#ifdef HAVE_MALLINFO` or something like that?

I think the few cases where they check `HAVE_MALLOC_H` is just to use`mallinfo()`.

Is it worth doing that for us, or proposing it to upstream? It seems a chore having to deal with autoconf since the patch above works ok for us.

Re: [PR REVIEW] giac: update to 1.7.0.25.

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32558#discussion_r691317275

Comment:
Oh, really only for upstream. The patch is definitely good enough for our packaging :)

Re: [PR PATCH] [Merged]: giac: update to 1.7.0.25.

[ericonr]

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

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

giac: update to 1.7.0.25.
https://github.com/void-linux/void-packages/pull/32558

Description:
<!-- Mark items with [x] where applicable -->
- [x] I generally don't use the affected packages but briefly tested this PR