summarylogtreecommitdiffstats
path: root/sagemath-gap-4.11.patch
diff options
context:
space:
mode:
authorAntonio Rojas2020-10-25 18:43:41 +0100
committerAntonio Rojas2020-10-25 18:43:41 +0100
commitcdc31124dea27c41ccbd20742f91443491cf7809 (patch)
treee6ebe71a0e1163183ae7d2cfc4fa6462299a8c0d /sagemath-gap-4.11.patch
parente64ed327e72d5f3d8f41d9861e0608433fa5f1a9 (diff)
downloadaur-cdc31124dea27c41ccbd20742f91443491cf7809.tar.gz
Sync with stable
Diffstat (limited to 'sagemath-gap-4.11.patch')
-rw-r--r--sagemath-gap-4.11.patch19
1 files changed, 18 insertions, 1 deletions
diff --git a/sagemath-gap-4.11.patch b/sagemath-gap-4.11.patch
index 601e2f721ec9..46e0a558ec88 100644
--- a/sagemath-gap-4.11.patch
+++ b/sagemath-gap-4.11.patch
@@ -164,7 +164,7 @@ index 2467582..ac0b7a3 100644
# Note that the output of IsomorphismPermGroup() depends on
# memory locations and will change if you change the order of
diff --git a/src/sage/groups/perm_gps/permgroup.py b/src/sage/groups/perm_gps/permgroup.py
-index 334d90a..d7a0045 100644
+index c411b1e..0355cb6 100644
--- a/src/sage/groups/perm_gps/permgroup.py
+++ b/src/sage/groups/perm_gps/permgroup.py
@@ -850,7 +850,7 @@ class PermutationGroup_generic(FiniteGroup):
@@ -228,6 +228,23 @@ index 123afb8..67e3bbf 100644
[ ConjugacyClassSubgroups(SymmetricGroup( [ 1 .. 2 ] ),Group( () )),
ConjugacyClassSubgroups(SymmetricGroup( [ 1 .. 2 ] ),Group( [ (1,2) ] )) ]
"""
+diff --git a/src/sage/libs/gap/sage.gaprc b/src/sage/libs/gap/sage.gaprc
+index 17613fa..39c878f 100644
+--- a/src/sage/libs/gap/sage.gaprc
++++ b/src/sage/libs/gap/sage.gaprc
+@@ -1,12 +1,3 @@
+ # This file is run by Sage when initializing libgap via GAP_Initialize, and may
+ # contain bug fixes/workarounds and/or any Sage-specific patches necessary for
+ # Sage's libgap interface.
+-
+-if GAPInfo.CommandLineOptions.norepl then
+- # GAP 4.10.0 has a bug that an interactive session will be started
+- # even if --norepl was set; see https://github.com/gap-system/gap/pull/2840
+- # To work around this we redefine the SESSION function to a no-op
+- MAKE_READ_WRITE_GLOBAL("SESSION");
+- UNBIND_GLOBAL("SESSION");
+- BIND_GLOBAL("SESSION", function() end);
+-fi;
diff --git a/src/sage/tests/books/judson-abstract-algebra/sylow-sage.py b/src/sage/tests/books/judson-abstract-algebra/sylow-sage.py
index b609313..0051f20 100644
--- a/src/sage/tests/books/judson-abstract-algebra/sylow-sage.py