[julia/f22] Fix building docs without network

[Milan Bouchet-Valat]

commit f582353588d679a2596af7cdbc14cd91f5f3c1d3
Author: Milan Bouchet-Valat <nalimilan at club.fr>
Date:   Wed Feb 18 22:47:56 2015 +0100

    Fix building docs without network
    
    By default virtualenv is used, which requires network. Update
    the doc patch to disable it.

 julia_juliadoc.patch |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/julia_juliadoc.patch b/julia_juliadoc.patch
index 0f6e52b..f19310e 100644
--- a/julia_juliadoc.patch
+++ b/julia_juliadoc.patch
@@ -23,7 +23,6 @@ diff -ruN a/doc/juliadoc/juliadoc/__init__.py b/doc/juliadoc/juliadoc/__init__.p
 +        'index': ['searchbox.html'],
 +        'search': [],
 +    }
-Les fichiers binaires a/doc/juliadoc/juliadoc/__init__.pyc et b/doc/juliadoc/juliadoc/__init__.pyc sont différents
 diff -ruN a/doc/juliadoc/juliadoc/jldoctest.py b/doc/juliadoc/juliadoc/jldoctest.py
 --- a/doc/juliadoc/juliadoc/jldoctest.py	1970-01-01 01:00:00.000000000 +0100
 +++ b/doc/juliadoc/juliadoc/jldoctest.py	2014-09-16 21:28:29.416869546 +0200
@@ -917,7 +916,6 @@ diff -ruN a/doc/juliadoc/juliadoc/jldoctest.py b/doc/juliadoc/juliadoc/jldoctest
 +    app.add_builder(DocTestBuilder)
 +    app.add_config_value('doctest_global_setup', '', False)
 +    app.add_config_value('doctest_global_cleanup', '', False)
-Les fichiers binaires a/doc/juliadoc/juliadoc/jldoctest.pyc et b/doc/juliadoc/juliadoc/jldoctest.pyc sont différents
 diff -ruN a/doc/juliadoc/juliadoc/jlhelp.py b/doc/juliadoc/juliadoc/jlhelp.py
 --- a/doc/juliadoc/juliadoc/jlhelp.py	1970-01-01 01:00:00.000000000 +0100
 +++ b/doc/juliadoc/juliadoc/jlhelp.py	2014-09-16 21:28:29.397869346 +0200
@@ -1034,7 +1032,6 @@ diff -ruN a/doc/juliadoc/juliadoc/jlhelp.py b/doc/juliadoc/juliadoc/jlhelp.py
 +
 +def setup(app):
 +    app.add_builder(JuliaHelpBuilder)
-Les fichiers binaires a/doc/juliadoc/juliadoc/jlhelp.pyc et b/doc/juliadoc/juliadoc/jlhelp.pyc sont différents
 diff -ruN a/doc/juliadoc/juliadoc/julia.py b/doc/juliadoc/juliadoc/julia.py
 --- a/doc/juliadoc/juliadoc/julia.py	1970-01-01 01:00:00.000000000 +0100
 +++ b/doc/juliadoc/juliadoc/julia.py	2014-09-16 21:28:29.352868875 +0200
@@ -1063,7 +1060,6 @@ diff -ruN a/doc/juliadoc/juliadoc/julia.py b/doc/juliadoc/juliadoc/julia.py
 +def setup(app):
 +    app.add_domain(JuliaDomain)
 +
-Les fichiers binaires a/doc/juliadoc/juliadoc/julia.pyc et b/doc/juliadoc/juliadoc/julia.pyc sont différents
 diff -ruN a/doc/juliadoc/juliadoc/theme/julia/layout.html b/doc/juliadoc/juliadoc/theme/julia/layout.html
 --- a/doc/juliadoc/juliadoc/theme/julia/layout.html	1970-01-01 01:00:00.000000000 +0100
 +++ b/doc/juliadoc/juliadoc/theme/julia/layout.html	2014-09-16 21:28:29.381869179 +0200
@@ -1387,3 +1383,38 @@ diff -ruN a/doc/juliadoc/setup.py b/doc/juliadoc/setup.py
 +    license='MIT',
 +    long_description=open('README.md').read(),
 +)
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -13,6 +13,13 @@
+
+ import sys, os, re
+
++# If extensions (or modules to document with autodoc) are in another directory,
++# add these directories to sys.path here. If the directory is relative to the
++# documentation root, use os.path.abspath to make it absolute, like shown here.
++
++juliadoc_dir = '{0}/juliadoc/'.format(os.path.abspath('.'))
++sys.path.append(juliadoc_dir)
++
+ import juliadoc
+ import sphinx_rtd_theme
+
+--- a/doc/Makefile	2015-02-18 22:45:06.572802504 +0100
++++ b/doc/Makefile	2015-02-18 22:45:09.556835161 +0100
+@@ -19,15 +19,12 @@
+ SPHINX_BUILD  = $(JULIA_ENV)/bin/sphinx-build
+
+ $(ACTIVATE):
+-	$(MAKE) -C $(JULIAHOME)/deps install-virtualenv
+	touch -c $@
+
+ $(SPHINX_BUILD): $(ACTIVATE) requirements.txt
+-	. $(ACTIVATE) && pip install sphinx==1.2.3 \
+-	              && pip install -r requirements.txt
+	touch -c $@
+
+-SPHINXBUILD = . $(ACTIVATE) && sphinx-build
++SPHINXBUILD = sphinx-build
+
+ .PHONY: help clean cleanall html dirhtml singlehtml pickle json htmlhelp qthelp devhelp \
+	epub latex latexpdf text man changes linkcheck doctest gettext