From nobody Tue Feb 18 14:30:37 2025 X-Original-To: dev-commits-ports-all@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 4Yy24Z5NYGz5nhZK; Tue, 18 Feb 2025 14:30:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yy24Y4M8Bz3CjZ; Tue, 18 Feb 2025 14:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739889037; 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=uiDHf3BWDd8inedyf6ZJHV3tO18qrlOoGmPV3b/ba/w=; b=DFpVoprdd19+3FAshwekzM+YclSdoVfDQFPuZAOuhO9c0aJApR/Vs/05TIKLp6QHMvT10G d7GIQ0CNspi/CTdBGpmH7sc4CSQp442F5nYLqthFaWodL1kiYIsXpFFRBPiZRGJ2VJcmU9 elR+/CYsFKbWYo5xw2TSiGqBME6hTwnlZZqcEV6PqwvVHqvpNRFeX/NncPFAN2c7niLQl6 770b9xBILTmCHA8+1uboJOwpVXatS91Hk1O82DRw7Qe6Y+tBXJUt5n/V65tW1B+KGEbSpx GtA5pP3j/zMWg7442razctTbmYwFFWKsxt3xJ7qF+Y34q5DJIkJA0bQFIGJJ6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739889037; a=rsa-sha256; cv=none; b=AVAxj78kGk+hhfCZoh0jaKRO0rZmoe/gHGEnPSpE8H89ooee4b/L/IlH/pCC9kao6HC6BM rx5LNzhOeu3y7q2Xp3PoLtMe10MGUfJ6ati1jOmbKiU9LvUgqKGPNzVIi9bA4CRfvflHS+ RlkSVfEdp0chm38VWNRUHjTp15pfAEn2dKwVDwu+Zuue8vWPW2zKAtmYfIX9U/kqWe8aJM 7QFPVx57VFW+6FH2eB7TVlaobcfRR98eHBphrtykn/dUPWTmqzRWfs0u+U727zmR5ii7Wc n8L5r8kbQLuZcJKhBheQ+56Yy/+DoK8Kg9RVt6UfVByXQsCJdIJUkqMXJNSHdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739889037; 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=uiDHf3BWDd8inedyf6ZJHV3tO18qrlOoGmPV3b/ba/w=; b=VDs2GsZVmdphuvo7NY6huKSWHR27WRZY4OqoPwPWlIc8Uj50ZGVAblanCk3bV00OhimNSX w1HyMSoBZEeCofHm7C1VozQ5WAGCTwslGI6tCbC7GegEBb0Ed77gAr+GyNJxpn79v73wfv J1zcCofF7Y9zdMKlu/oRQIW31/825pQ6v/v9klXASrCKJs6XZVR4wts6Nf7IOUEQ/ua0ka 8OKeKXnwvYbrmfVkv/5GQqsK7vxzDmbY7yaDpwd/g96+Fm/nr5d+OFs4TkV19kP1D5/DIr 7780J78C6pIvghP0q5VcrFwfd48Vtvu4Lryflcne7rhiQ1PsC9QPDrSV4IsCmQ== 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 4Yy24Y2jqSz7md; Tue, 18 Feb 2025 14:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51IEUbhS059624; Tue, 18 Feb 2025 14:30:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IEUbLX059621; Tue, 18 Feb 2025 14:30:37 GMT (envelope-from git) Date: Tue, 18 Feb 2025 14:30:37 GMT Message-Id: <202502181430.51IEUbLX059621@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: ecdeebe2a412 - 2025Q1 - archivers/py-comicapi: Fix RAR and 7z Support List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: ecdeebe2a41290b80fc8024f5f421dc8d963cc47 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecdeebe2a41290b80fc8024f5f421dc8d963cc47 commit ecdeebe2a41290b80fc8024f5f421dc8d963cc47 Author: Matthew Wener AuthorDate: 2025-02-16 17:40:37 +0000 Commit: Robert Clausecker CommitDate: 2025-02-18 14:29:39 +0000 archivers/py-comicapi: Fix RAR and 7z Support 1) The wrong dependencies were used for RAR. Fix unrar (incorrect) -> rar (correct) 2) Apply patch to fix 7z file reader PR: 284549 MFH: 2025Q1 (cherry picked from commit 0378893424231ecb3411ffa615254345aeee17a9) --- archivers/py-comicapi/Makefile | 22 ++++++++++++++-------- archivers/py-comicapi/distinfo | 4 +++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/archivers/py-comicapi/Makefile b/archivers/py-comicapi/Makefile index 9a6e88ded594..9ec4950f590d 100644 --- a/archivers/py-comicapi/Makefile +++ b/archivers/py-comicapi/Makefile @@ -1,8 +1,12 @@ PORTNAME= comicapi -PORTVERSION= 3.2.0 +DISTVERSION= 3.2.0 +PORTREVISION= 1 CATEGORIES= archivers python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_ACCOUNT}/commit/ +PATCHFILES= 956c383e5f133f3147f55f8f65b501db1c4a0284.patch:-p1 + MAINTAINER= matthew@wener.org COMMENT= Comic archive (cbr/cbz) and metadata utilities WWW= https://github.com/comictagger/comicapi @@ -10,6 +14,9 @@ WWW= https://github.com/comictagger/comicapi LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PY_SETUPTOOLS} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}natsort>=0:devel/py-natsort@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ @@ -17,14 +24,17 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-met ${PYTHON_PKGNAMEPREFIX}rapidfuzz>=0:devel/py-rapidfuzz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}text2digits>=0:textproc/py-text2digits@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wordninja>=0:textproc/py-wordninja@${PY_FLAVOR} +TEST_DEPENDS= ${7Z_RUN_DEPENDS} \ + ${CBR_RUN_DEPENDS} USES= python USE_GITHUB= yes GH_ACCOUNT= comictagger GH_TAGNAME= 2bf8332 -USE_PYTHON= autoplist distutils pytest +USE_PYTHON= autoplist pep517 pytest +MAKE_ENV= SETUPTOOLS_SCM_PRETEND_VERSION=${DISTVERSION} TEST_ENV= ${MAKE_ENV} \ PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} @@ -37,13 +47,9 @@ OPTIONS_DEFAULT= ICU CBR_DESC= CBR ICU_DESC= ICU -7Z_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py7zr>=0:archivers/py-py7zr@${PY_FLAVOR} +7Z_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py7zr>=0:archivers/py-py7zr@${PY_FLAVOR} CBR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rarfile>=0:archivers/py-rarfile@${PY_FLAVOR} \ - unrar>=0:archivers/unrar + rar>=0:archivers/rar ICU_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyicu>=0:devel/py-pyicu@${PY_FLAVOR} -# The two sorting tests may fail based on system locale -do-test: - @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v - .include diff --git a/archivers/py-comicapi/distinfo b/archivers/py-comicapi/distinfo index 781ecf7d8b70..81ec55a2be51 100644 --- a/archivers/py-comicapi/distinfo +++ b/archivers/py-comicapi/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1724809518 +TIMESTAMP = 1739727096 SHA256 (comictagger-comicapi-3.2.0-2bf8332_GH0.tar.gz) = a96a0cdca8f5efc3337fe194f59b86e369e23d12e0fcec81e3c34b9e652c1f18 SIZE (comictagger-comicapi-3.2.0-2bf8332_GH0.tar.gz) = 17401837 +SHA256 (956c383e5f133f3147f55f8f65b501db1c4a0284.patch) = 409d35e51f9bed2d391218f4f49d5b94c9eb3aa9c46b2f8c12ea30e7dd2013e0 +SIZE (956c383e5f133f3147f55f8f65b501db1c4a0284.patch) = 911