diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/algebra.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/patches/giac-pari-gp-anyarg.patch | 28 |
3 files changed, 2 insertions, 36 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8247180bef..c325e6984b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1194,7 +1194,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ - %D%/packages/patches/giac-pari-gp-anyarg.patch \ %D%/packages/patches/giara-fix-login.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-networking-gnutls-binding.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index bec32fa1c5..a11586d775 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -327,7 +327,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.9.0-23") + (version "1.9.0-25") (source (origin (method url-fetch) @@ -339,12 +339,7 @@ precision.") "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "07ksa9bcn7gl68v6z3pyhdnz91bj2aslaasq91bz9vbsjy83r3mr")) - (patches - ;; Patch borrowed from Sage math team. Giac 1.9.0-21 does not build - ;; since Pari-GP 2.15 upgrade. Reported upstream here: - ;; <https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2800>. - (search-patches "giac-pari-gp-anyarg.patch")))) + (base32 "0wcb3yy0lgk8mkzay4jmk7w6hgpz454diz32q52zxl1n27gc2jd4")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/giac-pari-gp-anyarg.patch b/gnu/packages/patches/giac-pari-gp-anyarg.patch deleted file mode 100644 index 0441f6bcf9..0000000000 --- a/gnu/packages/patches/giac-pari-gp-anyarg.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 041d16b521d8231e5b441015f08bb386f9d2a51c Mon Sep 17 00:00:00 2001 -From: Vincent Delecroix <20100.delecroix@gmail.com*> -Date: Thu, 15 Sep 2022 12:11:01 +0200 -Subject: ANYARG giac patch - ---- -diff --git a/src/pari.cc b/src/pari.cc -index 76ce8e1..50d08ab 100644 ---- a/src/pari.cc -+++ b/src/pari.cc -@@ -40,6 +40,13 @@ using namespace std; - - #ifdef HAVE_LIBPARI - -+// Anyarg disappeared from PARI 2.15.0 -+#ifdef __cplusplus -+# define ANYARG ... -+#else -+# define ANYARG -+#endif -+ - #ifdef HAVE_PTHREAD_H - #include <pthread.h> - #endif - --- -cgit v1.0-1-gd88e - |