[sagemath] 01/01: Disable a convoluted "build log buffering" mechanism which was causing problems

[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 8112133ce89484e2dedfcca9501f0dc25a41c540
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Jul 11 09:00:32 2016 +0200

    Disable a convoluted "build log buffering" mechanism which was causing problems
---
 debian/patches/fixsage-sphinx.patch | 19 +++++++++++++++++++
 debian/patches/series               |  1 +
 debian/patches/update-sphinx.patch  | 15 ---------------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/debian/patches/fixsage-sphinx.patch b/debian/patches/fixsage-sphinx.patch
new file mode 100644
index 0000000..cd33277
--- /dev/null
+++ b/debian/patches/fixsage-sphinx.patch
@@ -0,0 +1,19 @@
+Description: Disable a convoluted "build log buffering" mechanism which was causing problems.
+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/sphinxbuild.py
++++ b/sage/src/sage_setup/docbuild/sphinxbuild.py
+@@ -202,8 +202,9 @@
+     saved_stderr = sys.stderr
+ 
+     try:
+-        sys.stdout = SageSphinxLogger(sys.stdout, os.path.basename(output_dir))
+-        sys.stderr = SageSphinxLogger(sys.stderr, os.path.basename(output_dir))
++        # Sage is too smart for their own good, this poorly-implemented "file" replacement breaks stuff
++        #sys.stdout = SageSphinxLogger(sys.stdout, os.path.basename(output_dir))
++        #sys.stderr = SageSphinxLogger(sys.stderr, os.path.basename(output_dir))
+         sphinx.cmdline.main(sys.argv)
+     finally:
+         sys.stdout = saved_stdout
diff --git a/debian/patches/series b/debian/patches/series
index a2b046f..a904121 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@ silence_debian_bug_780186.patch
 silence_ecl_opt_signals.patch
 sagedoc_avoid_exception.patch
 fixsage-mpfi.patch
+fixsage-sphinx.patch
 #temp-disable-parallel-sphinx.patch
 
 # due to us using a different version of a dependency than what Sage uses
diff --git a/debian/patches/update-sphinx.patch b/debian/patches/update-sphinx.patch
index f4ee09e..b2a2517 100644
--- a/debian/patches/update-sphinx.patch
+++ b/debian/patches/update-sphinx.patch
@@ -1,6 +1,5 @@
 Description: Update Sage's use of Sphinx for the version in Debian
  Sage uses 1.2.2, Debian has 1.4.4.
- Also disable a convoluted "build log buffering" mechanism which was causing problems.
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
 ---
@@ -41,17 +40,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  def nitpick_patch_config(app):
      """
---- a/sage/src/sage_setup/docbuild/sphinxbuild.py
-+++ b/sage/src/sage_setup/docbuild/sphinxbuild.py
-@@ -200,8 +200,9 @@
-     saved_stderr = sys.stderr
- 
-     try:
--        sys.stdout = SageSphinxLogger(sys.stdout, os.path.basename(output_dir))
--        sys.stderr = SageSphinxLogger(sys.stderr, os.path.basename(output_dir))
-+        # Sage is too smart for their own good, this poorly-implemented "file" replacement breaks stuff
-+        #sys.stdout = SageSphinxLogger(sys.stdout, os.path.basename(output_dir))
-+        #sys.stderr = SageSphinxLogger(sys.stderr, os.path.basename(output_dir))
-         sphinx.cmdline.main(sys.argv)
-     finally:
-         sys.stdout = saved_stdout

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