From 8c2ba72477faf6e59c3e47b0a088ad09eb2238bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 18 Sep 2023 16:09:45 -0300 Subject: [PATCH] giac: update to 1.9.0.59. --- srcpkgs/giac/patches/fix-chk_fhan0.patch | 8 ++-- srcpkgs/giac/patches/fix-fgamma.patch | 40 ------------------- .../giac/patches/giac-pari-2.15-test.patch | 10 ----- srcpkgs/giac/template | 6 +-- 4 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 srcpkgs/giac/patches/fix-fgamma.patch delete mode 100644 srcpkgs/giac/patches/giac-pari-2.15-test.patch diff --git a/srcpkgs/giac/patches/fix-chk_fhan0.patch b/srcpkgs/giac/patches/fix-chk_fhan0.patch index 0a6bcb550ea9a..6546fca90c681 100644 --- a/srcpkgs/giac/patches/fix-chk_fhan0.patch +++ b/srcpkgs/giac/patches/fix-chk_fhan0.patch @@ -1,5 +1,5 @@ --- 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 ++++ b/check/TP00-sol.cas.out1 2023-09-18 16:20:51.417477469 -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, @@ -8,8 +8,8 @@ +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), +-4.0*(x+0.50000000000000423695020762139072415632649460476103935691753889574803974870605)*(x+0.49999999999999788328925430029686609811928022330782155585549767058946497075172)*(x^2-0.61803398874989484820458683436563811772030917980576286213544862270526046281890*x+1.0000000000000000000000000000000000000000000000000000000000000000000000000000)*(x^2+1.6180339887498948482045868343656381177203091798057628621354486227052604628189*x+1.0000000000000000000000000000000000000000000000000000000000000000000000000000), ++4.0*(x+0.50000000000000423695020762139072415632649460476116514103247668021485588860239)*(x+0.49999999999999788328925430029686609811928022330776429539642815014895119703600)*(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), + (X-1)*(X+1)*(X-I)*(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)*(X+(I*3-3*sqrt(3))/6)*(X+(I*sqrt(3)-1)/2)*(X+I)*(X+(I*sqrt(3)+1)/2)*(X+(I*3+3*sqrt(3))/6), diff --git a/srcpkgs/giac/patches/fix-fgamma.patch b/srcpkgs/giac/patches/fix-fgamma.patch deleted file mode 100644 index 05101e310d1be..0000000000000 --- a/srcpkgs/giac/patches/fix-fgamma.patch +++ /dev/null @@ -1,40 +0,0 @@ -Adapted from -https://github.com/geogebra/giac/commit/618a5de3349f8def5bdb909fea42fb447b6aad4a - ---- a/src/usual.cc -+++ b/src/usual.cc -@@ -81,6 +81,16 @@ using namespace std; - #define sprintf256 sprintf - #endif - -+#if defined HAVE_TGAMMAF || defined __APPLE__ || defined EMCC || defined EMCC2 || defined NO_BSD -+inline float fgamma(float f1){ return tgammaf(f1); } -+#else -+#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 -+#endif -+#endif -+ - #ifndef NO_NAMESPACE_GIAC - namespace giac { - #endif // ndef NO_NAMESPACE_GIAC ---- a/src/first.h -+++ b/src/first.h -@@ -578,15 +578,6 @@ inline float ffloor(float f1){ - #endif - } - inline float finv(float f1){ return 1/f1; } --#if defined HAVE_TGAMMAF || defined __APPLE__ || defined EMCC || defined EMCC2 || defined NO_BSD --inline float fgamma(float f1){ return tgammaf(f1); } --#else --#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 --#endif --#endif - #ifdef FXCG - inline float atan2f(float f1,float f2,int rad){ if (rad) return std::atan2(f1,f2); else return std::atan2(f1,f2)*180/3.14159265358979323846;} - #else diff --git a/srcpkgs/giac/patches/giac-pari-2.15-test.patch b/srcpkgs/giac/patches/giac-pari-2.15-test.patch deleted file mode 100644 index 1f1929571a46b..0000000000000 --- a/srcpkgs/giac/patches/giac-pari-2.15-test.patch +++ /dev/null @@ -1,10 +0,0 @@ -Fix a failing test due to thread stack overflow - ---- a/check/chk_fhan4 2018-03-13 15:27:11.000000000 -0300 -+++ b/check/chk_fhan4 2022-10-14 18:51:12.604731890 -0300 -@@ -1,4 +1,5 @@ - #! /bin/sh - unset LANG -+export PARI_SIZE=2048000 - ../src/icas TP04-sol.cas > TP04.tst - diff TP04.tst TP04-sol.cas.out1 diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template index 2bf270458e53a..5279a82f47056 100644 --- a/srcpkgs/giac/template +++ b/srcpkgs/giac/template @@ -1,7 +1,7 @@ # Template file for 'giac' pkgname=giac -version=1.9.0.57 -revision=2 +version=1.9.0.59 +revision=1 build_style=gnu-configure configure_args="--disable-micropy --disable-quickjs" hostmakedepends="automake gettext-devel libtool" @@ -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=b81f9a24646be4989e68faf12cb8bdae3688f0440bec2e1a62e97af702684c1b +checksum=c5b1ba93f42e758f46d541b28d9350f165eaf8c459bdea80f4a73a72d43c10de # need more than 4*65536 stack, see try_parse() in gen.cc line 11812 LDFLAGS="-Wl,-z,stack-size=2097152"