[arch-commits] Commit in sagemath/trunk (PKGBUILD sagemath-gap-4.11.patch)

[Antonio Rojas]

    Date: Friday, March 6, 2020 @ 17:52:29
  Author: arojas
Revision: 591038

gap 4.11 rebuild

Added:
  sagemath/trunk/sagemath-gap-4.11.patch
Modified:
  sagemath/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   10 +++++++---
 sagemath-gap-4.11.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-06 17:47:12 UTC (rev 591037)
+++ PKGBUILD	2020-03-06 17:52:29 UTC (rev 591038)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=9.0
-pkgrel=8
+pkgrel=9
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org"
@@ -42,7 +42,8 @@
         sagemath-ecl-sigfpe.patch
         sagemath-ipython7.patch
         sagemath-rpy-3.patch
-        sagemath-python-3.8.patch)
+        sagemath-python-3.8.patch
+        sagemath-gap-4.11.patch)
 sha256sums=('6f5d42b306a2c03073dd95086f80602bd1a0b929b8ad19c6d219c8ca8e96da26'
             '496da0fa42cdfc92b43f5d85610bb462ca9bdc2f4d80fd316e8e9d068dba3b0b'
             '6a5470d7044a50a35a6478f57c19adf72fe54aefebeea8a095915b63f9e219ac'
@@ -52,7 +53,8 @@
             'e44bbde87f3312548faad75b7383ef21fade55be251ab5804de41cd3842ca8a0'
             '7821813d3f104566ca6487de9857acf2bc7fc236a48a77000f04f2dc17b75536'
             '9062b412595e81a5ca560a5ae789f8b7318981689cb8d076b30d8c54a4fc4495'
-            'd430e76c5cdebed9bd1cde0f05e74fba620c736c68c018d70d84dc7b3e3c9049')
+            'd430e76c5cdebed9bd1cde0f05e74fba620c736c68c018d70d84dc7b3e3c9049'
+            '7123af05c79f76b94c89aa97da13dd1c1a796cdf10a9486e0974c88054eb3037')
 
 prepare(){
   cd sage-$pkgver
@@ -72,6 +74,8 @@
   patch -p1 -i ../sagemath-rpy-3.patch
 # Fix mathjax path
   sed -e 's|mathjax|mathjax2|g' -i src/sage/env.py
+# Fix gap.version() with GAP 4.11
+  patch -p1 -i ../sagemath-gap-4.11.patch
 
 # Upstream patches  
 # use Features to detect Cremona databases https://trac.sagemath.org/ticket/25825

Added: sagemath-gap-4.11.patch
===================================================================
--- sagemath-gap-4.11.patch	                        (rev 0)
+++ sagemath-gap-4.11.patch	2020-03-06 17:52:29 UTC (rev 591038)
@@ -0,0 +1,13 @@
+diff --git a/src/sage/interfaces/gap.py b/src/sage/interfaces/gap.py
+index 2b1cb8aef4..0bbc018499 100644
+--- a/src/sage/interfaces/gap.py
++++ b/src/sage/interfaces/gap.py
+@@ -891,7 +891,7 @@ class Gap_generic(ExtraTabCompletion, Expect):
+             sage: print(gap.version())
+             4...
+         """
+-        return self.eval('VERSION')[1:-1]
++        return self.eval('GAPInfo.Version')[1:-1]
+ 
+     def function_call(self, function, args=None, kwds=None):
+         """