[sagemath] 01/01: Add sphinx multidocs patch, remove old one no longer needed

[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 30eda520776e89ddc5905217aed201223b34e368
Author: Ximin Luo <infinity0 at debian.org>
Date:   Wed Jul 5 10:01:49 2017 +0200

    Add sphinx multidocs patch, remove old one no longer needed
---
 debian/changelog                              |  2 ++
 debian/patches/d1-install-paths.patch         | 14 --------------
 debian/patches/series                         |  1 +
 debian/patches/u1-more-sphinx-1.5-fixes.patch | 19 +++++++++++++++++++
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc192fb..314ef80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ sagemath (8.0~beta12-1) UNRELEASED; urgency=medium
 
   [ Ximin Luo ]
   * Use libgcrypt-dev instead of obsolete libgcrypt11-dev. (Closes: #864132)
+  * New patches:
+    - u1-more-sphinx-1.5-fixes.patch from Dmitry Shachnev. (Closes: #866166)
 
  -- Tobias Hansen <thansen at debian.org>  Thu, 08 Jun 2017 21:19:49 +0000
 
diff --git a/debian/patches/d1-install-paths.patch b/debian/patches/d1-install-paths.patch
index 4b6bd2d..c6c1f7b 100644
--- a/debian/patches/d1-install-paths.patch
+++ b/debian/patches/d1-install-paths.patch
@@ -2,9 +2,6 @@ Description: Install to Debian paths
  TODO: upstream hard-codes "site-packages" in a bunch of places; these should
  be fixed to use SAGE_LIB instead and forwarded upstream. Then this patch could
  be a lot smaller.
- .
- The multidocs.py patch looks like a Sage upstream bug, that probably needs to
- be forwarded.
 Author: Tobias Hansen <thansen at debian.org>
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
@@ -199,17 +196,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              file = '<a href="/src/%s" target="_new">src/sage/%s</a>'%(fname,fname)
          else:
              file = filename
---- a/sage/src/sage_setup/docbuild/ext/multidocs.py
-+++ b/sage/src/sage_setup/docbuild/ext/multidocs.py
-@@ -285,7 +285,7 @@
-             """
-             app.builder.info(bold('linking _static directory.'))
-             static_dir = os.path.join(app.builder.outdir, '_static')
--            master_static_dir = os.path.join('..', '_static')
-+            master_static_dir = os.path.join('..', '..', '_static')
-             if os.path.lexists(static_dir):
-                 try:
-                     shutil.rmtree(static_dir)
 --- a/sage/src/Makefile.in
 +++ b/sage/src/Makefile.in
 @@ -39,7 +39,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 256cc08..381c43e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,7 @@ u1-scripts-dir.patch                       #22731
 # Not yet in Debian, uncomment when it is:
 #u1-version-ipython-5.4.patch              #23125
 u1-ipywidgets-repr.patch                   #https://github.com/jupyter-widgets/ipywidgets/pull/1031
+u1-more-sphinx-1.5-fixes.patch             #23364
 
 # Patches that should be upstreamed (may need some work first)
 u2-pari-stackwarn.patch                    #23263
diff --git a/debian/patches/u1-more-sphinx-1.5-fixes.patch b/debian/patches/u1-more-sphinx-1.5-fixes.patch
new file mode 100644
index 0000000..ddaaee8
--- /dev/null
+++ b/debian/patches/u1-more-sphinx-1.5-fixes.patch
@@ -0,0 +1,19 @@
+Description: Update to Sphinx 1.5 searchindex.js
+ Filename paths also need to be updated, otherwise search snippets won't be
+ able to find the source file and "404" will be displayed instead. (The link
+ to the html file still works.)
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Bug: https://trac.sagemath.org/ticket/23364
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sage/src/sage_setup/docbuild/ext/multidocs.py
++++ b/sage/src/sage_setup/docbuild/ext/multidocs.py
+@@ -147,7 +147,7 @@
+             # merge the filenames
+             filenames = app.builder.indexer._filenames
+             for (res, filename) in six.iteritems(index._filenames):
+-                filenames[fixpath(res)] = filename
++                filenames[fixpath(res)] = fixpath(filename)
+             # TODO: merge indexer._objtypes, indexer._objnames as well
+ 
+             # Setup source symbolic links

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