[arch-commits] Commit in sagemath/trunk (PKGBUILD sagemath-mathjax-dir.patch)

[Antonio Rojas]

    Date: Tuesday, October 1, 2019 @ 16:01:00
  Author: arojas
Revision: 512355

Don't hardcode mathjax path

Added:
  sagemath/trunk/sagemath-mathjax-dir.patch
Modified:
  sagemath/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   10 +++++++---
 sagemath-mathjax-dir.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-01 15:47:54 UTC (rev 512354)
+++ PKGBUILD	2019-10-01 16:01:00 UTC (rev 512355)
@@ -8,7 +8,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org"
@@ -43,7 +43,8 @@
         sagemath-cremona.patch
         sagemath-singular-4.1.2.patch
         sagemath-ecl-sigfpe.patch
-        sagemath-primecount-5.1.patch)
+        sagemath-primecount-5.1.patch
+        sagemath-mathjax-dir.patch)
 sha256sums=('4f9f18a08142fed69342b58ffc6221ec16fe8daf1042086b351e1308489ec5d4'
             '328e45e78065b5f6527174bda48cfff6828acbf107c2535b0a9a92c3ceb35842'
             '1a82372a96ffd5e6d475b0e620935967ce5eb9b4484607d39da90824a77b07c4'
@@ -53,7 +54,8 @@
             '5281e5c715ff14ffa4003f643a508863ca58efb9e083cece81928f78810dc525'
             '961bfb5694b67d425d21240d71490cb71714b5207c23448c89be0966512ff8f9'
             'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938'
-            '4e48ce9aa6a584a9e342e4fb0dac91a1af27cfc40bfedb54e68ccad3b9257bb6')
+            '4e48ce9aa6a584a9e342e4fb0dac91a1af27cfc40bfedb54e68ccad3b9257bb6'
+            '388cd321fb8b73ae839bf2c150f7dd26ba34b0f6845f9761184db1dd5086b697')
 
 prepare(){
   cd sage-$pkgver
@@ -69,6 +71,8 @@
   patch -p1 -i ../sagemath-python3-notebook.patch
 # fix build with primecount 5.1
   patch -p1 -i ../sagemath-primecount-5.1.patch
+# Don't hardcode mathjax path
+  patch -p1 -i ../sagemath-mathjax-dir.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209

Added: sagemath-mathjax-dir.patch
===================================================================
--- sagemath-mathjax-dir.patch	                        (rev 0)
+++ sagemath-mathjax-dir.patch	2019-10-01 16:01:00 UTC (rev 512355)
@@ -0,0 +1,27 @@
+diff --git a/src/sage/docs/conf.py b/src/sage/docs/conf.py
+index 401342da5b..12c418ad93 100644
+--- a/src/sage/docs/conf.py
++++ b/src/sage/docs/conf.py
+@@ -1,5 +1,5 @@
+ import sys, os, sphinx
+-from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC, THEBE_DIR, PPLPY_DOCS, SAGE_SHARE
++from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC, THEBE_DIR, PPLPY_DOCS, MATHJAX_DIR
+ import sage.version
+ from sage.misc.sagedoc import extlinks
+ import dateutil.parser
+@@ -260,13 +260,12 @@ if (os.environ.get('SAGE_DOC_MATHJAX', 'no') != 'no'
+     from sage.misc.latex_macros import sage_mathjax_macros
+     html_theme_options['mathjax_macros'] = sage_mathjax_macros()
+ 
+-    mathjax_relative = 'mathjax'
++    mathjax_relative = os.path.basename(MATHJAX_DIR)
+ 
+     # It would be really nice if sphinx would copy the entire mathjax directory,
+     # (so we could have a _static/mathjax directory), rather than the contents of the directory
+ 
+-    mathjax_static = os.path.join(SAGE_SHARE, mathjax_relative)
+-    html_static_path.append(mathjax_static)
++    html_static_path.append(MATHJAX_DIR)
+     exclude_patterns += ['**/'+os.path.join(mathjax_relative, i)
+                          for i in ('docs', 'README*', 'test',
+                                    'unpacked', 'LICENSE')]