From 7daf263696ea5a5a3d048a15ff6bcb431a3e7e22 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.55. --- srcpkgs/giac/patches/fix-1.9.0.55.patch | 31 ++++++++++++++++++++++++ srcpkgs/giac/patches/fix-chk_fhan0.patch | 15 ++++++++++++ srcpkgs/giac/template | 4 +-- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/giac/patches/fix-1.9.0.55.patch create mode 100644 srcpkgs/giac/patches/fix-chk_fhan0.patch diff --git a/srcpkgs/giac/patches/fix-1.9.0.55.patch b/srcpkgs/giac/patches/fix-1.9.0.55.patch new file mode 100644 index 000000000000..b4e2a77614db --- /dev/null +++ b/srcpkgs/giac/patches/fix-1.9.0.55.patch @@ -0,0 +1,31 @@ +See: https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2875#p12762 + +--- a/src/gen.cc 2023-05-24 04:52:40.000000000 -0300 ++++ b/src/gen.cc 2023-06-19 12:34:19.490705892 -0300 +@@ -16952,14 +16952,14 @@ + } + + gen nws_ans=0; +- gen replace_ans(const gen & g){ ++ gen replace_ans(const gen & g,GIAC_CONTEXT){ + if (g==at_ans) + return nws_ans; + if (g.type==_VECT) +- return apply(*g._VECTptr,replace_ans); ++ return apply(*g._VECTptr,replace_ans,contextptr); + if (g.type!=_SYMB) + return g; +- return symbolic(g._SYMBptr->sommet,replace_ans(g._SYMBptr->feuille)); ++ return symbolic(g._SYMBptr->sommet,replace_ans(g._SYMBptr->feuille,contextptr)); + } + + const char * nws_caseval(const char * s){ +@@ -16999,7 +16999,7 @@ + else + g=gen(v,g.subtype); + } +- g=replace_ans(g); ++ g=replace_ans(g,contextptr); + #if 0 // def EMCC + EM_ASM({ + var value = UTF8ToString($0); 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/template b/srcpkgs/giac/template index 4979287c40bf..229cb128d8a3 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.55 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=eabcf6f85bea35d175710654523ebd37546e3def09c7476232891266c1c25858 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812 LDFLAGS="-Wl,-z,stack-size=2097152"