diff options
author | eschwartz | 2018-07-16 17:52:04 +0000 |
---|---|---|
committer | svntogit | 2018-07-16 17:52:04 +0000 |
commit | e61484bd6f8a23de0c29eb11a523f0b453b8f04d (patch) | |
tree | 065f7ce65f357c55b5d8a61d48378d54f6b1e22a | |
parent | b1452c6df672deb2ea7a6d09c2b165c55bc5062e (diff) | |
download | aur-e61484bd6f8a23de0c29eb11a523f0b453b8f04d.tar.gz |
upgpkg: python-sphinx 1.7.6-1
upstream release
better fix for recommonmark \o/
git-svn-id: file:///srv/repos/svn-community/svn@360019 9fca08f4-af9d-4005-b8df-a31f2cc04f65
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | 0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch | 38 | ||||
-rw-r--r-- | PKGBUILD | 15 |
3 files changed, 10 insertions, 55 deletions
@@ -1,6 +1,6 @@ pkgbase = python-sphinx - pkgver = 1.7.5 - pkgrel = 4 + pkgver = 1.7.6 + pkgrel = 1 url = http://www.sphinx-doc.org/ arch = any license = BSD @@ -47,14 +47,12 @@ pkgbase = python-sphinx makedepends = python2-sqlalchemy makedepends = python2-whoosh makedepends = python2-typing - source = https://pypi.org/packages/source/S/Sphinx/Sphinx-1.7.5.tar.gz - source = https://pypi.org/packages/source/S/Sphinx/Sphinx-1.7.5.tar.gz.asc - source = 0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch + source = https://pypi.org/packages/source/S/Sphinx/Sphinx-1.7.6.tar.gz + source = https://pypi.org/packages/source/S/Sphinx/Sphinx-1.7.6.tar.gz.asc validpgpkeys = 8A11B79A5D0D749A66F0A030102C2C17498D6B9E validpgpkeys = E9BEABB07E7B9CC3F56E62C91425F8CE5EBA0E07 - md5sums = 478a4d94506febd4786f47cc8ae297bb + md5sums = 8fbd77d80c8e0966964751ab31a0204a md5sums = SKIP - md5sums = 546b6aeddcc76cb4eb6bf8ff9802bf36 pkgname = python-sphinx pkgdesc = Python3 documentation generator diff --git a/0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch b/0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch deleted file mode 100644 index 2b2cbc99215a..000000000000 --- a/0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 34a08ad7e3321f36a1258cc11090c5d3a2ba8649 Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA <i.tkomiya@gmail.com> -Date: Thu, 7 Jun 2018 21:54:03 +0900 -Subject: [PATCH] Fix #5016: crashed when recommonmark.AutoStrictify is enabled - ---- - sphinx/io.py | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/sphinx/io.py b/sphinx/io.py -index 8f1da22bd..4cb59c90e 100644 ---- a/sphinx/io.py -+++ b/sphinx/io.py -@@ -13,6 +13,7 @@ import re - - from docutils.core import Publisher - from docutils.io import FileInput, NullOutput -+from docutils.parsers.rst import Parser as RSTParser - from docutils.readers import standalone - from docutils.statemachine import StringList, string2lines - from docutils.writers import UnfilteredWriter -@@ -282,6 +283,13 @@ def read_doc(app, env, filename): - source = input_class(app, env, source=None, source_path=filename, - encoding=env.config.source_encoding) - parser = app.registry.create_source_parser(app, filename) -+ if parser.__class__.__name__ == 'CommonMarkParser' and parser.settings_spec == (): -+ # a workaround for recommonmark -+ # If recommonmark.AutoStrictify is enabled, the parser invokes reST parser -+ # internally. But recommonmark-0.4.0 does not provide settings_spec for reST -+ # parser. As a workaround, this copies settings_spec for RSTParser to the -+ # CommonMarkParser. -+ parser.settings_spec = RSTParser.settings_spec - - pub = Publisher(reader=reader, - parser=parser, --- -2.18.0 - @@ -6,8 +6,8 @@ pkgbase=python-sphinx pkgname=('python-sphinx' 'python2-sphinx') -pkgver=1.7.5 -pkgrel=4 +pkgver=1.7.6 +pkgrel=1 arch=('any') url='http://www.sphinx-doc.org/' @@ -51,19 +51,14 @@ checkdepends=( 'imagemagick' 'librsvg' ) -source=("https://pypi.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz"{,.asc} - "0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch") +source=("https://pypi.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz"{,.asc}) validpgpkeys=('8A11B79A5D0D749A66F0A030102C2C17498D6B9E' 'E9BEABB07E7B9CC3F56E62C91425F8CE5EBA0E07') -md5sums=('478a4d94506febd4786f47cc8ae297bb' - 'SKIP' - '546b6aeddcc76cb4eb6bf8ff9802bf36') +md5sums=('8fbd77d80c8e0966964751ab31a0204a' + 'SKIP') prepare() { - # https://github.com/sphinx-doc/sphinx/issues/5016 - # https://github.com/rtfd/recommonmark/issues/109 - patch -p1 -d Sphinx-$pkgver < 0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch # souce duplication is required because makefile modify source code # setyp.py --build tricks don't works well cp -a Sphinx-$pkgver Sphinx-${pkgver}2 |