[sagemath] 01/01: Update docs on latest situation, and other clean ups
Ximin Luo
infinity0 at debian.org
Mon Jul 11 09:03:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository sagemath.
commit 6beb4ae2f2dac1c3070daba2b2f4585769e26353
Author: Ximin Luo <infinity0 at debian.org>
Date: Mon Jul 11 11:01:16 2016 +0200
Update docs on latest situation, and other clean ups
- note: the previous commit message was inaccurate, there is no segfault currently
- rm obsolete patches
- rm some obsolete TODOs
---
debian/README.Debian | 16 ++++++++----
debian/patches/update-libgap.patch | 53 --------------------------------------
debian/patches/update-sphinx.patch | 42 ------------------------------
debian/pruner/configure.ac | 8 ------
4 files changed, 11 insertions(+), 108 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 7702be7..334534a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -19,14 +19,20 @@ 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`.
-Then the build should work, but the tests will fail. This is partly due to our
-hacky patches, and it's probably not worth trying to fix them before we update
-to Sage 7.2/7.3 "properly".
+Then the build (including documentation) should work, but the tests will fail.
+This is probably due to a combination of:
+
+a) the fact we're currently installing to $HOME rather than /usr.
+b) mismatched versions of dependencies; we'll need to upload these.
+c) our hacky patches; we will need to revise these.
+
+Also "? cannot open `standard.lib`" when running `./sage` is slightly
+concerning; we should investigate that.
## TODO (required to get into Debian archives)
-1. package all the stuff not yet available in Debian
+1. Package all the stuff not yet available in Debian
i.e. for which pruner.py says "X will not come from debian!"
-2. other stuff on wiki page https://wiki.debian.org/DebianScience/Sage
+2. Other stuff on wiki page https://wiki.debian.org/DebianScience/Sage
diff --git a/debian/patches/update-libgap.patch b/debian/patches/update-libgap.patch
deleted file mode 100644
index ae6c539..0000000
--- a/debian/patches/update-libgap.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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()
diff --git a/debian/patches/update-sphinx.patch b/debian/patches/update-sphinx.patch
deleted file mode 100644
index b2a2517..0000000
--- a/debian/patches/update-sphinx.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Update Sage's use of Sphinx for the version in Debian
- Sage uses 1.2.2, Debian has 1.4.4.
-Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/src/sage_setup/docbuild/__init__.py
-+++ b/sage/src/sage_setup/docbuild/__init__.py
-@@ -767,7 +767,7 @@
-
- env_pickle = os.path.join(self._doctrees_dir(), 'environment.pickle')
- try:
-- env = BuildEnvironment.frompickle(config, env_pickle)
-+ env = BuildEnvironment.frompickle(SAGE_DOC_SRC, config, env_pickle)
- logger.debug("Opened Sphinx environment: %s", env_pickle)
- return env
- except IOError as err:
---- a/sage/src/sage_setup/docbuild/ext/sage_autodoc.py
-+++ b/sage/src/sage_setup/docbuild/ext/sage_autodoc.py
-@@ -38,7 +38,7 @@
- from sphinx.util.nodes import nested_parse_with_titles
- from sphinx.util.compat import Directive
- from sphinx.util.inspect import getargspec, isdescriptor, safe_getmembers, \
-- safe_getattr, safe_repr, is_builtin_class_method
-+ safe_getattr, object_description as safe_repr, is_builtin_class_method
- from sphinx.util.pycompat import base_exception, class_types
- from sphinx.util.docstrings import prepare_docstring
-
---- a/sage/src/doc/common/conf.py
-+++ b/sage/src/doc/common/conf.py
-@@ -724,9 +724,9 @@
- # link to the Python documentation several links where broken because there
- # where class listed as functions. Expand the list 'base_class_as_func'
- # above instead of marking the link as broken.
--nitpick_ignore = (
-+nitpick_ignore = [
- ('py:class', 'twisted.web2.resource.Resource'),
-- ('py:class', 'twisted.web2.resource.PostableResource'))
-+ ('py:class', 'twisted.web2.resource.PostableResource')]
-
- def nitpick_patch_config(app):
- """
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index 071708d..a6aaf81 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -247,9 +247,6 @@ AC_SUBST(HAS_PKGCONF)
HAS_PKGCONFIG="True"
AC_SUBST(HAS_PKGCONFIG)
-# TODO(planarity): check that this is OK
-# sagemath only have 1 (relevant to Debian) patch now that adds "extern" to
-# "char Mode" and "char Line" in planarity.h; ouc build might still work though
AC_CHECK_HEADERS(planarity/planarity.h, HAS_PLANARITY="True", HAS_PLANARITY="False")
AC_SUBST(HAS_PLANARITY)
@@ -298,14 +295,9 @@ AC_SUBST(HAS_SAGETEX)
AC_CHECK_PROG(HAS_SCONS, scons, "True", "False")
AC_SUBST(HAS_SCONS)
-# FIXME(singular): using the debian-science repository
AC_LANG_PUSH([C++])
-old_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$old_CPPFLAGS -I/usr/include/factory"
AC_CHECK_HEADERS(libsingular.h, HAS_SINGULAR="True", HAS_SINGULAR="False")
-CPPFLAGS=$old_CPPFLAGS
AC_LANG_POP([C++])
-#HAS_SINGULAR="False"
AC_SUBST(HAS_SINGULAR)
AC_CHECK_HEADERS(sqlite3.h, HAS_SQLITE="True", HAS_SQLITE="False")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git
More information about the debian-science-commits
mailing list