Attachment 227009 Details for Bug 257116 – py-sphinx-4.1.2-exp2.patch

[patch] py-sphinx-4.1.2-exp2.patch

py-sphinx-4.1.2-exp2.patch (text/plain), 13.22 KB, created by Danilo G. Baio on 2021-08-07 19:51:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danilo G. Baio

Created: 2021-08-07 19:51:36 UTC

Size: 13.22 KB

patch

obsolete

>diff --git a/biology/py-orange3-single-cell/files/patch-doc_conf.py b/biology/py-orange3-single-cell/files/patch-doc_conf.py
>new file mode 100644
>index 000000000000..a3ecb4c652db
>--- /dev/null
>+++ b/biology/py-orange3-single-cell/files/patch-doc_conf.py
>@@ -0,0 +1,10 @@
>+# add_stylesheet() deprecated on Sphinx 4.0
>+# https://www.sphinx-doc.org/en/master/extdev/deprecated.html
>+--- doc/conf.py.orig	2018-10-15 08:43:14 UTC
>++++ doc/conf.py
>+@@ -288,4 +288,4 @@ texinfo_documents = [
>+ #texinfo_no_detailmenu = False
>+ 
>+ def setup(app):
>+-    app.add_stylesheet('style.css')
>++    app.add_css_file('style.css')
>diff --git a/deskutils/py-paperless/files/patch-docs_conf.py b/deskutils/py-paperless/files/patch-docs_conf.py
>new file mode 100644
>index 000000000000..4e490b5921a3
>--- /dev/null
>+++ b/deskutils/py-paperless/files/patch-docs_conf.py
>@@ -0,0 +1,13 @@
>+# add_stylesheet() deprecated on Sphinx 4.0
>+# https://www.sphinx-doc.org/en/master/extdev/deprecated.html
>+--- docs/conf.py.orig	2019-01-27 13:48:05 UTC
>++++ docs/conf.py
>+@@ -21,7 +21,7 @@ exec(open("../src/paperless/version.py").read())
>+ 
>+ # Believe it or not, this is the officially sanctioned way to add custom CSS.
>+ def setup(app):
>+-    app.add_stylesheet("custom.css")
>++    app.add_css_file("custom.css")
>+ 
>+ # If extensions (or modules to document with autodoc) are in another directory,
>+ # add these directories to sys.path here. If the directory is relative to the
>diff --git a/lang/asis/files/patch-doc_share_conf.py b/lang/asis/files/patch-doc_share_conf.py
>new file mode 100644
>index 000000000000..34ad101782c8
>--- /dev/null
>+++ b/lang/asis/files/patch-doc_share_conf.py
>@@ -0,0 +1,40 @@
>+--- doc/share/conf.py.orig	2016-03-31 12:55:10 UTC
>++++ doc/share/conf.py
>+@@ -40,17 +40,17 @@ def get_gnat_version():
>+             line = (vinfo.readline()).strip()
>+             return line
>+     except:
>+-        print 'Error opening or reading version_information file'
>++        print('Error opening or reading version_information file')
>+         sys.exit(1)
>+ 
>+ # First retrieve the name of the documentation we are building
>+ doc_name = os.environ.get('DOC_NAME', None)
>+ if doc_name is None:
>+-    print 'DOC_NAME environment variable should be set'
>++    print('DOC_NAME environment variable should be set')
>+     sys.exit(1)
>+ 
>+ if doc_name not in DOCS:
>+-    print '%s is not a valid documentation name' % doc_name
>++    print(f'{doc_name} is not a valid documentation name')
>+     sys.exit(1)
>+ 
>+ 
>+@@ -59,7 +59,7 @@ exclude_patterns = []
>+ for d in os.listdir(root_source_dir):
>+     if d not in ('share', doc_name, doc_name + '.rst'):
>+         exclude_patterns.append(d)
>+-        print 'ignoring %s' % d
>++        print(f'ignoring {d}')
>+ 
>+ extensions = []
>+ templates_path = ['_templates']
>+@@ -101,5 +101,5 @@ texinfo_documents = [
>+ 
>+ 
>+ def setup(app):
>+-    app.add_lexer('ada', ada_pygments.AdaLexer())
>+-    app.add_lexer('gpr', ada_pygments.GNATProjectLexer())
>++    app.add_lexer('ada', ada_pygments.AdaLexer)
>++    app.add_lexer('gpr', ada_pygments.GNATProjectLexer)
>diff --git a/math/sage/Makefile b/math/sage/Makefile
>index f8d30a68a1ff..40abacff9dff 100644
>--- a/math/sage/Makefile
>+++ b/math/sage/Makefile
>@@ -96,7 +96,7 @@ BUILD_DEPENDS=	bash:shells/bash		\
> 		${PYTHON_PKGNAMEPREFIX}simplegeneric>0:devel/py-simplegeneric@${PY_FLAVOR}\
> 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}\
> 		${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${PY_FLAVOR}\
>-		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}\
>+		${PYTHON_PKGNAMEPREFIX}sphinx3>0:textproc/py-sphinx3@${PY_FLAVOR}\
> 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR}\
> 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR}\
> 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR}\
>diff --git a/textproc/castxml/files/patch-doc_conf.py.in b/textproc/castxml/files/patch-doc_conf.py.in
>new file mode 100644
>index 000000000000..095153b6b598
>--- /dev/null
>+++ b/textproc/castxml/files/patch-doc_conf.py.in
>@@ -0,0 +1,11 @@
>+--- doc/conf.py.in.orig	2018-11-15 20:05:42 UTC
>++++ doc/conf.py.in
>+@@ -52,7 +52,7 @@ for fpath in castxml_manuals:
>+                               name, desc, [], int(sec)))
>+         else:
>+             sys.stderr.write("ERROR: No castxml-manual-description in '%s'\n" % fpath)
>+-    except Exception, e:
>++    except Exception as e:
>+         sys.stderr.write("ERROR: %s\n" % str(e))
>+ man_show_urls = False
>+ 
>diff --git a/textproc/py-rstfmt/Makefile b/textproc/py-rstfmt/Makefile
>index f16ca76ebb56..a6dc78d1cdd2 100644
>--- a/textproc/py-rstfmt/Makefile
>+++ b/textproc/py-rstfmt/Makefile
>@@ -10,6 +10,8 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> # Sphinix should be < 4.0 for now: https://github.com/dzhu/rstfmt/issues/12
>+BROKEN=	Doesn't work with Sphinx 4 or greater
>+
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=3.3.2:www/py-aiohttp@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}black>=19.10b0:devel/py-black@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sphinx>=2.4.0,1<4.0,1:textproc/py-sphinx@${PY_FLAVOR}
>diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
>index 18d37bfdab74..a8380c5c4b76 100644
>--- a/textproc/py-sphinx/Makefile
>+++ b/textproc/py-sphinx/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
> 
> PORTNAME=	sphinx
>-PORTVERSION=	3.5.2
>+PORTVERSION=	4.1.2
> PORTEPOCH=	1
> CATEGORIES=	textproc python
> MASTER_SITES=	CHEESESHOP
>@@ -26,7 +26,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphin
> 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \
>@@ -44,7 +44,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAV
> USES=		python:3.5+
> USE_PYTHON=	autoplist distutils concurrent
> 
>-CONFLICTS_INSTALL=	py*-sphinx18
>+CONFLICTS_INSTALL=	py*-sphinx3
> 
> NO_ARCH=	yes
> 
>@@ -52,6 +52,6 @@ NO_ARCH=	yes
> EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
> 
> do-test:
>-	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=
>+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= -k 'not test_ext_imgconverter'
> 
> .include <bsd.port.mk>
>diff --git a/textproc/py-sphinx/distinfo b/textproc/py-sphinx/distinfo
>index 7845a2f08750..6f13300436db 100644
>--- a/textproc/py-sphinx/distinfo
>+++ b/textproc/py-sphinx/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1615136512
>-SHA256 (python/Sphinx-3.5.2.tar.gz) = 672cfcc24b6b69235c97c750cb190a44ecd72696b4452acaf75c2d9cc78ca5ff
>-SIZE (python/Sphinx-3.5.2.tar.gz) = 5907358
>+TIMESTAMP = 1627947286
>+SHA256 (python/Sphinx-4.1.2.tar.gz) = 3092d929cd807926d846018f2ace47ba2f3b671b309c7a89cd3306e80c826b13
>+SIZE (python/Sphinx-4.1.2.tar.gz) = 6373677
>diff --git a/textproc/py-sphinx3/Makefile b/textproc/py-sphinx3/Makefile
>new file mode 100644
>index 000000000000..9034714c8cee
>--- /dev/null
>+++ b/textproc/py-sphinx3/Makefile
>@@ -0,0 +1,60 @@
>+# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
>+
>+PORTNAME=	sphinx
>+PORTVERSION=	3.5.2
>+PORTEPOCH=	1
>+CATEGORIES=	textproc python
>+MASTER_SITES=	CHEESESHOP
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>+PKGNAMESUFFIX=	3
>+DISTNAME=	Sphinx-${PORTVERSION}
>+DIST_SUBDIR=	python
>+
>+# NOTE: before committing to this port, contact portmgr to arrange for an
>+# experimental ports run.  Untested commits may be backed out at portmgr's
>+# discretion.
>+MAINTAINER=	python@FreeBSD.org
>+COMMENT=	Python documentation generator
>+
>+LICENSE=	BSD2CLAUSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+DEPRECATED=	Sphinx 3 is deprecated, consider using textproc/py-sphinx
>+
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>=0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>=0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>=0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>=0:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}imagesize>=0:graphics/py-imagesize@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
>+		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}typed-ast>=0:devel/py-typed-ast@${PY_FLAVOR} \
>+		cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
>+
>+USES=		python:3.5+
>+USE_PYTHON=	autoplist distutils concurrent
>+
>+CONFLICTS_INSTALL=	py*-sphinx
>+
>+NO_ARCH=	yes
>+
>+# Upstream archive contains files with UTF-8 names (#246618)
>+EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
>+
>+do-test:
>+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=
>+
>+.include <bsd.port.mk>
>diff --git a/textproc/py-sphinx3/distinfo b/textproc/py-sphinx3/distinfo
>new file mode 100644
>index 000000000000..7845a2f08750
>--- /dev/null
>+++ b/textproc/py-sphinx3/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1615136512
>+SHA256 (python/Sphinx-3.5.2.tar.gz) = 672cfcc24b6b69235c97c750cb190a44ecd72696b4452acaf75c2d9cc78ca5ff
>+SIZE (python/Sphinx-3.5.2.tar.gz) = 5907358
>diff --git a/textproc/py-sphinx3/pkg-descr b/textproc/py-sphinx3/pkg-descr
>new file mode 100644
>index 000000000000..0a007dcb2993
>--- /dev/null
>+++ b/textproc/py-sphinx3/pkg-descr
>@@ -0,0 +1,5 @@
>+Sphinx is a tool that makes it easy to create intelligent and beautiful
>+documentation for Python projects, written by Georg Brandl and licensed
>+under the BSD license.
>+
>+WWW: https://www.sphinx-doc.org/
>diff --git a/textproc/py-sphinxcontrib-htmlhelp/Makefile b/textproc/py-sphinxcontrib-htmlhelp/Makefile
>index 259f7410478b..dfabef813cd6 100644
>--- a/textproc/py-sphinxcontrib-htmlhelp/Makefile
>+++ b/textproc/py-sphinxcontrib-htmlhelp/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	sphinxcontrib-htmlhelp
>-PORTVERSION=	1.0.3
>+PORTVERSION=	2.0.0
> CATEGORIES=	textproc
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -10,7 +10,7 @@ COMMENT=	Sphinx extension which renders HTML help files
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		python:3.5+
>+USES=		python:3.6+
> USE_PYTHON=	autoplist concurrent distutils
> 
> NO_ARCH=	yes
>diff --git a/textproc/py-sphinxcontrib-htmlhelp/distinfo b/textproc/py-sphinxcontrib-htmlhelp/distinfo
>index 0223159541c6..e9197f123227 100644
>--- a/textproc/py-sphinxcontrib-htmlhelp/distinfo
>+++ b/textproc/py-sphinxcontrib-htmlhelp/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1586631496
>-SHA256 (sphinxcontrib-htmlhelp-1.0.3.tar.gz) = e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b
>-SIZE (sphinxcontrib-htmlhelp-1.0.3.tar.gz) = 24248
>+TIMESTAMP = 1624729684
>+SHA256 (sphinxcontrib-htmlhelp-2.0.0.tar.gz) = f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2
>+SIZE (sphinxcontrib-htmlhelp-2.0.0.tar.gz) = 28144
>diff --git a/textproc/py-sphinxcontrib-serializinghtml/Makefile b/textproc/py-sphinxcontrib-serializinghtml/Makefile
>index 6d02af2c6242..aebed7774450 100644
>--- a/textproc/py-sphinxcontrib-serializinghtml/Makefile
>+++ b/textproc/py-sphinxcontrib-serializinghtml/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	sphinxcontrib-serializinghtml
>-PORTVERSION=	1.1.4
>+PORTVERSION=	1.1.5
> CATEGORIES=	textproc
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/textproc/py-sphinxcontrib-serializinghtml/distinfo b/textproc/py-sphinxcontrib-serializinghtml/distinfo
>index 5bbc417ed49d..97d912cfcebe 100644
>--- a/textproc/py-sphinxcontrib-serializinghtml/distinfo
>+++ b/textproc/py-sphinxcontrib-serializinghtml/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1586631628
>-SHA256 (sphinxcontrib-serializinghtml-1.1.4.tar.gz) = eaa0eccc86e982a9b939b2b82d12cc5d013385ba5eadcc7e4fed23f4405f77bc
>-SIZE (sphinxcontrib-serializinghtml-1.1.4.tar.gz) = 18647
>+TIMESTAMP = 1624729792
>+SHA256 (sphinxcontrib-serializinghtml-1.1.5.tar.gz) = aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952
>+SIZE (sphinxcontrib-serializinghtml-1.1.5.tar.gz) = 21019

Actions: View | Diff

Attachments on bug 257116: 226374 | 227009 | 230098 | 230124 | 230142 | 230231