From 4065eff629483ffb533d9e26ad6e3e78f3a61a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= 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 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 " 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"