mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 03:39:03 -04:00
80 lines
4.3 KiB
Diff
80 lines
4.3 KiB
Diff
diff -up sage-5.8/spkg/build/sage-5.8/doc/common/builder.py.orig sage-5.8/spkg/build/sage-5.8/doc/common/builder.py
|
|
--- sage-5.8/spkg/build/sage-5.8/doc/common/builder.py.orig 2013-03-19 16:06:49.142694873 -0300
|
|
+++ sage-5.8/spkg/build/sage-5.8/doc/common/builder.py 2013-03-19 16:07:08.156695601 -0300
|
|
@@ -31,7 +31,7 @@ from sage.misc.misc import sage_makedirs
|
|
# SAGE_DOC, LANGUAGES, SPHINXOPTS, PAPER, OMIT,
|
|
# PAPEROPTS, ALLSPHINXOPTS, NUM_THREADS, WEBSITESPHINXOPTS
|
|
# from build_options.py.
|
|
-execfile(os.path.join(os.getenv('SAGE_ROOT'), 'devel', 'sage', 'doc', 'common' , 'build_options.py'))
|
|
+execfile(os.path.join(os.getenv('SAGE_ROOT'), 'devel', 'doc', 'common' , 'build_options.py'))
|
|
|
|
|
|
##########################################
|
|
diff -up sage-5.8/spkg/build/sage-5.8/doc/common/conf.py.orig sage-5.8/spkg/build/sage-5.8/doc/common/conf.py
|
|
--- sage-5.8/spkg/build/sage-5.8/doc/common/conf.py.orig 2013-03-19 16:07:24.854696241 -0300
|
|
+++ sage-5.8/spkg/build/sage-5.8/doc/common/conf.py 2013-03-19 16:08:21.261698401 -0300
|
|
@@ -1,7 +1,7 @@
|
|
import sys, os, sphinx
|
|
|
|
-SAGE_ROOT = os.environ['SAGE_ROOT']
|
|
-SAGE_DOC = os.path.join(SAGE_ROOT, 'devel/sage/doc')
|
|
+SAGE_DEVEL = os.environ['SAGE_DEVEL']
|
|
+SAGE_DOC = os.environ['SAGE_DOC']
|
|
|
|
def get_doc_abspath(path):
|
|
"""
|
|
@@ -204,8 +204,7 @@ if (os.environ.get('SAGE_DOC_MATHJAX', '
|
|
from sage.misc.latex_macros import sage_mathjax_macros
|
|
html_theme_options['mathjax_macros'] = sage_mathjax_macros()
|
|
|
|
- from pkg_resources import Requirement, working_set
|
|
- sagenb_path = working_set.find(Requirement.parse('sagenb')).location
|
|
+ sagenb_path = SAGE_DEVEL
|
|
mathjax_relative = os.path.join('sagenb','data','mathjax')
|
|
|
|
# It would be really nice if sphinx would copy the entire mathjax directory,
|
|
diff -up sage-5.8/spkg/build/sage-5.8/sage/interfaces/singular.py.orig sage-5.8/spkg/build/sage-5.8/sage/interfaces/singular.py
|
|
--- sage-5.8/spkg/build/sage-5.8/sage/interfaces/singular.py.orig 2013-03-19 16:08:38.847699074 -0300
|
|
+++ sage-5.8/spkg/build/sage-5.8/sage/interfaces/singular.py 2013-03-19 16:08:52.885699612 -0300
|
|
@@ -2144,7 +2144,7 @@ def generate_docstring_dictionary():
|
|
nodes.clear()
|
|
node_names.clear()
|
|
|
|
- singular_docdir = os.environ["SAGE_LOCAL"]+"/share/singular/"
|
|
+ singular_docdir = os.environ["SINGULAR_BIN_DIR"]+"/info/"
|
|
|
|
new_node = re.compile("File: singular\.hlp, Node: ([^,]*),.*")
|
|
new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
|
|
diff -up sage-5.8/spkg/build/sage-5.8/sage/misc/latex_macros.py.orig sage-5.8/spkg/build/sage-5.8/sage/misc/latex_macros.py
|
|
--- sage-5.8/spkg/build/sage-5.8/sage/misc/latex_macros.py.orig 2013-03-19 16:09:05.806700107 -0300
|
|
+++ sage-5.8/spkg/build/sage-5.8/sage/misc/latex_macros.py 2013-03-19 16:09:20.564700672 -0300
|
|
@@ -142,7 +142,7 @@ def convert_latex_macro_to_mathjax(macro
|
|
return name + ': ["' + defn + '",' + str(num_args) + ']'
|
|
|
|
from superseded import deprecated_function_alias
|
|
-convert_latex_macro_to_jsmath = deprecated_function_alias(13508, convert_latex_macro_to_mathjax)
|
|
+convert_latex_macro_to_jsmath = convert_latex_macro_to_mathjax
|
|
|
|
# To add a new macro for use in the Sage documentation, add a list or
|
|
# tuple to the following list. Each list (or tuple) should have the
|
|
diff -up sage-5.8/spkg/build/sage-5.8/sage/misc/sagedoc.py.orig sage-5.8/spkg/build/sage-5.8/sage/misc/sagedoc.py
|
|
--- sage-5.8/spkg/build/sage-5.8/sage/misc/sagedoc.py.orig 2013-03-19 16:09:31.254701081 -0300
|
|
+++ sage-5.8/spkg/build/sage-5.8/sage/misc/sagedoc.py 2013-03-19 16:10:05.277702384 -0300
|
|
@@ -704,13 +704,13 @@ def _search_src_or_doc(what, string, ext
|
|
module = ''
|
|
exts = ['html']
|
|
title = 'Documentation'
|
|
- base_path = os.path.join('devel', 'sage', 'doc', 'output')
|
|
- doc_path = os.path.join(ROOT, 'devel', 'sage', 'doc')
|
|
+ base_path = os.path.join('devel', 'output')
|
|
+ doc_path = os.path.join(ROOT, 'devel', 'doc')
|
|
|
|
- # We need to import stuff from SAGE_ROOT/devel/sage/doc/common
|
|
+ # We need to import stuff from SAGE_ROOT/devel/doc/common
|
|
# To do this, we temporarily change sys.path
|
|
oldpath = sys.path
|
|
- sys.path = oldpath + [os.path.join(ROOT, 'devel', 'sage', 'doc', 'common')]
|
|
+ sys.path = oldpath + [os.path.join(ROOT, 'devel', 'doc', 'common')]
|
|
import build_options as builder
|
|
# List of languages
|
|
lang = builder.LANGUAGES
|