From nobody Fri Feb 24 05:54:19 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PNJxR5LK3z3tJg9; Fri, 24 Feb 2023 05:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PNJxR4pXGz4YBv; Fri, 24 Feb 2023 05:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677218059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CtVyAjTnZW/qeNmbq/yVoK8mvp+uUR+OLcL/yhC3Eq8=; b=bkdCQNC2Zrmk23+mNlHxwgpfNvuAypoLETe6P0bxyIaSVZbIq2IXfNBRwHqJRjDrfrQ0+I V6CiesXTT+rCMe7XzuSP1exmA30V29XQjSHaVqCuVkLx2kfOpAbMKJNPSejoRhZ49GVm8G crMRN38lHwJIEzdd4D8sQWiOiVMkPEufSu9OjhckvHsKnoKOL6PZLGl0S08Hh/qtO7vmIu UZRePqjBH+Ks8Y/1letZ9cAq6ccfyRCd3ShHoSjgf953qPDfXnwkzAJ5Fk60LPAr2G6eh4 6f1y1vx8aE4uDj+hIi8ofibePNBc81U8I9+N2UtCRm+p/rnMzDKezaKTo/msrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677218059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CtVyAjTnZW/qeNmbq/yVoK8mvp+uUR+OLcL/yhC3Eq8=; b=u53iJbq7AQkGbo+Ov7ihLurxjtMa9wCJR9sGQpoXVm/4VVrIlcnRqSWIEQpqRmqeaA/Qhi +FScN5U+LqvnnmX1eugTkdXhOQyBBANTqEXV8ic2pz2oJX5tp26WPWGibsVTn1z1XQli0q +SqRdp0b8lHHSqH7NEjhJBRQac5rf24en72bguPPEcjV/O977DeAiQCr7/5QZzvL3UWM8o hFofuHUezmeyevyQ7ZhLx5rrmjnMZ/oakoITcB9pcpyk8KCsqMtE8CBwhedlOchXlePsIL CPC7y+yo/4M+cBrsa8MokqosZBLK037XmE6SEGEBfbm2gWwWZgZU9DEMO12WpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677218059; a=rsa-sha256; cv=none; b=q1xLcG87fqh9PzMTHBExhTGO3Jx0ZOgFEL/hUWVPIY4QNYOhPs+Ed8gkwYxTWVfedbm96J LhxZq0ZCgtWz5VBx/QsWg9WvIwxW8/I+Br8H87j5asYLaxCzM2gOGerkEOdnFx1mHtXXqE SH0C8wM/g6Iomh/aG8ss26GiUGkVEupsBZdT40AEqzqxha3g/SbgEAA8+XbOrhB9BgtU1J a0oQmMyhhfxBMt230Y8j+IzyhL5/sjeNhWPk7p1exZcLEg8d+J8PSCKdgAMkThzyqxPJpz RYFH0YF9zSvHxXbP7e25tjEBl3FXTEJh+w1vUSxsaZgrMZPA8xHp63mXuRaBkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PNJxR3m6gz1BcR; Fri, 24 Feb 2023 05:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31O5sJ5E004561; Fri, 24 Feb 2023 05:54:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31O5sJ8o004560; Fri, 24 Feb 2023 05:54:19 GMT (envelope-from git) Date: Fri, 24 Feb 2023 05:54:19 GMT Message-Id: <202302240554.31O5sJ8o004560@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 34297ee65de9 - main - textproc/py-ocrmypdf: Update to 14.0.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34297ee65de9a3b2a3e60242d1163f3a1a2514fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=34297ee65de9a3b2a3e60242d1163f3a1a2514fc commit 34297ee65de9a3b2a3e60242d1163f3a1a2514fc Author: Kai Knoblich AuthorDate: 2023-02-24 05:51:37 +0000 Commit: Kai Knoblich CommitDate: 2023-02-24 05:53:05 +0000 textproc/py-ocrmypdf: Update to 14.0.3 * Switch to PEP-517 build framework. Changelogs since 13.7.0: https://github.com/ocrmypdf/OCRmyPDF/blob/v14.0.3/docs/release_notes.rst MFH: No (PEP-517 support not present in 2023Q1 branch) --- textproc/py-ocrmypdf/Makefile | 27 +++++++++---------------- textproc/py-ocrmypdf/distinfo | 6 +++--- textproc/py-ocrmypdf/files/patch-pyproject.toml | 13 ++++++++++++ 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/textproc/py-ocrmypdf/Makefile b/textproc/py-ocrmypdf/Makefile index 4e25016d86e9..11623dcf0142 100644 --- a/textproc/py-ocrmypdf/Makefile +++ b/textproc/py-ocrmypdf/Makefile @@ -1,5 +1,5 @@ PORTNAME= ocrmypdf -DISTVERSION= 13.7.0 +DISTVERSION= 14.0.3 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,25 +11,27 @@ WWW= https://github.com/ocrmypdf/OCRmyPDF LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coloredlogs>=14.0:devel/py-coloredlogs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}deprecation>=2.1.0:devel/py-deprecation@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}img2pdf>=0.3.0:graphics/py-img2pdf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=8.2.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=4:misc/py-tqdm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.5.66:print/py-reportlab@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pdfminer.six>=20191110:textproc/py-pdfminer.six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pikepdf>=4.0.0:textproc/py-pikepdf@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pdfminer.six>=20201018:textproc/py-pdfminer.six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pikepdf>=5.0.1:textproc/py-pikepdf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluggy>=0.13.0:devel/py-pluggy@${PY_FLAVOR} \ tesseract:graphics/tesseract TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.1:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=2.2.0:devel/py-pytest-xdist@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-xmp-toolkit>=2.0.1:textproc/py-python-xmp-toolkit@${PY_FLAVOR} -USES= ghostscript:run python:3.7+ shebangfix +USES= ghostscript:run python:3.8+ shebangfix USE_LOCALE= en_US.UTF-8 -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent pep517 SHEBANG_FILES= src/ocrmypdf/__main__.py \ src/ocrmypdf/hocrtransform.py \ @@ -50,10 +52,6 @@ UNPAPER_RUN_DEPENDS= unpaper:graphics/unpaper .include -.if ${PYTHON_REL} < 30800 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4:devel/py-importlib-metadata@${PY_FLAVOR} -.endif - .if ${PYTHON_REL} < 30900 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=5:devel/py-importlib-resources@${PY_FLAVOR} .endif @@ -62,13 +60,6 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=5:devel/py-importlib-r RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4:devel/py-typing-extensions@${PY_FLAVOR} .endif -# The "pyproject.toml" wants devel/py-setuptools_scm >= 7.0.5 which isn't in -# the Ports tree, yet. Although py-ocrmypdf builds fine as the "setup.cfg" is -# used during build instead the "pyproject.toml" move the latter one out of the -# way to prevent surprises. -post-extract: - @${MV} ${WRKSRC}/pyproject.toml ${WRKSRC}/pyproject.toml.dist - post-install: # Install shell completion files @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/ diff --git a/textproc/py-ocrmypdf/distinfo b/textproc/py-ocrmypdf/distinfo index 33eede6cf05b..0cc22cca34a8 100644 --- a/textproc/py-ocrmypdf/distinfo +++ b/textproc/py-ocrmypdf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665938750 -SHA256 (ocrmypdf-13.7.0.tar.gz) = 45fa226f6753f6e0be1e6304d3363a6d8047bb4cb0cf0d25728c3b9c9a0bff40 -SIZE (ocrmypdf-13.7.0.tar.gz) = 7911229 +TIMESTAMP = 1677178213 +SHA256 (ocrmypdf-14.0.3.tar.gz) = db03cdd1a5d277fa038b0420ba05fcf7b1f92729ba85431344844ebf01035160 +SIZE (ocrmypdf-14.0.3.tar.gz) = 6512083 diff --git a/textproc/py-ocrmypdf/files/patch-pyproject.toml b/textproc/py-ocrmypdf/files/patch-pyproject.toml new file mode 100644 index 000000000000..23b9b0e3f6d8 --- /dev/null +++ b/textproc/py-ocrmypdf/files/patch-pyproject.toml @@ -0,0 +1,13 @@ +Allow build with older versions of devel/py-setuptools_scm . + +--- pyproject.toml.orig 2023-02-23 20:43:57 UTC ++++ pyproject.toml +@@ -3,7 +3,7 @@ requires = [ + [build-system] + requires = [ + "setuptools >= 61", +- "setuptools_scm[toml] >= 7.0.5", ++ "setuptools_scm[toml]", + "wheel" + ] + build-backend = "setuptools.build_meta"