From nobody Fri Mar 10 05:54:20 2023 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 4PXwH04mNdz3x7pX; Fri, 10 Mar 2023 05:54:20 +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 4PXwH04Gdpz47SQ; Fri, 10 Mar 2023 05:54:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678427660; 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=WVD9wVVNhNtDaxIWMmk4njjKeB2A/uXHIVbZqlTGIYw=; b=HslGb11QqQatZc7IwXTG1cr+DExD+hCF9nagDgGDv92id/RQE6T7UqfsK61yL8athg2TIu wuNHk1uaQxXtD7Ka2/oK5oLFjcSYEAsthVKhw+03auYE5ywUcuFa+jXkiniyMo9Jarjw+n VzKQOk4PKWAXLDeTJiIMiLy92JC65D/NoN5Ht+Z5v18/A9VEg825DrZ1/5CoLaeFuGQyNT w2KM9i+1P+38Y/ervI6hmtri4G2RbZeh+qY6hviPJ9lOOzAZq5qEgP3RIo/RLZDAxfagTC gUrGV3JaJx91iU4o+kLuSbWa3oUj7wpjWk3DygwcCME9Z14meyvNYPZYBe0Gug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678427660; 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=WVD9wVVNhNtDaxIWMmk4njjKeB2A/uXHIVbZqlTGIYw=; b=d+iDaZvdD9V8Wjny87TDDx/72Z9oIkkHNiLwZNplZkQ8qc+pKUPRkpIA8LB2nF3zSYeUNk py9cEtfstZGbUUF8NRSO3009J7Nvb+uAN6lJoQmZPYGdUZ9CliruqOxAvZp50NXFYBROpl P83Jxb0jRMw2ZUfMFIiXH1LiftRJODuy3RmGCuYylf2SSw712AVDa1zLCZyMYfCcsF184M 6eG9gn3S9qHY7ia4xzn7DQWgNW98Rsge0RT2BqV02WzQJeBOjKBS+yHDKfM+yB6f4UL+N5 GQ4VCgtuVOucNpoU+JpY+qvqjXKkG8+5nYPN3GGxgi5j6sN6Ke+jbi/ikHRcBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678427660; a=rsa-sha256; cv=none; b=ckNXTWMz91gtCB6P4kL2u2u/kjcDv3cclfGrz/Glat+9hlMTPRgLrFpXlkWfCtY4fm1bVV yDEVbcrboLV9uM3anLN8Omgf/ji0uqStZl8LCKQwV0zHidgcJjmJtFw9zhHNaedsB3p3F9 kiWsUckZIOd2GH3NWe6SFuBI3XOL4brAbbdMKPLTRGAoan1RS0ADFJf5p06iymTnZ11rWl mJ0a6iVh5IGRM4Ip/6/BTIM8H1ijPgODpR0+F4gJuHysgbtuI2BhdKCRHLNPHBocDyazvB jJuD17wc7zsNKJJ/EobbfZ6RwdFV5/voHwtc78/ie6PP1qc3fKNQeQNP3Z9NVQ== 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 4PXwH03LbMzd0X; Fri, 10 Mar 2023 05:54:20 +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 32A5sKIY047866; Fri, 10 Mar 2023 05:54:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32A5sKSe047865; Fri, 10 Mar 2023 05:54:20 GMT (envelope-from git) Date: Fri, 10 Mar 2023 05:54:20 GMT Message-Id: <202303100554.32A5sKSe047865@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: 89fcb25ec43a - main - games/anki: Switch to PyQt6 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 89fcb25ec43a78886b86a0a82eb46e74d131d8f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=89fcb25ec43a78886b86a0a82eb46e74d131d8f1 commit 89fcb25ec43a78886b86a0a82eb46e74d131d8f1 Author: Kai Knoblich AuthorDate: 2023-03-10 05:51:24 +0000 Commit: Kai Knoblich CommitDate: 2023-03-10 05:51:24 +0000 games/anki: Switch to PyQt6 * This also fixes runtime errors [1] that occur in environments where PyQt5 and PyQt6 are present. In that case Anki prefers PyQt6 over PyQt5 upon invocation which leads then to following error: $ anki Running with temporary Qt5 compatibility shims. Run with DISABLE_QT5_COMPAT=1 to confirm compatibility with Qt6. Traceback (most recent call last): File "/usr/local/bin/anki", line 7, in import aqt File "/usr/local/share/anki/aqt/__init__.py", line 74, in from aqt.main import AnkiQt # isort:skip File "/usr/local/share/anki/aqt/main.py", line 20, in import aqt.forms File "/usr/local/share/anki/aqt/forms/__init__.py", line 1, in from . import about File "/usr/local/share/anki/aqt/forms/about.py", line 3, in from .about_qt6 import * File "/usr/local/share/anki/aqt/forms/about_qt6.py", line 45, in import icons_rc ModuleNotFoundError: No module named 'icons_rc' * Amend a minor issue while I'm here: devel/py-sip is only required for build, set it accordingly. * Bump PORTREVISION due changed dependencies and to regenerate the code (rust, js) in conjunction with PyQt6. Reported by: Robin Dapp, Michael Reim (via e-mail) [1] MFH: No (PyQt6 not present in 2023Q1) --- games/anki/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/games/anki/Makefile b/games/anki/Makefile index 3815dedf7fb3..21315496e251 100644 --- a/games/anki/Makefile +++ b/games/anki/Makefile @@ -1,6 +1,6 @@ PORTNAME= anki DISTVERSION= 2.1.54 -PORTREVISION= 11 +PORTREVISION= 12 # Don't forget to update ${_MY_BUILDHASH} if DISTVERSION changes CATEGORIES= games education python MASTER_SITES= LOCAL/kai/:yarncache \ @@ -51,7 +51,7 @@ RUN_DEPENDS= lame:audio/lame \ ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR} # USES=ssl is required for the compilation of the Rust code -USES= cargo desktop-file-utils go:modules,no_targets nodejs:build pyqt:5 \ +USES= cargo desktop-file-utils go:modules,no_targets nodejs:build pyqt:6 \ python:3.9+ shebangfix ssl USE_GITHUB= yes GH_ACCOUNT= ankitects @@ -71,7 +71,7 @@ GH_TUPLE+= bazelbuild:bazel-skylib:e59b620:bzlskylib \ GH_TUPLE+= evanw:esbuild:${_MY_ESBUILDVER}:esbuild \ golang:sys:aa78b53d3365:golang_sys -USE_PYQT= pyqt5 sip webengine +USE_PYQT= pyqt6 sip:build webengine SHEBANG_FILES= qt/tools/runanki.system.in