Attachment #226374 for bug #257116

Added Link Here

(-)b/biology/py-orange3-single-cell/files/patch-doc_conf.py (+10 lines)
1	# add_stylesheet() deprecated on Sphinx 4.0
2	# https://www.sphinx-doc.org/en/master/extdev/deprecated.html
3	--- doc/conf.py.orig 2018-10-15 08:43:14 UTC
4	+++ doc/conf.py
5	@@ -288,4 +288,4 @@ texinfo_documents = [
6	#texinfo_no_detailmenu = False
7
8	def setup(app):
9	- app.add_stylesheet('style.css')
10	+ app.add_css_file('style.css')




# 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




# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>

PORTNAME=	sphinx
PORTVERSION=	4.0.3
PORTEPOCH=	1
CATEGORIES=	textproc python
MASTER_SITES=	CHEESESHOP

		${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.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} \

USES=		python:3.5+
USE_PYTHON=	autoplist distutils concurrent

CONFLICTS_INSTALL=	py*-sphinx18

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= -k 'not test_ext_imgconverter'

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/textproc/py-sphinx/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1615136512	1	TIMESTAMP = 1625936823
2	SHA256 (python/Sphinx-3.5.2.tar.gz) = 672cfcc24b6b69235c97c750cb190a44ecd72696b4452acaf75c2d9cc78ca5ff	2	SHA256 (python/Sphinx-4.0.3.tar.gz) = dff357e6a208eb7edb2002714733ac21a9fe597e73609ff417ab8cf0c6b4fbb8
3	SIZE (python/Sphinx-3.5.2.tar.gz) = 5907358	3	SIZE (python/Sphinx-4.0.3.tar.gz) = 6164298

Lines 1-5 Link Here

(-)b/textproc/py-sphinxcontrib-htmlhelp/Makefile (-2 / +2 lines)
1	PORTNAME= sphinxcontrib-htmlhelp	1	PORTNAME= sphinxcontrib-htmlhelp
2	PORTVERSION= 1.0.3	2	PORTVERSION= 2.0.0
3	CATEGORIES= textproc	3	CATEGORIES= textproc
4	MASTER_SITES= CHEESESHOP	4	MASTER_SITES= CHEESESHOP
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 10-16 COMMENT= Sphinx extension which renders HTML help files Link Here
10	LICENSE= BSD2CLAUSE	10	LICENSE= BSD2CLAUSE
11	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
13	USES= python:3.5+	13	USES= python:3.6+
14	USE_PYTHON= autoplist concurrent distutils	14	USE_PYTHON= autoplist concurrent distutils
15		15
16	NO_ARCH= yes	16	NO_ARCH= yes

Lines 1-3 Link Here

(-)b/textproc/py-sphinxcontrib-htmlhelp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1586631496	1	TIMESTAMP = 1624729684
2	SHA256 (sphinxcontrib-htmlhelp-1.0.3.tar.gz) = e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b	2	SHA256 (sphinxcontrib-htmlhelp-2.0.0.tar.gz) = f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2
3	SIZE (sphinxcontrib-htmlhelp-1.0.3.tar.gz) = 24248	3	SIZE (sphinxcontrib-htmlhelp-2.0.0.tar.gz) = 28144

Lines 1-5 Link Here

(-)b/textproc/py-sphinxcontrib-serializinghtml/Makefile (-1 / +1 lines)
1	PORTNAME= sphinxcontrib-serializinghtml	1	PORTNAME= sphinxcontrib-serializinghtml
2	PORTVERSION= 1.1.4	2	PORTVERSION= 1.1.5
3	CATEGORIES= textproc	3	CATEGORIES= textproc
4	MASTER_SITES= CHEESESHOP	4	MASTER_SITES= CHEESESHOP
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)b/textproc/py-sphinxcontrib-serializinghtml/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1586631628	1	TIMESTAMP = 1624729792
2	SHA256 (sphinxcontrib-serializinghtml-1.1.4.tar.gz) = eaa0eccc86e982a9b939b2b82d12cc5d013385ba5eadcc7e4fed23f4405f77bc	2	SHA256 (sphinxcontrib-serializinghtml-1.1.5.tar.gz) = aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952
3	SIZE (sphinxcontrib-serializinghtml-1.1.4.tar.gz) = 18647	3	SIZE (sphinxcontrib-serializinghtml-1.1.5.tar.gz) = 21019

Return to bug 257116

Added Link Here

(-)b/deskutils/py-paperless/files/patch-docs_conf.py (+13 lines)
1	# add_stylesheet() deprecated on Sphinx 4.0
2	# https://www.sphinx-doc.org/en/master/extdev/deprecated.html
3	--- docs/conf.py.orig 2019-01-27 13:48:05 UTC
4	+++ docs/conf.py
5	@@ -21,7 +21,7 @@ exec(open("../src/paperless/version.py").read())
6
7	# Believe it or not, this is the officially sanctioned way to add custom CSS.
8	def setup(app):
9	- app.add_stylesheet("custom.css")
10	+ app.add_css_file("custom.css")
11
12	# If extensions (or modules to document with autodoc) are in another directory,
13	# add these directories to sys.path here. If the directory is relative to the

Lines 1-7 Link Here

(-)b/textproc/py-sphinx/Makefile (-5 / +3 lines)
1	# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>	1	# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
2		2
3	PORTNAME= sphinx	3	PORTNAME= sphinx
4	PORTVERSION= 3.5.2	4	PORTVERSION= 4.0.3
5	PORTEPOCH= 1	5	PORTEPOCH= 1
6	CATEGORIES= textproc python	6	CATEGORIES= textproc python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
Lines 26-32 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphin Link Here
26	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \	26	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \	27	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \	28	${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR} \	29	${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} \
30	${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${PY_FLAVOR} \	30	${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${PY_FLAVOR} \
31	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \	31	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
32	${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \	32	${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \
Lines 44-57 TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAV Link Here
44	USES= python:3.5+	44	USES= python:3.5+
45	USE_PYTHON= autoplist distutils concurrent	45	USE_PYTHON= autoplist distutils concurrent
46		46
47	CONFLICTS_INSTALL= py*-sphinx18
48
49	NO_ARCH= yes	47	NO_ARCH= yes
50		48
51	# Upstream archive contains files with UTF-8 names (#246618)	49	# Upstream archive contains files with UTF-8 names (#246618)
52	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar	50	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
53		51
54	do-test:	52	do-test:
55	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=	53	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= -k 'not test_ext_imgconverter'
56		54
57	.include <bsd.port.mk>	55	.include <bsd.port.mk>