From nobody Tue Apr 23 10:36:37 2024 X-Original-To: dev-commits-ports-branches@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 4VNz7T63Phz5Jvrc; Tue, 23 Apr 2024 10:36:37 +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 4VNz7T4tRMz4NxV; Tue, 23 Apr 2024 10:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713868597; 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=Ni9eN5RxtZCsc0Z3tNP/myg5AQa1F7RqbsCZoEst2V8=; b=kKxL9XQjsHy3tOdkRsj9GObZMSdnEipEDbJc86SZAK1V7LwT8F9VKjw2A4VwZI/IKCEvER xnqmwMLPFL/jDKmQ3P8BudcFzgxsszwP55+cV9HxTdEQ+WteTRBYtbdl8eKYUXVyC2ox7g rgX0G6q7NpGi5vaLai+PtTxq+TGr8cvF+7ctEl6GYpzIuQ+7z6Iz5FPvmvMdMpylPGqD/D VREcuKZYgGchkexNMIfoFnrhrBBgRpzKHSDuKvZMGt8bNBZWlF2WWHevzKjix2/R+5rRls lLKJB85GXogkzP34elc/xjD5kQ206nSejYT300Q+3Gmn0jy0kikzvrWREy4Kxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713868597; a=rsa-sha256; cv=none; b=KWmUk7Hn5IH8U6+GK9SaVpbax1x4EBO+QWC4moltXk/2G9YeoC6jw6mkqcKNDLwI/gZa5Z N/T+yOcUjOp5LN1qUiqk0mKQ96DfcT9Ev3xaRaIOsRmsxRxa+duMDM9EBqHev+yZrhuGCf cyHRWlGfOF82dKKXiowaJIcc8i7OY8jADpEE0G1et8ZxgDYcv+D8uORrjZ6t/XBhgy6Y5z rqlB1nupEXBBzjky8vPvs49RoADZKNBo4Ph5SpCPfW4jkMTQE1eHDjw/IlNs5jEnBHno72 GD7fSIrP4vHp5Iojs7Dq+mPv5OxKg+Jug5oxWj2Bn7lVc9cZ1bKANLmTELGg4g== 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=1713868597; 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=Ni9eN5RxtZCsc0Z3tNP/myg5AQa1F7RqbsCZoEst2V8=; b=UYy7HMLVi6uUgkJmkMgRDIpwbeunR9MdflkSY7oT6nUb6M0UWVjwYPFWEc6lUc/xHCOBLU +22PhmfzoKVjfG1m2myDxBsgFdSLG9crykrNwGD0eKzjGE230gvDcNfOSYafjU/02DfHBE ahedGZd2mbscGTWyHGFrbBAc3Fe0OCnr79H3N2RzhOrev2XKOh+9agqmKYIbkgFdLEhRcJ +P2mBPBLfEHw/oMa/fP+uGeHiO7F7Khk86b/EPNAu0h8TGzCiisA9hLXYah1nsa+iCJhes 2vQfrY0gvo+Hu7dWkhfZ/znndft6mhmmTvqUJDQ1uNAmwCGhAPvSGFt8xgMpoQ== 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 4VNz7T4TyDzSwg; Tue, 23 Apr 2024 10:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NAabe9042873; Tue, 23 Apr 2024 10:36:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NAabbA042870; Tue, 23 Apr 2024 10:36:37 GMT (envelope-from git) Date: Tue, 23 Apr 2024 10:36:37 GMT Message-Id: <202404231036.43NAabbA042870@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kai Knoblich Subject: git: 008d656f6104 - 2024Q2 - games/anki: Update to 24.04.1 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 008d656f6104e42a3cc841848b7a87c88ca1f074 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=008d656f6104e42a3cc841848b7a87c88ca1f074 commit 008d656f6104e42a3cc841848b7a87c88ca1f074 Author: Kai Knoblich AuthorDate: 2024-04-23 05:57:49 +0000 Commit: Kai Knoblich CommitDate: 2024-04-23 10:35:38 +0000 games/anki: Update to 24.04.1 * Remove the no longer required workaround for the "pip_system_certs" Python module, which was merged by upstream. Changelog: https://github.com/ankitects/anki/releases/tag/24.04.1 MFH: 2024Q2 (cherry picked from commit 3171214f8856737b617c8bf1679d1b2adf0d3f56) --- games/anki/Makefile | 8 ++++---- games/anki/distinfo | 18 ++++++++--------- games/anki/files/patch-qt_aqt_____init____.py | 29 --------------------------- 3 files changed, 13 insertions(+), 42 deletions(-) diff --git a/games/anki/Makefile b/games/anki/Makefile index d334eaa0a48f..cf51d407314a 100644 --- a/games/anki/Makefile +++ b/games/anki/Makefile @@ -1,5 +1,5 @@ PORTNAME= anki -DISTVERSION= 24.04 +DISTVERSION= 24.04.1 # Don't forget to update ${_MY_BUILDHASH} if DISTVERSION changes CATEGORIES= games education python MASTER_SITES= LOCAL/kai/:yarncache @@ -44,8 +44,8 @@ USES= cargo desktop-file-utils ninja nodejs:build pyqt:6 python:3.9+ \ USE_GITHUB= yes GH_ACCOUNT= ankitects # Translation files -GH_TUPLE= ankitects:anki-core-i18n:c74c15b:ftlrslib \ - ankitects:anki-desktop-ftl:06ad12d:ftlextra +GH_TUPLE= ankitects:anki-core-i18n:e3af3c9:ftlrslib \ + ankitects:anki-desktop-ftl:4515531:ftlextra USE_PYQT= pyqt6 sip:build webengine @@ -84,7 +84,7 @@ MPV_RUN_DEPENDS= mpv:multimedia/mpv # Should contain the most recent commit that reflects ${DISTVERSION} and must # be exactly 8 digits otherwise the check for newer versions won't work as # expected. -_MY_BUILDHASH= 429bc9e1 +_MY_BUILDHASH= ccd9ca1a # Remove ${CARGO_BUILD_TARGET} from ${CARGO_ENV} to avoid problems with # hardcoded paths as the "runner" build system expects its components # in ${WRKSRC}/out/rust/debug diff --git a/games/anki/distinfo b/games/anki/distinfo index 596b3bac44a0..d0124ab5b810 100644 --- a/games/anki/distinfo +++ b/games/anki/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1711874457 -SHA256 (anki-yarn-cache-24.04.tar.gz) = 44f1de419cee0e36a06556438e7b52b59968964d6dbe28716f5fbd6b2a3a2ec7 -SIZE (anki-yarn-cache-24.04.tar.gz) = 328999684 +TIMESTAMP = 1713786119 +SHA256 (anki-yarn-cache-24.04.1.tar.gz) = b4dcd73ce528d41ab4ddcfafe397e46facbbe6955b0dbe6886aa4ecd63a6965f +SIZE (anki-yarn-cache-24.04.1.tar.gz) = 328998462 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb SIZE (rust/crates/addr2line-0.21.0.crate) = 40807 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe @@ -1319,9 +1319,9 @@ SHA256 (ankitects-rust-url-bb930b8d089f4d30d7d19c12e54e66191de47b88_GH0.tar.gz) SIZE (ankitects-rust-url-bb930b8d089f4d30d7d19c12e54e66191de47b88_GH0.tar.gz) = 394844 SHA256 (ankitects-linkcheck-184b2ca50ed39ca43da13f0b830a463861adb9ca_GH0.tar.gz) = 58ac773ba2e7c76a9ec3f59ee9571576d76e74d58c4974a1d606d6976e1be70e SIZE (ankitects-linkcheck-184b2ca50ed39ca43da13f0b830a463861adb9ca_GH0.tar.gz) = 19408 -SHA256 (ankitects-anki-24.04_GH0.tar.gz) = 65cbaf6d3f5ad27cfba65de9a6d24af6782490acd10e7dfc9e2e49ab6ca26a96 -SIZE (ankitects-anki-24.04_GH0.tar.gz) = 2394512 -SHA256 (ankitects-anki-core-i18n-c74c15b_GH0.tar.gz) = bac0fb7e7607a7c7a0f7d94c2e8d496ce30de74f6a190466cc69fb29c3ff4151 -SIZE (ankitects-anki-core-i18n-c74c15b_GH0.tar.gz) = 1286716 -SHA256 (ankitects-anki-desktop-ftl-06ad12d_GH0.tar.gz) = 884195634313b0dd924d5bf17a4720da9851744e7c5d087cfc935fae19b8c61b -SIZE (ankitects-anki-desktop-ftl-06ad12d_GH0.tar.gz) = 218490 +SHA256 (ankitects-anki-24.04.1_GH0.tar.gz) = 7cebd7745830392f9b6ec62c2300f3c45c934969b47f25275ecee0ee53f9aa68 +SIZE (ankitects-anki-24.04.1_GH0.tar.gz) = 2394990 +SHA256 (ankitects-anki-core-i18n-e3af3c9_GH0.tar.gz) = cc200bd648b33242445972ebe4d793839abb8cef53901cd116dea2ed4e542344 +SIZE (ankitects-anki-core-i18n-e3af3c9_GH0.tar.gz) = 1295301 +SHA256 (ankitects-anki-desktop-ftl-4515531_GH0.tar.gz) = 53e7b96e2d82a40be859d3dfa0ce1ea62d8f706d58baddcb8e183f7d7a8e6e12 +SIZE (ankitects-anki-desktop-ftl-4515531_GH0.tar.gz) = 218559 diff --git a/games/anki/files/patch-qt_aqt_____init____.py b/games/anki/files/patch-qt_aqt_____init____.py deleted file mode 100644 index 1cb1324f27e3..000000000000 --- a/games/anki/files/patch-qt_aqt_____init____.py +++ /dev/null @@ -1,29 +0,0 @@ -From: Escape0707 -Date: Fri, 5 Apr 2024 21:12:06 +0900 -Subject: [PATCH] Ignore exception raised by pip_system_certs not found (#3114) - -This dependency usually doesn't benefit Linux distros with requests library -configured to use system certificate already. And is not packaged by most -distros. Making it optional will make most Linux users' installation much -easier. - -Obtained from: - -https://github.com/ankitects/anki/commit/97efd49cd8db15a84d2ae2701d21b8283e37bc8c - ---- qt/aqt/__init__.py.orig 2024-03-31 06:57:06 UTC -+++ qt/aqt/__init__.py -@@ -6,7 +6,12 @@ import sys - import logging - import sys - --import pip_system_certs.wrapt_requests -+try: -+ import pip_system_certs.wrapt_requests -+except ModuleNotFoundError: -+ print( -+ "Python module pip_system_certs is not installed. System certificate store and custom SSL certificates may not work. See: https://github.com/ankitects/anki/issues/3016" -+ ) - - if sys.version_info[0] < 3 or sys.version_info[1] < 9: - raise Exception("Anki requires Python 3.9+")