[arch-commits] Commit in python-sphinx/repos/community-staging-any (3 files)
Eli Schwartz
eschwartz at archlinux.org
Mon Jul 16 14:47:36 UTC 2018
Date: Monday, July 16, 2018 @ 14:47:35
Author: eschwartz
Revision: 359858
archrelease: copy trunk to community-staging-any
Added:
python-sphinx/repos/community-staging-any/0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch
(from rev 359857, python-sphinx/trunk/0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch)
python-sphinx/repos/community-staging-any/PKGBUILD
(from rev 359857, python-sphinx/trunk/PKGBUILD)
Deleted:
python-sphinx/repos/community-staging-any/PKGBUILD
-----------------------------------------------------------------+
0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch | 38 +
PKGBUILD | 305 +++++-----
2 files changed, 193 insertions(+), 150 deletions(-)
Copied: python-sphinx/repos/community-staging-any/0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch (from rev 359857, python-sphinx/trunk/0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch)
===================================================================
--- 0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch (rev 0)
+++ 0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch 2018-07-16 14:47:35 UTC (rev 359858)
@@ -0,0 +1,38 @@
+From 34a08ad7e3321f36a1258cc11090c5d3a2ba8649 Mon Sep 17 00:00:00 2001
+From: Takeshi KOMIYA <i.tkomiya at 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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-16 14:47:12 UTC (rev 359857)
+++ PKGBUILD 2018-07-16 14:47:35 UTC (rev 359858)
@@ -1,150 +0,0 @@
-# $Id$
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Contributor: Sébastien Luttringer
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Fabio Volpe <volpefabio at gmail.com>
-
-pkgbase=python-sphinx
-pkgname=('python-sphinx' 'python2-sphinx')
-pkgver=1.7.5
-pkgrel=2
-
-arch=('any')
-url='http://sphinx.pocoo.org/'
-license=('BSD')
-
-makedepends=(
- 'python-setuptools'
- 'python-docutils'
- 'python-jinja'
- 'python-pygments'
- 'python-six'
- 'python-imagesize'
- 'python-sphinxcontrib-websupport'
- 'python-sqlalchemy'
- 'python-whoosh'
- 'python2-setuptools'
- 'python2-docutils'
- 'python2-jinja'
- 'python2-pygments'
- 'python2-six'
- 'python2-imagesize'
- 'python2-sphinxcontrib-websupport'
- 'python2-sqlalchemy'
- 'python2-whoosh'
- 'python2-typing'
-)
-
-checkdepends=(
- 'texlive-latexextra'
- 'python-nose' 'python2-nose'
- 'python-snowballstemmer' 'python2-snowballstemmer'
- 'python-babel' 'python2-babel'
- 'python-sphinx-alabaster-theme' 'python2-sphinx-alabaster-theme'
- 'python-sphinx_rtd_theme' 'python2-sphinx_rtd_theme'
- 'python-mock' 'python2-mock'
- 'python-html5lib' 'python2-html5lib'
- 'python-requests' 'python2-requests'
- 'python2-pytest' 'python-pytest'
- 'python2-enum34'
- 'python-sphinxcontrib-websupport' 'python2-sphinxcontrib-websupport'
- 'imagemagick' 'librsvg'
-)
-
-source=("https://pypi.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz"{,.asc})
-
-validpgpkeys=('8A11B79A5D0D749A66F0A030102C2C17498D6B9E'
- 'E9BEABB07E7B9CC3F56E62C91425F8CE5EBA0E07')
-md5sums=('478a4d94506febd4786f47cc8ae297bb'
- 'SKIP')
-
-prepare() {
- # souce duplication is required because makefile modify source code
- # setyp.py --build tricks don't works well
- cp -a Sphinx-$pkgver Sphinx-${pkgver}2
- # change python2 interpreter
- find Sphinx-${pkgver}2 -type f -exec \
- sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
- # change sphinx-binaries name in source code
- find Sphinx-${pkgver}2 -type f -name '*.py' -exec \
- sed -ri 's,(sphinx-(:?build|apidoc|autogen|quickstart)),\12,' {} \;
-}
-
-build() {
- msg2 'Python 3 version'
- cd "$srcdir"/Sphinx-$pkgver
- make PYTHON=python3 build
-
- msg2 'Python 2 version'
- cd "$srcdir"/Sphinx-${pkgver}2
- make PYTHON=python2 build
-}
-
-#check() {
-# msg2 'Python 3 version'
-# cd "$srcdir"/Sphinx-$pkgver
-# LC_ALL="en_US.UTF-8" make PYTHON=python3 test
-# rm -r tests
-#
-# msg2 'Python 2 version'
-# cd "$srcdir"/Sphinx-${pkgver}2
-# LC_ALL="en_US.UTF-8" make PYTHON=python2 test
-# rm -r tests
-#}
-
-package_python-sphinx() {
- pkgdesc='Python3 documentation generator'
- depends=(
- 'python-setuptools'
- 'python-jinja'
- 'python-pygments'
- 'python-docutils'
- 'python-sphinx_rtd_theme'
- 'python-sphinx-alabaster-theme'
- 'python-babel'
- 'python-snowballstemmer'
- 'python-six'
- 'python-imagesize'
- 'python-requests'
- 'python-sphinxcontrib-websupport'
- 'python-sqlalchemy'
- 'python-whoosh'
- )
- optdepends=('texlive-latexextra: for generation of PDF documentation'
- 'imagemagick: ext.imageconverter')
-
- cd Sphinx-$pkgver
- python setup.py install --root="$pkgdir" --optimize=1
-
- install -Dm644 "$srcdir"/Sphinx-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/python-sphinx/LICENSE
-}
-
-package_python2-sphinx() {
- pkgdesc='Python2 documentation generator'
- depends=(
- 'python2-setuptools'
- 'python2-jinja'
- 'python2-pygments'
- 'python2-docutils'
- 'python2-sphinx_rtd_theme'
- 'python2-sphinx-alabaster-theme'
- 'python2-babel'
- 'python2-snowballstemmer'
- 'python2-six'
- 'python2-imagesize'
- 'python2-requests'
- 'python2-sphinxcontrib-websupport'
- 'python2-sqlalchemy'
- 'python2-whoosh'
- 'python2-typing'
- )
- optdepends=('texlive-latexextra: for generation of PDF documentation'
- 'imagemagick: ext.imageconverter')
-
- cd Sphinx-${pkgver}2
- python2 setup.py install --root="$pkgdir" --optimize=1
-
- install -Dm644 "$srcdir"/Sphinx-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/python2-sphinx/LICENSE
-}
-
-# vim:set ts=2 sw=2 et:
Copied: python-sphinx/repos/community-staging-any/PKGBUILD (from rev 359857, python-sphinx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-07-16 14:47:35 UTC (rev 359858)
@@ -0,0 +1,155 @@
+# $Id$
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Sébastien Luttringer
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Fabio Volpe <volpefabio at gmail.com>
+
+pkgbase=python-sphinx
+pkgname=('python-sphinx' 'python2-sphinx')
+pkgver=1.7.5
+pkgrel=4
+
+arch=('any')
+url='http://www.sphinx-doc.org/'
+license=('BSD')
+
+makedepends=(
+ 'python-setuptools'
+ 'python-docutils'
+ 'python-jinja'
+ 'python-pygments'
+ 'python-six'
+ 'python-imagesize'
+ 'python-sphinxcontrib-websupport'
+ 'python-sqlalchemy'
+ 'python-whoosh'
+ 'python2-setuptools'
+ 'python2-docutils'
+ 'python2-jinja'
+ 'python2-pygments'
+ 'python2-six'
+ 'python2-imagesize'
+ 'python2-sphinxcontrib-websupport'
+ 'python2-sqlalchemy'
+ 'python2-whoosh'
+ 'python2-typing'
+)
+
+checkdepends=(
+ 'texlive-latexextra'
+ 'python-nose' 'python2-nose'
+ 'python-snowballstemmer' 'python2-snowballstemmer'
+ 'python-babel' 'python2-babel'
+ 'python-sphinx-alabaster-theme' 'python2-sphinx-alabaster-theme'
+ 'python-sphinx_rtd_theme' 'python2-sphinx_rtd_theme'
+ 'python-mock' 'python2-mock'
+ 'python-html5lib' 'python2-html5lib'
+ 'python-requests' 'python2-requests'
+ 'python2-pytest' 'python-pytest'
+ 'python2-enum34'
+ 'python-sphinxcontrib-websupport' 'python2-sphinxcontrib-websupport'
+ 'imagemagick' 'librsvg'
+)
+
+source=("https://pypi.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz"{,.asc}
+ "0001-Fix-5016-crashed-when-recommonmark.AutoStrictify-is-.patch")
+
+validpgpkeys=('8A11B79A5D0D749A66F0A030102C2C17498D6B9E'
+ 'E9BEABB07E7B9CC3F56E62C91425F8CE5EBA0E07')
+md5sums=('478a4d94506febd4786f47cc8ae297bb'
+ 'SKIP'
+ '546b6aeddcc76cb4eb6bf8ff9802bf36')
+
+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
+ # change python2 interpreter
+ find Sphinx-${pkgver}2 -type f -exec \
+ sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+ # change sphinx-binaries name in source code
+ find Sphinx-${pkgver}2 -type f -name '*.py' -exec \
+ sed -ri 's,(sphinx-(:?build|apidoc|autogen|quickstart)),\12,' {} \;
+}
+
+build() {
+ msg2 'Python 3 version'
+ cd "$srcdir"/Sphinx-$pkgver
+ make PYTHON=python3 build
+
+ msg2 'Python 2 version'
+ cd "$srcdir"/Sphinx-${pkgver}2
+ make PYTHON=python2 build
+}
+
+#check() {
+# msg2 'Python 3 version'
+# cd "$srcdir"/Sphinx-$pkgver
+# LC_ALL="en_US.UTF-8" make PYTHON=python3 test
+# rm -r tests
+#
+# msg2 'Python 2 version'
+# cd "$srcdir"/Sphinx-${pkgver}2
+# LC_ALL="en_US.UTF-8" make PYTHON=python2 test
+# rm -r tests
+#}
+
+package_python-sphinx() {
+ pkgdesc='Python3 documentation generator'
+ depends=(
+ 'python-setuptools'
+ 'python-jinja'
+ 'python-pygments'
+ 'python-docutils'
+ 'python-sphinx_rtd_theme'
+ 'python-sphinx-alabaster-theme'
+ 'python-babel'
+ 'python-snowballstemmer'
+ 'python-six'
+ 'python-imagesize'
+ 'python-requests'
+ 'python-sphinxcontrib-websupport'
+ 'python-sqlalchemy'
+ 'python-whoosh'
+ )
+ optdepends=('texlive-latexextra: for generation of PDF documentation'
+ 'imagemagick: ext.imageconverter')
+
+ cd Sphinx-$pkgver
+ python setup.py install --root="$pkgdir" --optimize=1
+
+ install -Dm644 "$srcdir"/Sphinx-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/python-sphinx/LICENSE
+}
+
+package_python2-sphinx() {
+ pkgdesc='Python2 documentation generator'
+ depends=(
+ 'python2-setuptools'
+ 'python2-jinja'
+ 'python2-pygments'
+ 'python2-docutils'
+ 'python2-sphinx_rtd_theme'
+ 'python2-sphinx-alabaster-theme'
+ 'python2-babel'
+ 'python2-snowballstemmer'
+ 'python2-six'
+ 'python2-imagesize'
+ 'python2-requests'
+ 'python2-sphinxcontrib-websupport'
+ 'python2-sqlalchemy'
+ 'python2-whoosh'
+ 'python2-typing'
+ )
+ optdepends=('texlive-latexextra: for generation of PDF documentation'
+ 'imagemagick: ext.imageconverter')
+
+ cd Sphinx-${pkgver}2
+ python2 setup.py install --root="$pkgdir" --optimize=1
+
+ install -Dm644 "$srcdir"/Sphinx-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/python2-sphinx/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list