freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

textproc/py-docutils: Update to 0.21.2

Browse Source 
And fix some build errors caused by this update
PR:		280080
Reported by:	wen@
Exp-run by:	antoine@
Approved by:	portmgr(blanket, fix build)
This commit is contained in:
Wen Heping 2024-07-11 09:02:12 +00:00
parent 5ae5dc734a
commit c0615e6aa3
12 changed files with 34 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/libvirt/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= libvirt PORTNAME= libvirt
PORTVERSION= 10.3.0 PORTVERSION= 10.3.0
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= http://libvirt.org/sources/ \ MASTER_SITES= http://libvirt.org/sources/ \
ftp://libvirt.org/libvirt/ ftp://libvirt.org/libvirt/
@ -17,7 +18,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
BUILD_DEPENDS= dnsmasq:dns/dnsmasq \ BUILD_DEPENDS= dnsmasq:dns/dnsmasq \
${LOCALBASE}/bin/grep:textproc/gnugrep \ ${LOCALBASE}/bin/grep:textproc/gnugrep \
gsed:textproc/gsed \ gsed:textproc/gsed \
rst2html-${PYTHON_VER}:textproc/py-docutils@${PY_FLAVOR} \ rst2html:textproc/py-docutils@${PY_FLAVOR} \
xsltproc:textproc/libxslt xsltproc:textproc/libxslt
RUN_DEPENDS= dnsmasq:dns/dnsmasq RUN_DEPENDS= dnsmasq:dns/dnsmasq
@ -146,9 +147,7 @@ SHLIB_VER= 0.10003.0
PLIST_SUB+= SHLIB_VER=${SHLIB_VER} PLIST_SUB+= SHLIB_VER=${SHLIB_VER}
PORTDOCS= * PORTDOCS= *
#SHEBANG_FILES= src/keycodemapdb/tools/keymap-gen #SHEBANG_FILES= src/keycodemapdb/tools/keymap-gen
BINARY_ALIAS= python3=${PYTHON_CMD} \ BINARY_ALIAS= python3=${PYTHON_CMD}
rst2man.py=rst2man.py-${PYTHON_VER} \
rst2html5.py=rst2html5.py-${PYTHON_VER}
SUB_FILES= pkg-message SUB_FILES= pkg-message

4
games/taisei/Makefile
View File

@ -38,8 +38,8 @@ PORTDATA= *
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
DOCS_BUILD_DEPENDS=rst2html5.py:textproc/py-docutils DOCS_BUILD_DEPENDS= rst2html5:textproc/py-docutils
DOCS_MESON_TRUE=docs DOCS_MESON_TRUE= docs
post-install: post-install:
@${RM} ${STAGEDIR}${DOCSDIR}/COPYING.txt @${RM} ${STAGEDIR}${DOCSDIR}/COPYING.txt

2
games/taisei/files/patch-doc_meson.build
View File

@ -18,7 +18,7 @@
- -
rst2html5 = find_program( rst2html5 = find_program(
- rst2html_variants, - rst2html_variants,
+ 'rst2html5.py', + 'rst2html5',
required : false required : false
) )

4
graphics/opensubdiv/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= opensubdiv PORTNAME= opensubdiv
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 3_6_0 DISTVERSION= 3_6_0
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= graphics CATEGORIES= graphics
MAINTAINER= FreeBSD@Shaneware.biz MAINTAINER= FreeBSD@Shaneware.biz
@ -36,7 +36,7 @@ PTEX_DESC= ptex support
TBB_DESC= Intel threading building blocks TBB_DESC= Intel threading building blocks
TUTORIALS_DESC= Install tutorial programs TUTORIALS_DESC= Install tutorial programs
DOCS_BUILD_DEPENDS= rst2html.py:textproc/py-docutils \ DOCS_BUILD_DEPENDS= rst2html:textproc/py-docutils \
doxygen>=1.8.4:devel/doxygen doxygen>=1.8.4:devel/doxygen
DOCS_USES= python:build DOCS_USES= python:build
DOCS_CMAKE_BOOL_OFF= NO_DOC DOCS_CMAKE_BOOL_OFF= NO_DOC

21
textproc/py-docutils/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= docutils PORTNAME= docutils
PORTVERSION= 0.19 PORTVERSION= 0.21.2
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= textproc python CATEGORIES= textproc python
MASTER_SITES= PYPI MASTER_SITES= PYPI
@ -12,8 +12,15 @@ WWW= https://docutils.sourceforge.io/
LICENSE= BSD2CLAUSE GPLv3+ PD PSFL LICENSE= BSD2CLAUSE GPLv3+ PD PSFL
LICENSE_COMB= multi LICENSE_COMB= multi
USES= python BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.4<4:devel/py-flit-core@${PY_FLAVOR}
USE_PYTHON= autoplist concurrent distutils
USES= python shebangfix
USE_PYTHON= autoplist concurrent pep517
SHEBANG_FILES= docutils/writers/odf_odt/prepstyles.py \
docutils/__main__.py \
docutils/utils/smartquotes.py \
docutils/utils/math/math2html.py
NO_ARCH= yes NO_ARCH= yes
@ -24,14 +31,6 @@ PYGMENTS_DESC= Syntax highlighting
PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
SCRIPTS= rst2html rst2latex rst2man rst2odt rst2odt_prepstyles \
rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html
post-install:
.for script in ${SCRIPTS}
${LN} -s ${script}.py-${PYTHON_VER} ${STAGEDIR}${PREFIX}/bin/${script}
.endfor
do-test: do-test:
cd ${WRKSRC} && ${PYTHON_CMD} test/alltests.py --verbose cd ${WRKSRC} && ${PYTHON_CMD} test/alltests.py --verbose

6
textproc/py-docutils/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1662997695 TIMESTAMP = 1720223208
SHA256 (docutils-0.19.tar.gz) = 33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6 SHA256 (docutils-0.21.2.tar.gz) = 3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f
SIZE (docutils-0.19.tar.gz) = 2056383 SIZE (docutils-0.21.2.tar.gz) = 2204444

10
textproc/py-docutils/pkg-plist
View File

@ -1,10 +0,0 @@
bin/rst2html
bin/rst2latex
bin/rst2man
bin/rst2odt
bin/rst2odt_prepstyles
bin/rst2pseudoxml
bin/rst2s5
bin/rst2xetex
bin/rst2xml
bin/rstpep2html

4
textproc/py-sphinx-tabs/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= sphinx-tabs PORTNAME= sphinx-tabs
PORTVERSION= 3.4.1 PORTVERSION= 3.4.1
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= textproc python CATEGORIES= textproc python
MASTER_SITES= PYPI MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.18.0,1<0.20.0,1:textproc/py-docutils@${PY_FLAVOR} \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.18.0,1<0.22.0,1:textproc/py-docutils@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0,1:textproc/py-docutils@${PY_FLAVOR} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0,1:textproc/py-docutils@${PY_FLAVOR} \

4
textproc/py-sphinx/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= sphinx PORTNAME= sphinx
PORTVERSION= 5.3.0 PORTVERSION= 5.3.0
PORTREVISION= 1 PORTREVISION= 2
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= textproc python CATEGORIES= textproc python
MASTER_SITES= PYPI MASTER_SITES= PYPI
@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphin
${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pygments>=2.12:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.12:textproc/py-pygments@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}docutils>=0.14,1<0.20,1:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.14,1<0.22,1:textproc/py-docutils@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}snowballstemmer>=2.0:textproc/py-snowballstemmer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=2.0:textproc/py-snowballstemmer@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Babel>=2.9:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Babel>=2.9:devel/py-babel@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \

2
x11/py-pynput/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= pynput PORTNAME= pynput
DISTVERSION= 1.7.6 DISTVERSION= 1.7.6
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= x11 CATEGORIES= x11
MASTER_SITES= PYPI # no tests on PYPI, but GitHub tarball doesn't bui;d MASTER_SITES= PYPI # no tests on PYPI, but GitHub tarball doesn't bui;d
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

9
x11/py-pynput/files/patch-setup.py
View File

@ -1,13 +1,16 @@
- setuptools-lint isn't really needed during build - setuptools-lint isn't really needed during build
--- setup.py.orig 2023-01-31 20:21:18 UTC --- setup.py.orig 2022-01-01 19:56:27 UTC
+++ setup.py +++ setup.py
@@ -23,7 +23,7 @@ RUNTIME_PACKAGES = [ @@ -23,8 +23,9 @@ SETUP_PACKAGES = [
#: Additional requirements used during setup #: Additional requirements used during setup
SETUP_PACKAGES = [ SETUP_PACKAGES = [
- 'setuptools-lint >=0.5', - 'setuptools-lint >=0.5',
- 'sphinx >=1.3.1']
+ #'setuptools-lint >=0.5', + #'setuptools-lint >=0.5',
'sphinx >=1.3.1'] + #'sphinx >=1.3.1']
+ ]
#: Packages requires for different environments #: Packages requires for different environments
EXTRA_PACKAGES = {

4
x11/sddm/Makefile
View File

@ -16,7 +16,7 @@ LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE
LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0 LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0
BUILD_DEPENDS= rst2man.py-${PYTHON_VER}:textproc/py-docutils@${PY_FLAVOR} BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR}
RUN_DEPENDS= consolekit2>1.2.5:sysutils/consolekit2 \ RUN_DEPENDS= consolekit2>1.2.5:sysutils/consolekit2 \
dbus-launch:devel/dbus \ dbus-launch:devel/dbus \
xauth:x11/xauth \ xauth:x11/xauth \
@ -37,7 +37,7 @@ CMAKE_ARGS= -DUID_MIN=1000 \
-DUID_MAX=65000 \ -DUID_MAX=65000 \
-DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc \
-DACCOUNTSSERVICE_DATA_DIR:PATH=/var/db/AccountsService \ -DACCOUNTSSERVICE_DATA_DIR:PATH=/var/db/AccountsService \
-DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man.py-${PYTHON_VER} \ -DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man \
-DSDDM_INITIAL_VT=7 -DSDDM_INITIAL_VT=7
USE_RC_SUBR= sddm USE_RC_SUBR= sddm