aidecoe 14/05/14 13:12:03
Added:
0.18-0001-emacs-install-make-sure-all-components.patch
0.18-0003-Unset-html_static_path-in-Python-bindi.patch
0.18-0002-doc-conf.py-Remove-_static-from-html_s.patch
Log:
Fixes compilation in case if emacs is not present and prevents infinite loops
on generating docs with newer Sphinx.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
F0134531E1DBFAB5)
Revision Changes Path
1.1
net-mail/notmuch/files/0.18-0001-emacs-install-make-sure-all-components.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.18-0001-emacs-install-make-sure-all-components.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.18-0001-emacs-install-make-sure-all-components.patch?rev=1.1&content-type=text/plain
Index: 0.18-0001-emacs-install-make-sure-all-components.patch
===================================================================
>From 0211b37f150f35f8015e9455d84f0764bb1cf8b1 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.oll...@iki.fi>
Date: Sun, 11 May 2014 00:36:43 +0300
Subject: [PATCH 1/3] emacs install: make sure all components to be installed
are there
`make install-emacs` will copy $(emacs_sources), $(emacs_images) and
$(emacs_bytecode) to their target directories. $(emacs_bytecode) was
already a prerequisite of make install-emacs as these obviously needed
to be build. Until a while ago all of $(emacs_sources) was available
in the repository, but now it includes `notmuch-version.el` which
is generated. In the future we may have generated emacs images too.
---
emacs/Makefile.local | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index dcb4995..c0d6b19 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -69,7 +69,7 @@ install: install-emacs
endif
.PHONY: install-emacs
-install-emacs:
+install-emacs: $(emacs_sources) $(emacs_images)
mkdir -p "$(DESTDIR)$(emacslispdir)"
install -m0644 $(emacs_sources) "$(DESTDIR)$(emacslispdir)"
ifeq ($(HAVE_EMACS),1)
--
1.9.3
1.1
net-mail/notmuch/files/0.18-0003-Unset-html_static_path-in-Python-bindi.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.18-0003-Unset-html_static_path-in-Python-bindi.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.18-0003-Unset-html_static_path-in-Python-bindi.patch?rev=1.1&content-type=text/plain
Index: 0.18-0003-Unset-html_static_path-in-Python-bindi.patch
===================================================================
>From b2bbe0b0a30c11d307a29b23f0e22268bd8edcc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aide...@aidecoe.name>
Date: Mon, 12 May 2014 12:35:41 +0200
Subject: [PATCH 3/3] Unset html_static_path in Python bindings docs
html_static_path is a kind of source directory and it was set to
destination directory (../html) which caused infinite recursion with
Sphinx 1.2 and above.
---
bindings/python/docs/source/conf.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bindings/python/docs/source/conf.py
b/bindings/python/docs/source/conf.py
index 9db377f..5107a96 100644
--- a/bindings/python/docs/source/conf.py
+++ b/bindings/python/docs/source/conf.py
@@ -140,7 +140,7 @@ html_theme = 'default'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['../html']
+html_static_path = []
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
--
1.9.3
1.1
net-mail/notmuch/files/0.18-0002-doc-conf.py-Remove-_static-from-html_s.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.18-0002-doc-conf.py-Remove-_static-from-html_s.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.18-0002-doc-conf.py-Remove-_static-from-html_s.patch?rev=1.1&content-type=text/plain
Index: 0.18-0002-doc-conf.py-Remove-_static-from-html_s.patch
===================================================================
>From 29712ff47411c950e1426e638a13975e6de8952f Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wk...@tremily.us>
Date: Sat, 10 May 2014 08:55:21 -0700
Subject: [PATCH 2/3] doc/conf.py: Remove _static from html_static_path
Avoid:
$ make HAVE_SPHINX=1 sphinx-html
python ./doc/mkdocdeps.py ./doc doc/_build doc/docdeps.mk
sphinx-build -b html -d doc/_build/doctrees -q ./doc doc/_build/html
Making output directory...
WARNING: html_static_path entry '/home/wking/src/notmuch/notmuch/doc/_static'
does not exist
because we have no static source in doc/_static.
---
doc/conf.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/conf.py b/doc/conf.py
index a926fe4..70ba1b8 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -42,7 +42,7 @@ html_theme = 'default'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = []
# Output file base name for HTML help builder.
htmlhelp_basename = 'notmuchdoc'
--
1.9.3
