Date: Monday, July 16, 2018 @ 17:52:04 Author: eschwartz Revision: 360019
upgpkg: python-sphinx 1.7.6-1 upstream release better fix for recommonmark \o/ Modified: python-sphinx/trunk/PKGBUILD Deleted: python-sphinx/trunk/0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch -----------------------------------------------------------------+ 0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch | 38 ---------- PKGBUILD | 15 +-- 2 files changed, 5 insertions(+), 48 deletions(-) Deleted: 0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch =================================================================== --- 0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch 2018-07-16 17:49:39 UTC (rev 360018) +++ 0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch 2018-07-16 17:52:04 UTC (rev 360019) @@ -1,38 +0,0 @@ -From 34a08ad7e3321f36a1258cc11090c5d3a2ba8649 Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA <[email protected]> -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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-07-16 17:49:39 UTC (rev 360018) +++ PKGBUILD 2018-07-16 17:52:04 UTC (rev 360019) @@ -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 @@ '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
