diff options
| author | khorben <khorben> | 2016-04-05 05:38:43 +0000 |
|---|---|---|
| committer | khorben <khorben> | 2016-04-05 05:38:43 +0000 |
| commit | e395bc79f7c00cfe6785f364e05094f5371e7746 (patch) | |
| tree | ff12334193a7797796c1a4ab8d9902ac2ac97f35 | |
| parent | a36658b5e3b7932422cb4c39ceab7e647dbf4026 (diff) | |
| download | pkgsrc-e395bc79f7c00cfe6785f364e05094f5371e7746.tar.gz | |
Apply patch #2247 from upstream
This helps generating documentation with textprox/py-sphinx, therefore
fixing the build process of some packages using it.
Bump PKGREVISION.
Approved by pkgsrc-pmc@ during freeze.
| -rw-r--r-- | textproc/py-sphinx/Makefile | 4 | ||||
| -rw-r--r-- | textproc/py-sphinx/distinfo | 3 | ||||
| -rw-r--r-- | textproc/py-sphinx/patches/patch-sphinx_util_nodes.py | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile index 949fcd066ae..0e9459439b3 100644 --- a/textproc/py-sphinx/Makefile +++ b/textproc/py-sphinx/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2016/01/17 13:47:01 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2016/04/05 05:38:43 khorben Exp $ DISTNAME= Sphinx-1.3.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc python MASTER_SITES= http://pypi.python.org/packages/source/S/Sphinx/ diff --git a/textproc/py-sphinx/distinfo b/textproc/py-sphinx/distinfo index 864a297f316..19aaf8720f6 100644 --- a/textproc/py-sphinx/distinfo +++ b/textproc/py-sphinx/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.16 2016/01/15 14:24:41 darcy Exp $ +$NetBSD: distinfo,v 1.17 2016/04/05 05:38:43 khorben Exp $ SHA1 (Sphinx-1.3.4.tar.gz) = 3d54fbb8e188ee2435995d936dea9f7c17f6c9c0 RMD160 (Sphinx-1.3.4.tar.gz) = 0b006eaee2f159e081ab59fe0cb8af5046852c3d SHA512 (Sphinx-1.3.4.tar.gz) = 155d58806a44a6e70fa734ff76f15c5ed76fd35029cf3a05bb8e4d7528f6f17f3e80b699692c125e77017cb88a1f1762ad02eca2eada24f29a702a0f99ff25c9 Size (Sphinx-1.3.4.tar.gz) = 3679247 bytes +SHA1 (patch-sphinx_util_nodes.py) = 53bcb4f354fd0f4dea35ca4b3e50a58269ed0c23 diff --git a/textproc/py-sphinx/patches/patch-sphinx_util_nodes.py b/textproc/py-sphinx/patches/patch-sphinx_util_nodes.py new file mode 100644 index 00000000000..bbb4ebeba5a --- /dev/null +++ b/textproc/py-sphinx/patches/patch-sphinx_util_nodes.py @@ -0,0 +1,15 @@ +$NetBSD: patch-sphinx_util_nodes.py,v 1.1 2016/04/05 05:38:43 khorben Exp $ + +Fix classifiers containing regular expressions + +--- sphinx/util/nodes.py.orig 2016-01-09 07:50:40.000000000 +0000 ++++ sphinx/util/nodes.py +@@ -50,7 +50,7 @@ def apply_source_workaround(node): + # strip classifier from rawsource of term + for classifier in reversed(node.parent.traverse(nodes.classifier)): + node.rawsource = re.sub( +- '\s*:\s*%s' % classifier.astext(), '', node.rawsource) ++ '\s*:\s*%s' % re.escape(classifier.astext()), '', node.rawsource) + + # workaround: recommonmark-0.2.0 doesn't set rawsource attribute + if not node.rawsource: |