From nobody Thu Apr 2 15:42:15 2026 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 4fmmLw16z7z6YDWl for ; Thu, 02 Apr 2026 15:42:16 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmmLw0Twyz42rn for ; Thu, 02 Apr 2026 15:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775144536; 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=4TxBM+D38NjuUDRkNf9R/XLW473VsnlSybGFObl1GXU=; b=NMPAt2Fe5gpfHsXi/IE4SlAJzmxcHbdYoHiLt1DS5c37f9cItWxvL5l2MQH/JSZ9fN4xP4 sKkATzR1437ArNgiUXH+J/WTUNQ7+TrMf21YYKS+5z+6Wck9bNn7bB6NaE3Xc4pyWGQFqy fkGwnTlS0vVIx7G6MpjK11sJpPVwJpK0KL2YcWfHKqM5iCIhQ22QqLRukOEgr4id5UnLXO qE0Y/IwHnRNcLtDZcTzSGhVODcz8Kp2awewInlEutEiopz99/Ki/7+7Yd6WLlain5sbAQY PzPISFGDP6Pb5G2PPOHt1lBJeg3XNahN9RxSkHiRxASJIyMcVlEhF371I1Lm/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775144536; a=rsa-sha256; cv=none; b=eKvj0ybQrQ7Sjk2xJ+VuDU4zwxInr/Nm4l3zI1myrR2vo6VJD5x4VINm84bZDegQrKZV2D x/fa0LMfFHVYoTkV21mtnPpg2gBsBhHmKH7gSdwcvlYhJb1DqgWh4t5cVdAph7GWYmOCNP jqZ/6e75JTn8l2SwFOd6jpDuaRiGfFoBhMD1bCI9OGxWJNi1fgNxm0LscECHDHMNZTmmyb Nu2P6FvJCRksXY1PIRae1aPwgaVm35uUkpYoCoFt1r2WZh4cmnCY+cuxHvvF+sx2BzrXdZ garcj8Q+NeiNYxf1dDJR+IvOic7Wjo0Qq6xVC76u5/22oUlt+5RxAhU8LGmo/w== 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=1775144536; 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=4TxBM+D38NjuUDRkNf9R/XLW473VsnlSybGFObl1GXU=; b=jYXcPJhL4wA2Hek4ltvJDTfey/0Zuu48/JX+Puk2RQy8uCT1BKg0cDeWMJYgBG/URu8/sr lvZe/WR4hz59WKWncM2BPBe1DvjXAVUCSbHNyp2ZtQ43b+iSfcOzi0Uo7Xqu7X0Dx1ezsV 3YiAkuXAfBjClbtQmO8Vqb912Kx+S3iriKrlOQbU65ULPo/I9mqivTbQrrQV0I9vj2hDK4 7jNXhJxoQBs7w5mbElSvY/ICCZKw/zs0/MIRBTqNK1iCTl7PWsMVCz6ZcbMIcBbb8A3ooE qmWc7RQhH7nSnFtSUDmPs5j/7PC1DjKNM7+vkddddrDHp2V8ya6tKZM6LA4oEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmmLv73t1z16XW for ; Thu, 02 Apr 2026 15:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42313 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 15:42:15 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 04bcfa800827 - main - games/anki: Remove py-ruff from BUILD_DEPENDS 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 04bcfa80082776584846b809bb7768d187161a69 Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 15:42:15 +0000 Message-Id: <69ce8e57.42313.78a0da8@gitrepo.freebsd.org> The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=04bcfa80082776584846b809bb7768d187161a69 commit 04bcfa80082776584846b809bb7768d187161a69 Author: Kai Knoblich AuthorDate: 2026-04-02 15:41:40 +0000 Commit: Kai Knoblich CommitDate: 2026-04-02 15:41:40 +0000 games/anki: Remove py-ruff from BUILD_DEPENDS * devel/py-ruff is used for the generated "hooks.py" to format it accordingly, which makes little sense on the downstream side in terms of packaging. --- games/anki/Makefile | 1 - games/anki/files/patch-pylib_tools_hookslib.py | 36 +++++--------------------- 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/games/anki/Makefile b/games/anki/Makefile index 8b22fa85c2f7..4766fecb9c14 100644 --- a/games/anki/Makefile +++ b/games/anki/Makefile @@ -23,7 +23,6 @@ BUILD_DEPENDS= protoc:devel/protobuf \ ${PYTHON_PKGNAMEPREFIX}black>0:devel/py-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mypy-protobuf>=1.21:devel/py-mypy-protobuf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ruff>0:devel/py-ruff@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libzstd.so:archivers/zstd RUN_DEPENDS= lame:audio/lame \ diff --git a/games/anki/files/patch-pylib_tools_hookslib.py b/games/anki/files/patch-pylib_tools_hookslib.py index 8abac8c7ba0e..3d119140b5a6 100644 --- a/games/anki/files/patch-pylib_tools_hookslib.py +++ b/games/anki/files/patch-pylib_tools_hookslib.py @@ -1,36 +1,14 @@ -Skip code formatting with "ruff" on !FreeBSD RELEASE builds to prevent -following error (observed with FreeBSD 15.0-CURRENT n278368-5c9b1c7e5f27): +Remove dependency on devel/py-ruff used to format the generated hooks.py +file as it is not relevant in a packaging use case. -[...] -FAILED: /wrkdirs/usr/ports/games/anki/work/anki-25.07.2/out/qt/_aqt/hooks.py -/wrkdirs/usr/ports/games/anki/work/anki-25.07.2/out/rust/release/runner run /wrkdirs/usr/ports/games/anki/work/anki-25.07.2/out/pyenv/bin/python qt/tools/genhooks_gui.py /wrkdirs/usr/ports/games/anki/work/anki-25.07.2/out/qt/_aqt/hooks.py -: jemalloc_tsd.c:190: Failed assertion: "!tsd_in_nominal_list(tsd)" -Traceback (most recent call last): - File "/wrkdirs/usr/ports/games/anki/work/anki-25.07.2/qt/tools/genhooks_gui.py", line 1381, in - write_file(path, hooks, prefix, suffix) - File "/wrkdirs/usr/ports/games/anki/work/anki-25.07.2/pylib/tools/hookslib.py", line 208, in write_file - subprocess.run([sys.executable, "-m", "ruff", "format", "-q", path], check=True) - File "/usr/local/lib/python3.11/subprocess.py", line 571, in run - raise CalledProcessError(retcode, process.args, - subprocess.CalledProcessError: Command '['/wrkdirs/usr/ports/games/anki/work/anki-25.07.2/out/pyenv/bin/python', '-m', 'ruff', 'format', '-q', '/wrkdirs/usr/ports/games/anki/work/anki-25.07.2/out/qt/_aqt/hooks.py']' died with . - Failed with code Some(1): /wrkdirs/usr/ports/games/anki/work/anki-25.07.2/out/pyenv/bin/python qt/tools/genhooks_gui.py /wrkdirs/usr/ports/games/anki/work/anki-25.07.2/out/qt/_aqt/hooks.py -[...] +Obtained from: ---- pylib/tools/hookslib.py.orig 2025-07-09 11:37:00 UTC +https://gitlab.alpinelinux.org/alpine/aports/-/raw/3.23-stable/community/anki/strip-formatter-deps.patch + +--- pylib/tools/hookslib.py.orig 2025-09-17 06:50:13 UTC +++ pylib/tools/hookslib.py -@@ -7,6 +7,7 @@ from __future__ import annotations - - from __future__ import annotations - -+import platform - import subprocess - import sys - from dataclasses import dataclass -@@ -205,4 +206,6 @@ def write_file(path: str, hooks: list[Hook], prefix: s +@@ -205,4 +205,3 @@ def write_file(path: str, hooks: list[Hook], prefix: s with open(path, "wb") as file: file.write(code.encode("utf8")) - subprocess.run([sys.executable, "-m", "ruff", "format", "-q", path], check=True) -+ -+ if platform.system() == 'FreeBSD' and platform.release().endswith('-RELEASE'): -+ subprocess.run([sys.executable, "-m", "ruff", "format", "-q", path], check=True)