diff --git a/build/pkgs/giac/checksums.ini b/build/pkgs/giac/checksums.ini index f01435d5423..2fb1d3fdf31 100644 --- a/build/pkgs/giac/checksums.ini +++ b/build/pkgs/giac/checksums.ini @@ -1,5 +1,5 @@ tarball=giac-VERSION.tar.bz2 -sha1=b0e81969eb2527964efc802bf35c31d140031571 -md5=f8253082e5dcde5724b4d6f2300d8669 -cksum=3973759340 -upstream_url=https://trac.sagemath.org/raw-attachment/ticket/31562/giac-VERSION.tar.bz2 +sha1=78c15badd19b49b7d111ac204b611a4378ce3d15 +md5=8fbd43a5c60848b6813b7fc8698a0199 +cksum=1923149665 +upstream_url=https://trac.sagemath.org/raw-attachment/ticket/31563/giac-VERSION.tar.bz2 diff --git a/build/pkgs/giac/dependencies b/build/pkgs/giac/dependencies index 9a60603c750..a051202507e 100644 --- a/build/pkgs/giac/dependencies +++ b/build/pkgs/giac/dependencies @@ -1,4 +1,4 @@ -readline libpng $(MP_LIBRARY) mpfr mpfi ntl gsl pari glpk curl cliquer $(findstring libnauty,$(OPTIONAL_INSTALLED_PACKAGES)) +readline libpng $(MP_LIBRARY) mpfr mpfi ntl gsl pari glpk curl cliquer ecm $(findstring libnauty,$(OPTIONAL_INSTALLED_PACKAGES)) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/giac/package-version.txt b/build/pkgs/giac/package-version.txt index f490da152c5..ff6a74aad02 100644 --- a/build/pkgs/giac/package-version.txt +++ b/build/pkgs/giac/package-version.txt @@ -1 +1 @@ -1.6.0.47p3.p0 +1.9.0.15p0 diff --git a/build/pkgs/giac/patches/0001-src-global.cc-Do-not-send-SIGINT-to-process-1.patch b/build/pkgs/giac/patches/0001-src-global.cc-Do-not-send-SIGINT-to-process-1.patch index 5ab40921c98..ca33e850d2e 100644 --- a/build/pkgs/giac/patches/0001-src-global.cc-Do-not-send-SIGINT-to-process-1.patch +++ b/build/pkgs/giac/patches/0001-src-global.cc-Do-not-send-SIGINT-to-process-1.patch @@ -11,10 +11,10 @@ diff --git a/src/global.cc b/src/global.cc index c343aea..87e4575 100755 --- a/src/global.cc +++ b/src/global.cc -@@ -1978,7 +1978,7 @@ extern "C" void Sleep(unsigned int miliSecond); +@@ -3762,7 +3762,7 @@ extern "C" void Sleep(unsigned int miliSecond); void ctrl_c_signal_handler(int signum){ ctrl_c=true; - #if !defined KHICAS && !defined NSPIRE_NEWLIB && !defined WIN32 && !defined BESTA_OS && !defined NSPIRE && !defined FXCG && !defined POCKETCAS + #if !defined KHICAS && !defined NSPIRE_NEWLIB && !defined WIN32 && !defined BESTA_OS && !defined NSPIRE && !defined FXCG && !defined POCKETCAS && !defined __MINGW_H - if (child_id) + if (child_id && child_id != 1) kill(child_id,SIGINT); diff --git a/build/pkgs/giac/patches/autotools/0001-configure.ac-Do-not-link-to-libintl-if-USE_NLS-is-no.patch b/build/pkgs/giac/patches/autotools/0001-configure.ac-Do-not-link-to-libintl-if-USE_NLS-is-no.patch deleted file mode 100644 index 8d838f8bd32..00000000000 --- a/build/pkgs/giac/patches/autotools/0001-configure.ac-Do-not-link-to-libintl-if-USE_NLS-is-no.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2285c11b3cfebc31aa2c032015c76820e3a62030 Mon Sep 17 00:00:00 2001 -From: Matthias Koeppe -Date: Thu, 25 Mar 2021 18:00:38 -0700 -Subject: [PATCH] configure.ac: Do not link to libintl if USE_NLS is no - ---- - configure.ac | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index bfa767d..43c6ff9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -464,7 +464,12 @@ AC_CHECK_FUNCS(system, , AC_DEFINE(HAVE_NO_SYSTEM, 1, [Set if system() function - ALL_LINGUAS="es fr el pt it en zh de" - AM_GNU_GETTEXT - AM_GNU_GETTEXT_VERSION([0.14.5]) --AC_CHECK_LIB(intl, main) -+AS_VAR_IF([USE_NLS], [yes], -+ dnl Whether this is needed at all, after all the AM_GNU_GETTEXT macros -+ dnl were run, is unknown. But at least we should disable it if NLS -+ dnl is disabled. -+ AC_CHECK_LIB(intl, main) -+])dnl - dnl auto-check will work if the function checked is alone in a file - dnl and independant from the whole micropython library - dnl otherwise it will fail because it depends on giac --- -2.28.0 - diff --git a/build/pkgs/giac/patches/autotools/giac-1.5.0.87-gsl_lapack.patch b/build/pkgs/giac/patches/autotools/giac-1.5.0.87-gsl_lapack.patch index 5b7a9d3a2ad..8a023d3b6ba 100644 --- a/build/pkgs/giac/patches/autotools/giac-1.5.0.87-gsl_lapack.patch +++ b/build/pkgs/giac/patches/autotools/giac-1.5.0.87-gsl_lapack.patch @@ -73,10 +73,10 @@ index b5dd325..d45b553 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,6 +14,8 @@ libgiac_la_SOURCES = input_lexer.ll sym2poly.cc gausspol.cc threaded.cc \ - help.cc lpsolve.cc optimization.cc signalprocessing.cc \ - graphe.cc graphtheory.cc nautywrapper.c markup.cc kdisplay.cc kadd.cc # Ugh.. + caseval.c cutils.c graphic.c libbf.c libregexp.c libunicode.c \ + qjsgiac.c quickjs.c quickjs-libc.c js.c --libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS) +-libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS) +libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) + +AM_LDFLAGS = -no-undefined diff --git a/build/pkgs/giac/patches/macos-ifactor.patch b/build/pkgs/giac/patches/macos-ifactor.patch index 34e84dda7ef..e8c4deb53b3 100644 --- a/build/pkgs/giac/patches/macos-ifactor.patch +++ b/build/pkgs/giac/patches/macos-ifactor.patch @@ -1,12 +1,11 @@ --- a/src/ifactor.cc 2014-10-11 16:29:01.000000000 +0200 +++ b/src/ifactor.cc 2014-10-11 16:29:28.000000000 +0200 -@@ -4007,7 +4007,7 @@ +@@ -4034,7 +4034,4 @@ #endif #ifdef HAVE_LIBPARI - #ifdef __APPLE__ -- return vecteur(1,gensizeerr(gettext("(Mac OS) Large number, you can try pari(); pari_factor(")+n0.print(contextptr)+")")); -+ // return vecteur(1,gensizeerr(gettext("(Mac OS) Large number, you can try pari(); pari_factor(")+n0.print(contextptr)+")")); - #endif - gen g(pari_ifactor(n0),contextptr); - if (g.type==_VECT){ - + if (ifactor_pari){ +-#ifdef __APPLE__ +- return vecteur(1,gensizeerr(gettext("(Mac OS) Large number, you can try pari(); pari_factor(")+n0.print(contextptr)+")")); +-#endif + gen g(pari_ifactor(n0),contextptr); + if (g.type==_VECT){ diff --git a/build/pkgs/giac/spkg-install.in b/build/pkgs/giac/spkg-install.in index ca30dc6ea62..c20671a7b88 100644 --- a/build/pkgs/giac/spkg-install.in +++ b/build/pkgs/giac/spkg-install.in @@ -16,6 +16,9 @@ if [ `uname -m` = "ppc64" ]; then CPPFLAGS="-Dx86_64 $CPPFLAGS" fi +# #31563: Kick the can down the road +CPPFLAGS="-DUSE_OBJET_BIDON=1 $CPPFLAGS" + # Using pari in a C++17 file with "using namespace std doesn't # work due to a conflict between std::rank and pari's rank # -std=c++17 is in the default flags on conda; @@ -53,7 +56,7 @@ if [ "$UNAME" = "CYGWIN" ]; then export ac_cv_header_nauty_naututil_h=no fi -sdh_configure --disable-gui --disable-ao "$DISABLENLS" --enable-png=no --disable-samplerate --disable-static --disable-micropy +sdh_configure --disable-gui --disable-ao "$DISABLENLS" --enable-png=no --disable-samplerate --disable-static --disable-micropy --disable-quickjs ############################################################# # Build diff --git a/build/pkgs/giac/spkg-src b/build/pkgs/giac/spkg-src index 064c7a092e0..830c4a47c65 100755 --- a/build/pkgs/giac/spkg-src +++ b/build/pkgs/giac/spkg-src @@ -13,9 +13,9 @@ fi # Exit on failure set -e -VERSION="1.6.0" -VERSIONREV="47" -PATCHSUFFIX="p3" +VERSION="1.9.0" +VERSIONREV="15" +PATCHSUFFIX="p0" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" @@ -49,6 +49,9 @@ mv giac-"$VERSION" src # remove unnecessary files rm -rf src/doc/pari/*.html +rm -f src/doc/*.wasm src/doc/*.js +sed -E -i.bak '/XCASHTML/s/[^ ]*[.](wasm|js)//g' src/doc/Makefile.am + # removing french html doc, but keep keywords, and working makefiles. # NB: the french html doc is huge and not GPL. # it is freely redistributable only for non commercial purposes.