[sagemath] 01/01: Update Sage's libgap to (roughly) match version of GAP in Debian

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagemath.

commit 16bbbb6dffd27f15346a7502b21bc3d1a89c34ce
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Jul 8 13:37:25 2016 +0200

    Update Sage's libgap to (roughly) match version of GAP in Debian
---
 debian/README.Debian                              | 13 +++++-
 debian/patches/series                             |  3 +-
 debian/patches/temp-disable-parallel-sphinx.patch |  2 +
 debian/patches/update-libgap.patch                | 53 +++++++++++++++++++++++
 4 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 5c16d76..40e07cf 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -12,13 +12,22 @@ schublib.h, symfcn.h need to #include "hashtab.h" (etc) instead of <hashtab.h>
 2. Patch flint-arb:
 
 see https://github.com/fredrik-johansson/arb/pull/55
-see debian/arb-headers.patch for a local workaround
+see debian/arb-headers.patch for a local workaround; apply it with:
+$ sudo patch -d /usr/include/ -p1 < debian/arb-headers.patch
 
 also need sage to -lflint-arb instead of -larb (or perhaps Debian needs to
 install it as libarb.so; check upstream to see what they prefer). as a temp
 workaround you can `ln -s libflint-arb.so /usr/lib/libarb.so`.
 
-3. Post-compilation docbuild segfaults whilst building GAP docs.
+3. Docbuild now works; "Testing that Sage starts..." fails
+
+Testing that Sage starts...
+[2016-07-08 13:35:27] Sage version 7.1, released 2016-03-20
+Traceback (most recent call last):
+  File "/home/infinity0/tmp/sage/sagemath/sage/src/bin/sage-eval", line 4, in <module>
+    from sage.all import *
+ImportError: No module named sage.all
+Sage failed to start up.
 
 ## TODO (required to get into Debian archives)
 
diff --git a/debian/patches/series b/debian/patches/series
index 6a24a56..4f5573a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,5 @@ mpfi-fix-api.patch
 cysignals-multiarch-path.patch
 python_installs_in_userdir.patch
 sphinx-update.patch
-temp-disable-parallel-sphinx.patch
+#temp-disable-parallel-sphinx.patch
+update-libgap.patch
diff --git a/debian/patches/temp-disable-parallel-sphinx.patch b/debian/patches/temp-disable-parallel-sphinx.patch
index 87be176..cc7b61d 100644
--- a/debian/patches/temp-disable-parallel-sphinx.patch
+++ b/debian/patches/temp-disable-parallel-sphinx.patch
@@ -1,4 +1,6 @@
 Description: Temporarily disable parallel sphinx build to make the GAP failure more obvious
+ Before we completely remove this patch, we should probably figure out how to
+ make the parallel-build fail-fast in case its components fail in the future.
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
 ---
diff --git a/debian/patches/update-libgap.patch b/debian/patches/update-libgap.patch
new file mode 100644
index 0000000..ae6c539
--- /dev/null
+++ b/debian/patches/update-libgap.patch
@@ -0,0 +1,53 @@
+Description: Update Sage's libgap to (roughly) match version of GAP in Debian
+ libgap is very tightly coupled to the specific version of GAP, so
+ backport Sage 7.2's libgap into this version.
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sage/build/pkgs/libgap/checksums.ini
++++ b/sage/build/pkgs/libgap/checksums.ini
+@@ -1,4 +1,4 @@
+ tarball=libgap-VERSION.tar.gz
+-sha1=24cc0c739ef2bb809ac5f182d889cc84b3f99ade
+-md5=2b4e3adcd6e21feeeb9475e80f4e3581
+-cksum=1990698227
++sha1=22d2f099d4743678bfb2bc7da7a215be3b8ec03e
++md5=3e283da0397286b98e680804d93c6e61
++cksum=159804790
+--- a/sage/build/pkgs/libgap/package-version.txt
++++ b/sage/build/pkgs/libgap/package-version.txt
+@@ -1 +1 @@
+-4.7.9
++4.8.3
+--- a/sage/src/sage/libs/gap/gap_includes.pxd
++++ b/sage/src/sage/libs/gap/gap_includes.pxd
+@@ -131,7 +131,7 @@
+     cdef int libGAP_LAST_TESTING_TNUM
+ 
+ cdef extern from "gap/read.h":
+-    void* libGAP_ReadEvalCommand(libGAP_Obj context)
++    void* libGAP_ReadEvalCommand(libGAP_Obj context, libGAP_UInt *dualSemicolon)
+     void* libGAP_ReadEvalFile()
+     void* libGAP_ReadEvalResult
+     bint libGAP_READ_ERROR()
+--- a/sage/src/sage/libs/gap/util.pyx
++++ b/sage/src/sage/libs/gap/util.pyx
+@@ -280,7 +280,7 @@
+         libgap_start_interaction(cmd)
+         try:
+             sig_on()
+-            status = libGAP_ReadEvalCommand(libGAP_BottomLVars)
++            status = libGAP_ReadEvalCommand(libGAP_BottomLVars, NULL)
+             if status != libGAP_STATUS_END:
+                 libgap_call_error_handler()
+             sig_off()
+@@ -464,7 +464,7 @@
+         libgap_start_interaction(cmd)
+         try:
+             sig_on()
+-            status = libGAP_ReadEvalCommand(libGAP_BottomLVars)
++            status = libGAP_ReadEvalCommand(libGAP_BottomLVars, NULL)
+             if status != libGAP_STATUS_END:
+                 libgap_call_error_handler()
+             sig_off()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git