Skip to content

Commit

Permalink
games/anki: Update to 2.1.65
Browse files Browse the repository at this point in the history 
* Drop a unneccessary call in the custom "make-yarn-cache" target.

Changelogs since 2.1.62:

https://github.com/ankitects/anki/releases/tag/2.1.65
https://github.com/ankitects/anki/releases/tag/2.1.64
https://github.com/ankitects/anki/releases/tag/2.1.63
  • Loading branch information
@knobix
knobix committed Jun 5, 2023
1 parent b014aed commit 3fdf445
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 30 deletions.
15 changes: 6 additions & 9 deletions games/anki/Makefile
View file
@@ -1,5 +1,5 @@
PORTNAME= anki
DISTVERSION= 2.1.62
DISTVERSION= 2.1.65
# Don't forget to update ${_MY_BUILDHASH} if DISTVERSION changes
CATEGORIES= games education python
MASTER_SITES= LOCAL/kai/:yarncache
Expand Down Expand Up @@ -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:7638cf0:ftlrslib \
ankitects:anki-desktop-ftl:e1abce4:ftlextra
GH_TUPLE= ankitects:anki-core-i18n:86ee592:ftlrslib \
ankitects:anki-desktop-ftl:e2d2a9e:ftlextra

USE_PYQT= pyqt6 sip:build webengine

Expand All @@ -63,7 +63,7 @@ CARGO_CRATES= addr2line-0.19.0 \
anstyle-0.3.5 \
anstyle-parse-0.1.1 \
anstyle-wincon-0.2.0 \
anyhow-1.0.70 \
anyhow-1.0.71 \
apple-bundles-0.17.0 \
arrayref-0.3.7 \
arrayvec-0.7.2 \
Expand Down Expand Up @@ -348,7 +348,6 @@ CARGO_CRATES= addr2line-0.19.0 \
rand_core-0.5.1 \
rand_core-0.6.4 \
rand_hc-0.2.0 \
rand_pcg-0.2.1 \
rayon-1.7.0 \
rayon-core-1.11.0 \
rc2-0.8.1 \
Expand Down Expand Up @@ -542,7 +541,7 @@ CARGO_CRATES= addr2line-0.19.0 \
zstd-safe-5.0.2+zstd.1.5.2 \
zstd-safe-6.0.4+zstd.1.5.4 \
zstd-sys-2.0.7+zstd.1.5.4 \
percent-encoding@git+https://github.com/ankitects/rust-url.git?rev=06a87b6c31c7e9a856a3fb058cb30b204c05b650\#06a87b6c31c7e9a856a3fb058cb30b204c05b650 \
percent-encoding-iri@git+https://github.com/ankitects/rust-url.git?rev=bb930b8d089f4d30d7d19c12e54e66191de47b88\#bb930b8d089f4d30d7d19c12e54e66191de47b88 \
csv,csv-core@git+https://github.com/ankitects/rust-csv.git?rev=1c9d3aab6f79a7d815c69f925a46a4590c115f90\#1c9d3aab6f79a7d815c69f925a46a4590c115f90 \
linkcheck@git+https://github.com/ankitects/linkcheck.git?rev=184b2ca50ed39ca43da13f0b830a463861adb9ca\#184b2ca50ed39ca43da13f0b830a463861adb9ca

Expand Down Expand Up @@ -583,7 +582,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= 77dd1dc1
_MY_BUILDHASH= aa9a734f
# 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
Expand Down Expand Up @@ -661,8 +660,6 @@ make-yarn-cache: patch
@${RM} -r ${_MY_YARNCACHE}
@cd ${WRKSRC} \
&& ${LOCALBASE}/bin/yarn --cache-folder ${_MY_YARNCACHE} install --ignore-scripts
@cd ${WRKSRC} \
&& ${LOCALBASE}/bin/yarn --cache-folder ${_MY_YARNCACHE} add patch-package
@cd ${WRKDIR} \
&& ${TAR} -czf ${PORTNAME}-yarn-cache-${DISTVERSION}${EXTRACT_SUFX} .yarn \
&& ${ECHO_CMD} "Please upload the file ${WRKDIR}/${PORTNAME}-yarn-cache-${DISTVERSION}${EXTRACT_SUFX}"
Expand Down
28 changes: 13 additions & 15 deletions games/anki/distinfo
View file
@@ -1,6 +1,6 @@
TIMESTAMP = 1683391409
SHA256 (anki-yarn-cache-2.1.62.tar.gz) = 2df52b233c8b2c3b98d76efe2f7a1865e2cc001d2ed71ed5a07b572e3fd20b04
SIZE (anki-yarn-cache-2.1.62.tar.gz) = 269394973
TIMESTAMP = 1685974541
SHA256 (anki-yarn-cache-2.1.65.tar.gz) = 2d680733e2b3ec3bab708f50e701fbdf4c23d9b99bc693541f4ce4c26e8d1cb6
SIZE (anki-yarn-cache-2.1.65.tar.gz) = 269908779
SHA256 (rust/crates/addr2line-0.19.0.crate) = a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97
SIZE (rust/crates/addr2line-0.19.0.crate) = 33210
SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
Expand All @@ -25,8 +25,8 @@ SHA256 (rust/crates/anstyle-parse-0.1.1.crate) = a7d1bb534e9efed14f3e5f44e7dd1a4
SIZE (rust/crates/anstyle-parse-0.1.1.crate) = 24186
SHA256 (rust/crates/anstyle-wincon-0.2.0.crate) = c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa
SIZE (rust/crates/anstyle-wincon-0.2.0.crate) = 11667
SHA256 (rust/crates/anyhow-1.0.70.crate) = 7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4
SIZE (rust/crates/anyhow-1.0.70.crate) = 43803
SHA256 (rust/crates/anyhow-1.0.71.crate) = 9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8
SIZE (rust/crates/anyhow-1.0.71.crate) = 43808
SHA256 (rust/crates/apple-bundles-0.17.0.crate) = 716b8a7bacf7325eb3e7a1a7f5ead4da91e1e16d9b56a25edea0e1e4ba21fd8e
SIZE (rust/crates/apple-bundles-0.17.0.crate) = 10405
SHA256 (rust/crates/arrayref-0.3.7.crate) = 6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545
Expand Down Expand Up @@ -595,8 +595,6 @@ SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9ba
SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
SHA256 (rust/crates/rand_hc-0.2.0.crate) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
SIZE (rust/crates/rand_hc-0.2.0.crate) = 11670
SHA256 (rust/crates/rand_pcg-0.2.1.crate) = 16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429
SIZE (rust/crates/rand_pcg-0.2.1.crate) = 11291
SHA256 (rust/crates/rayon-1.7.0.crate) = 1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b
SIZE (rust/crates/rayon-1.7.0.crate) = 169488
SHA256 (rust/crates/rayon-core-1.11.0.crate) = 4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d
Expand Down Expand Up @@ -983,15 +981,15 @@ SHA256 (rust/crates/zstd-safe-6.0.4+zstd.1.5.4.crate) = 7afb4b54b8910cf5447638cb
SIZE (rust/crates/zstd-safe-6.0.4+zstd.1.5.4.crate) = 20856
SHA256 (rust/crates/zstd-sys-2.0.7+zstd.1.5.4.crate) = 94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5
SIZE (rust/crates/zstd-sys-2.0.7+zstd.1.5.4.crate) = 732100
SHA256 (ankitects-rust-url-06a87b6c31c7e9a856a3fb058cb30b204c05b650_GH0.tar.gz) = cc498110f26b113598883e4acfa4ad491f426e939edd46cd46d9f8f51a92f35f
SIZE (ankitects-rust-url-06a87b6c31c7e9a856a3fb058cb30b204c05b650_GH0.tar.gz) = 394816
SHA256 (ankitects-rust-url-bb930b8d089f4d30d7d19c12e54e66191de47b88_GH0.tar.gz) = 023bfe9a593704e14a218ad86d90aa6f7e65b76b56c313ed684b8906e3e4e3c5
SIZE (ankitects-rust-url-bb930b8d089f4d30d7d19c12e54e66191de47b88_GH0.tar.gz) = 394844
SHA256 (ankitects-rust-csv-1c9d3aab6f79a7d815c69f925a46a4590c115f90_GH0.tar.gz) = afbcd5c1ab98abb2d77e75ecdfa99c9e24be5980800104479475771d4cc53063
SIZE (ankitects-rust-csv-1c9d3aab6f79a7d815c69f925a46a4590c115f90_GH0.tar.gz) = 930543
SHA256 (ankitects-linkcheck-184b2ca50ed39ca43da13f0b830a463861adb9ca_GH0.tar.gz) = 58ac773ba2e7c76a9ec3f59ee9571576d76e74d58c4974a1d606d6976e1be70e
SIZE (ankitects-linkcheck-184b2ca50ed39ca43da13f0b830a463861adb9ca_GH0.tar.gz) = 19408
SHA256 (ankitects-anki-2.1.62_GH0.tar.gz) = dbd7c791d2fea55243620d474e6da2f6a555c573835811ebbdcfa032a296714f
SIZE (ankitects-anki-2.1.62_GH0.tar.gz) = 2279193
SHA256 (ankitects-anki-core-i18n-7638cf0_GH0.tar.gz) = 7b5eee967bf7a8474e3bb312df48bd8fb923a4425cb65b30a02d229d8b6dcfb3
SIZE (ankitects-anki-core-i18n-7638cf0_GH0.tar.gz) = 1072920
SHA256 (ankitects-anki-desktop-ftl-e1abce4_GH0.tar.gz) = 53cd5192837ceb68f87cd703bd9fc7115dbfe41c5d146d53c5d7674595da5603
SIZE (ankitects-anki-desktop-ftl-e1abce4_GH0.tar.gz) = 203656
SHA256 (ankitects-anki-2.1.65_GH0.tar.gz) = ca1c37e8e32bec02f09421bd29ac67253e4039e705bf9fba919918c4559b48e8
SIZE (ankitects-anki-2.1.65_GH0.tar.gz) = 2290476
SHA256 (ankitects-anki-core-i18n-86ee592_GH0.tar.gz) = 735f4a841ed66ee79e8f6efa3d5d9e691950342c99d0058002ca6bd439942842
SIZE (ankitects-anki-core-i18n-86ee592_GH0.tar.gz) = 1079949
SHA256 (ankitects-anki-desktop-ftl-e2d2a9e_GH0.tar.gz) = 7fac82b99d39f35306323467640104ed8cf3850db9f8f84158e1cafda5f0ea2a
SIZE (ankitects-anki-desktop-ftl-e2d2a9e_GH0.tar.gz) = 203771
12 changes: 6 additions & 6 deletions games/anki/files/patch-build_configure_src_rust.rs
View file
@@ -1,26 +1,26 @@
Check for the OFFLINE_BUILD environment variable to prevent issuing the repo
sync that requires git and an internet connection.

--- build/configure/src/rust.rs.orig 2023-03-31 02:32:25 UTC
--- build/configure/src/rust.rs.orig 2023-05-31 05:19:10 UTC
+++ build/configure/src/rust.rs
@@ -1,6 +1,8 @@
// Copyright: Ankitects Pty Ltd and contributors
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html

+use std::env;
+
use ninja_gen::action::BuildAction;
use ninja_gen::build::FilesHandle;
use ninja_gen::cargo::CargoBuild;
use ninja_gen::cargo::CargoClippy;
use ninja_gen::cargo::CargoFormat;
@@ -8,6 +10,7 @@ use ninja_gen::git::SyncSubmodule;
@@ -10,6 +12,7 @@ use ninja_gen::git::SyncSubmodule;
use ninja_gen::cargo::CargoTest;
use ninja_gen::cargo::RustOutput;
use ninja_gen::git::SyncSubmodule;
+use ninja_gen::git::SyncSubmoduleOffline;
use ninja_gen::glob;
use ninja_gen::input::BuildInput;
use ninja_gen::inputs;
use ninja_gen::Build;
@@ -24,18 +27,34 @@ fn prepare_translations(build: &mut Build) -> Result<(
@@ -27,18 +30,34 @@ fn prepare_translations(build: &mut Build) -> Result<(

fn prepare_translations(build: &mut Build) -> Result<()> {
// ensure repos are checked out
Expand Down

0 comments on commit 3fdf445

Please sign in to comment.