From 53500e63356515ef69739b0e9d933dae865d78f0 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu Date: Sat, 24 Dec 2011 14:53:15 +0000 Subject: - Backport of changeset 16223 and 16231 to make docs build with Sphinx 1.1.2 --- www/py-django/Makefile | 1 + .../files/extra-patch-changeset_16223_16231.diff | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 www/py-django/files/extra-patch-changeset_16223_16231.diff (limited to 'www/py-django') diff --git a/www/py-django/Makefile b/www/py-django/Makefile index d9016006c7ef..4987a512f821 100644 --- a/www/py-django/Makefile +++ b/www/py-django/Makefile @@ -58,6 +58,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup .if defined(WITH_DOCS) BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-changeset_16223_16231.diff PORTDOCS= * .endif diff --git a/www/py-django/files/extra-patch-changeset_16223_16231.diff b/www/py-django/files/extra-patch-changeset_16223_16231.diff new file mode 100644 index 000000000000..8ff8fa6395a6 --- /dev/null +++ b/www/py-django/files/extra-patch-changeset_16223_16231.diff @@ -0,0 +1,17 @@ +--- docs/_ext/djangodocs.py.orig 2010-11-21 05:00:41.000000000 +0800 ++++ docs/_ext/djangodocs.py 2011-12-24 22:37:54.866639407 +0800 +@@ -127,12 +127,14 @@ + + # Don't use border=1, which docutils does by default. + def visit_table(self, node): ++ self._table_row_index = 0 # Needed by Sphinx + self.body.append(self.starttag(node, 'table', CLASS='docutils')) + + # ? Really? + def visit_desc_parameterlist(self, node): + self.body.append('(') + self.first_param = 1 ++ self.param_separator = node.child_text_separator + + def depart_desc_parameterlist(self, node): + self.body.append(')') -- cgit v1.2.3