From 1660a6fba09bbbb3043337632e197d55a6784daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 19 Jun 2023 11:59:56 -0300 Subject: [PATCH] giac: update to 1.9.0.57. --- srcpkgs/giac/patches/fgamma.patch | 11 ----------- srcpkgs/giac/patches/fix-chk_fhan0.patch | 15 +++++++++++++++ srcpkgs/giac/patches/invmod.patch | 14 -------------- srcpkgs/giac/patches/malloc.patch | 11 ----------- srcpkgs/giac/patches/pari_2_11.patch | 17 ----------------- srcpkgs/giac/template | 4 ++-- 6 files changed, 17 insertions(+), 55 deletions(-) delete mode 100644 srcpkgs/giac/patches/fgamma.patch create mode 100644 srcpkgs/giac/patches/fix-chk_fhan0.patch delete mode 100644 srcpkgs/giac/patches/invmod.patch delete mode 100644 srcpkgs/giac/patches/malloc.patch delete mode 100644 srcpkgs/giac/patches/pari_2_11.patch diff --git a/srcpkgs/giac/patches/fgamma.patch b/srcpkgs/giac/patches/fgamma.patch deleted file mode 100644 index 8cdc5fda88ac..000000000000 --- a/srcpkgs/giac/patches/fgamma.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/first.h 2017-09-22 20:44:12.000000000 +0200 -+++ b/src/first.h 2017-11-14 15:26:53.529711489 +0100 -@@ -503,7 +503,7 @@ - #if defined(__MINGW_H) || defined(VISUALC) || defined(FXCG)// FIXME gamma, not used - inline float fgamma(float f1){ return f1; } - #else --inline float fgamma(float f1){ return gammaf(f1); } // or tgammaf(f1) on some versions of emscripten -+inline float fgamma(float f1){ return tgammaf(f1); } // or tgammaf(f1) on some versions of emscripten - #endif - #endif - inline float atan2f(float f1,float f2,int rad){ if (rad) return atan2f(f1,f2); else return atan2f(f1,f2)*180/M_PI;} diff --git a/srcpkgs/giac/patches/fix-chk_fhan0.patch b/srcpkgs/giac/patches/fix-chk_fhan0.patch new file mode 100644 index 000000000000..0a6bcb550ea9 --- /dev/null +++ b/srcpkgs/giac/patches/fix-chk_fhan0.patch @@ -0,0 +1,15 @@ +--- a/check/TP00-sol.cas.out1 2023-05-24 04:52:40.000000000 -0300 ++++ b/check/TP00-sol.cas.out1 2023-06-19 12:37:18.879967077 -0300 +@@ -30,10 +30,10 @@ + 16*a^3+32*a^2*u+16*a^2*v+20*a*u^2+20*a*u*v+4*a*v^2+4*u^3+6*u^2*v+2*u*v^2, + 1, + 4.4*(x+0.49999995802767719425726646262389673108)*(x+0.50000004197233049305707985262184456402)*(x+0.80901699437494469055404981865454965242+0.58778525229247103432520509730405154890*I)*(x+0.80901699437494469055404981865454965242-0.58778525229247103432520509730405154890*I)*(x-0.30901699437494853421122297627742029997+0.95105651629515245315101034450709359529*I)*(x-0.30901699437494853421122297627742029997-0.95105651629515245315101034450709359529*I), +-4.0*(x+0.49999999999999788328925430029686609811928022330782155585549767058946497075172)*(x+0.80901699437494742410229341718281905886015458990288143106772431135263023140945+0.58778525229247312916870595463907276859765243764314599107227248075727847416235*I)*(x+0.80901699437494742410229341718281905886015458990288143106772431135263023140945-0.58778525229247312916870595463907276859765243764314599107227248075727847416235*I)*(x-0.30901699437494742410229341718281905886015458990288143106772431135263023140945+0.95105651629515357211643933337938214340569863412575022244730564443015317008520*I)*(x-0.30901699437494742410229341718281905886015458990288143106772431135263023140945-0.95105651629515357211643933337938214340569863412575022244730564443015317008520*I)*(x+0.50000000000000423695020762139072415632649460476103935691753889574803974870605+0.31797400722558614463582272906881192689588258358870001378007305967449842289426e-15*I), ++4.0*(x+0.49999999999999788328925430029686609811928022330776429539642815014895119703600)*(x+0.80901699437494742410229341718281905886015458990288143106772431135263023140945+0.58778525229247312916870595463907276859765243764314599107227248075727847416235*I)*(x+0.80901699437494742410229341718281905886015458990288143106772431135263023140945-0.58778525229247312916870595463907276859765243764314599107227248075727847416235*I)*(x-0.30901699437494742410229341718281905886015458990288143106772431135263023140945+0.95105651629515357211643933337938214340569863412575022244730564443015317008520*I)*(x-0.30901699437494742410229341718281905886015458990288143106772431135263023140945-0.95105651629515357211643933337938214340569863412575022244730564443015317008520*I)*(x+0.50000000000000423695020762139072415632649460476116514103247668021485588860239+0.31797400722558614463582272906881240871924499768158244356057150473500445334981e-15*I), + 0, + (2*x+1)^2*(x^4+x^3+x^2+x+1), +-4.0*(x+0.49999999999999788328925430029686609811928022330782155585549767058946497075172)*(x+0.50000000000000423695020762139072415632649460476103935691753889574803974870605+0.31797400722558614463582272906881192689588258358870001378007305967449842289426e-15*I)*(x^2-0.61803398874989484820458683436563811772030917980576286213544862270526046281890*x+1.0000000000000000000000000000000000000000000000000000000000000000000000000000)*(x^2+1.6180339887498948482045868343656381177203091798057628621354486227052604628189*x+1.0000000000000000000000000000000000000000000000000000000000000000000000000000), ++4.0*(x+0.49999999999999788328925430029686609811928022330776429539642815014895119703600)*(x+0.50000000000000423695020762139072415632649460476116514103247668021485588860239+0.31797400722558614463582272906881240871924499768158244356057150473500445334981e-15*I)*(x^2-0.61803398874989484820458683436563811772030917980576286213544862270526046281890*x+1.0000000000000000000000000000000000000000000000000000000000000000000000000000)*(x^2+1.6180339887498948482045868343656381177203091798057628621354486227052604628189*x+1.0000000000000000000000000000000000000000000000000000000000000000000000000000), + (2*x+1)^2*(x^4+x^3+x^2+x+1), + (X-1)*(X+1)*(X^2+1)*(X^2+(-sqrt(3))*X+1)*(X^2-X+1)*(X^2+X+1)*(X^2+sqrt(3)*X+1), + (X-1)*(X+1)*(X-I)*(X+((-I)*sqrt(3)-1)/2)*(X+((-I)*3+3*sqrt(3))/6)*(X+(I*3-3*sqrt(3))/6)*(X+I)*(X+(I*sqrt(3)+1)/2)*(X+((-I)*sqrt(3)+1)/2)*(X+((-I)*3-3*sqrt(3))/6)*(X+(I*sqrt(3)-1)/2)*(X+(I*3+3*sqrt(3))/6), diff --git a/srcpkgs/giac/patches/invmod.patch b/srcpkgs/giac/patches/invmod.patch deleted file mode 100644 index 1d87fff8ea0e..000000000000 --- a/srcpkgs/giac/patches/invmod.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/modpoly.cc 2020-02-18 10:07:10.000000000 -0300 -+++ b/src/modpoly.cc 2021-03-08 02:18:09.443740199 -0300 -@@ -92,7 +92,10 @@ - gen invenv(const gen & g,environment * env){ - if (g.type==_USER) - return g._USERptr->inv(); -- return invmod(g,env->modulo); -+ if (env->moduloon) -+ return invmod(g,env->modulo); -+ else -+ return gen(1)/g; - } - - /* diff --git a/srcpkgs/giac/patches/malloc.patch b/srcpkgs/giac/patches/malloc.patch deleted file mode 100644 index 52d70e0ad21b..000000000000 --- a/srcpkgs/giac/patches/malloc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/History.cc 2017-10-02 10:23:46.000000000 +0200 -+++ b/src/History.cc 2017-11-14 15:42:12.119849965 +0100 -@@ -4633,7 +4633,7 @@ - // mode_s += "Time: "; - // double t=double(clock()); - // mode_s += xcas::print_DOUBLE_(t/CLOCKS_PER_SEC); --#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_11.patch b/srcpkgs/giac/patches/pari_2_11.patch deleted file mode 100644 index 24142257a340..000000000000 --- a/srcpkgs/giac/patches/pari_2_11.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 ---- a/check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200 -+++ b/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 4979287c40bf..6ba75e6372fd 100644 --- a/srcpkgs/giac/template +++ b/srcpkgs/giac/template @@ -1,6 +1,6 @@ # Template file for 'giac' pkgname=giac -version=1.9.0.49 +version=1.9.0.57 revision=1 build_style=gnu-configure configure_args="--disable-micropy --disable-quickjs" @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new" distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz" -checksum=b9cd59b52b261a1598ab95bcd2d4b3f7ce1f90b226a9e5ad19e6e200b6f39147 +checksum=b81f9a24646be4989e68faf12cb8bdae3688f0440bec2e1a62e97af702684c1b # need more than 4*65536 stack, see try_parse() in gen.cc line 11812 LDFLAGS="-Wl,-z,stack-size=2097152"