bump to 2.1.66

4 files changed, 66 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d73e45a9579..ba8ee7b27a6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = anki
 	pkgdesc = Helps you remember facts (like words/phrases in a foreign language) efficiently
-	pkgver = 2.1.65
+	pkgver = 2.1.66
 	pkgrel = 1
 	url = https://apps.ankiweb.net/
 	changelog = anki.changelog
@@ -41,19 +41,19 @@ pkgbase = anki
 	conflicts = anki-git
 	conflicts = anki-official-binary-bundle
 	conflicts = anki-qt5
-	source = anki-2.1.65.tar.gz::https://github.com/ankitects/anki/archive/refs/tags/2.1.65.tar.gz
-	source = anki-core-i18n-25c97e48acf6626f0b8bc9daede14e21a83cdaf2.tar.gz::https://github.com/ankitects/anki-core-i18n/archive/25c97e48acf6626f0b8bc9daede14e21a83cdaf2.tar.gz
-	source = anki-desktop-ftl-1fbf87bb8a7d441482e79b3b8c2e06479e9fa978.tar.gz::https://github.com/ankitects/anki-desktop-ftl/archive/1fbf87bb8a7d441482e79b3b8c2e06479e9fa978.tar.gz
+	source = anki-2.1.66.tar.gz::https://github.com/ankitects/anki/archive/refs/tags/2.1.66.tar.gz
+	source = anki-core-i18n-bcc4822d4613b7310ed82da8b51029f5ea52c5c1.tar.gz::https://github.com/ankitects/anki-core-i18n/archive/bcc4822d4613b7310ed82da8b51029f5ea52c5c1.tar.gz
+	source = anki-desktop-ftl-75af3ed4a3992bccae7eba3bc8ee9fa5c4645c0b.tar.gz::https://github.com/ankitects/anki-desktop-ftl/archive/75af3ed4a3992bccae7eba3bc8ee9fa5c4645c0b.tar.gz
 	source = disable-git-checks.patch
 	source = no-update.patch
 	source = strip-formatter-deps.patch
 	source = strip-type-checking-deps.patch
-	sha256sums = ca1c37e8e32bec02f09421bd29ac67253e4039e705bf9fba919918c4559b48e8
-	sha256sums = 9fe9d498d89d25db3a5b0938c58dc3a584c97e09ccd83a622574df8bb0935841
-	sha256sums = 85c6f4570b66cac1a021eb3efb7e69868d8c9b130b5c6171d459dd5bfbde321a
+	sha256sums = 128a5eb82d3ef19c438716657ae709ff0b05750882b7724f3fb9efd119d222bb
+	sha256sums = d633c7c5498a0b9f237ea92782b57b8055b034bf25e90c0c3d29f04db6ad6ef4
+	sha256sums = 7a74f90a22a8feff0ed911ba3eef80b799832ad87b9de9e0a56adc3aad13251f
 	sha256sums = 89f1d00764e0f151600f6a21d7ced4289b3ce3f900ded40fe5da95e658fc9db4
 	sha256sums = f934553a5ce9e046a0b8253e10da16e661b27375e2b54d6bb915267f32aff807
 	sha256sums = 9858fefa254812980d252b29fc6f32bd19bb83ee7e5a96d72c707626ed5193a7
-	sha256sums = 0df3992e007564433c1f4995959d0023b8ed238a36d4dc345d7626cca1c515e1
+	sha256sums = 198bc2ec14439e3ba41a03c4823f07df4b0c559c1dcbdaf678416ed12a720c2e
 
 pkgname = anki
diff --git a/PKGBUILD b/PKGBUILD
index dbee2c30d7fb..1053689c50d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,9 +9,9 @@
 # anki -> git rev-parse $pkgver --short=8
 # ftl -> git submodule
 declare -gA _tags=(
- [ftl_core]="25c97e48acf6626f0b8bc9daede14e21a83cdaf2"
- [ftl_desktop]="1fbf87bb8a7d441482e79b3b8c2e06479e9fa978"
- [anki]="141bc18b"
+ [ftl_core]="bcc4822d4613b7310ed82da8b51029f5ea52c5c1"
+ [ftl_desktop]="75af3ed4a3992bccae7eba3bc8ee9fa5c4645c0b"
+ [anki]="cf16ce1d"
 )
 declare -gA _caches=(
     [yarn]="yarn-cache"
@@ -19,7 +19,7 @@ declare -gA _caches=(
 )
 
 pkgname=anki
-pkgver=2.1.65
+pkgver=2.1.66
 pkgrel=1
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
 url="https://apps.ankiweb.net/"
@@ -77,13 +77,13 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/ankitects/anki/archive/refs
         "strip-formatter-deps.patch"
         "strip-type-checking-deps.patch"
 )
-sha256sums=('ca1c37e8e32bec02f09421bd29ac67253e4039e705bf9fba919918c4559b48e8'
-            '9fe9d498d89d25db3a5b0938c58dc3a584c97e09ccd83a622574df8bb0935841'
-            '85c6f4570b66cac1a021eb3efb7e69868d8c9b130b5c6171d459dd5bfbde321a'
+sha256sums=('128a5eb82d3ef19c438716657ae709ff0b05750882b7724f3fb9efd119d222bb'
+            'd633c7c5498a0b9f237ea92782b57b8055b034bf25e90c0c3d29f04db6ad6ef4'
+            '7a74f90a22a8feff0ed911ba3eef80b799832ad87b9de9e0a56adc3aad13251f'
             '89f1d00764e0f151600f6a21d7ced4289b3ce3f900ded40fe5da95e658fc9db4'
             'f934553a5ce9e046a0b8253e10da16e661b27375e2b54d6bb915267f32aff807'
             '9858fefa254812980d252b29fc6f32bd19bb83ee7e5a96d72c707626ed5193a7'
-            '0df3992e007564433c1f4995959d0023b8ed238a36d4dc345d7626cca1c515e1'
+            '198bc2ec14439e3ba41a03c4823f07df4b0c559c1dcbdaf678416ed12a720c2e'
 )
 
 prepare() {
@@ -110,13 +110,11 @@ prepare() {
     pacman -Qo $(which cargo) | grep -q rustup && rustup update
     # fetch rust packages
     export CARGO_HOME="$srcdir/${_caches[cargo]}"       # do not litter in ~
-    echo "CARGO_HOME:$CARGO_HOME"
     cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 
     # fetch node packages already in prepare()
     export YARN_CACHE_FOLDER="$srcdir/${_caches[yarn]}" # do not litter in ~
-    echo "YARN_CACHE_FOLDER:$YARN_CACHE_FOLDER"
-    yarn install --immutable --modules-folder out/node_modules --ignore-scripts
+    yarn install --immutable --modules-folder out/node_modules
     ln -sf out/node_modules ./
 
     # mask pip-sync as we provide dependencies ourselves
@@ -130,7 +128,6 @@ build() {
     cd "$pkgname-$pkgver"
 
     export YARN_CACHE_FOLDER="$srcdir/${_caches[yarn]}" # do not litter in ~
-    yarn run --offline postinstall
 
     #use local binaries instead of downloading them
     export PYTHON_BINARY=$(which python)
diff --git a/anki.changelog b/anki.changelog
index cf38387db09e..9c4e3d0deda1 100644
--- a/anki.changelog
+++ b/anki.changelog
@@ -1,3 +1,49 @@
+# 2.1.66-1
+   * Windows and Mac builds have been updated to the latest toolkit version, which will hopefully fix some crashes/bugs.
+   * The v3 scheduler is now the default for new users.
+   * When imports complete, a summary window is now shown (thanks to Abdo).
+   * Use a different approach for detecting copy+paste from Anki fields, which may fix some crashes.
+   * The minimalist/reduce motion toggles should no longer affect card content.
+   * Media check now automatically extracts images that have been embedded in fields.
+   * Handle importing of legacy AnkiDroid backups.
+   * The built-in sync server can now be built without Python if you prefer.
+   * Add keyboard shortcut for legacy stats (thanks to Luc).
+   * Accessibility improvements (thanks to Derek and Kenny).
+   * Fix addon update dialog showing twice (thanks to Rumo).
+   * Fix bold toggle not working in certain circumstances (thanks to mmjang).
+   * Align code blocks to left (thanks to shunlog).
+   * Make weekday font smaller for Chinese locale (thanks to mmjang).
+   * Improve performance of invalid ID fix in DB check.
+   * Fix main window geometry/state not being restored in some cases (thanks to Abdo).
+   * Handle invalid float mtimes in DB check.
+   * Fix total note count not being logged in apkg import.
+   * Report actual error when DbError occurs.
+   * Fix two issues with MathJax editor (thanks to Hikaru).
+   * Don't fail silently when an empty csv is imported.
+   * Fix two issues that can cause editor fields to behave incorrectly (thanks to Hikaru).
+   * When cards are in intraday learning queue, don't use original due.
+   * Fix "Add-ons possibly involved" message never appearing on Windows (thanks to Abdo).
+   * Add partial support for Hangul keyboard shortcuts during review (thanks to Christopher).
+   * Disable add-on buttons when no field is focused by default (thanks to Abdo).
+   * Fix toggleable editor button styles (thanks to Abdo).
+   * Fixed a sporadic error in the review screen (thanks to mjuhanne).
+   * Fixed an error that could occur when syncing between newer and older clients.
+   * Fixed tab order in find&replace screen (thanks to Gabriel).
+   * Various other minor fixes and behind-the-scenes changes.
+
+Dev related:
+
+   * Fix incorrect handling of locals in debug console (thanks to Rumo).
+   * Add did-add-field-hook analogous to did-delete-field (thanks to 3ter).
+   * Fix run-qt5.15.bat (thanks to Hikaru).
+   * Support more mime types for add_extension_based_on_mime (thanks to BenYip).
+   * Make set_config_help_action work with submodules (thanks to Abdo).
+   * Exclude Fabric's large canvas dependency (thanks to Kavel).
+
+PKGBUILD:
+   * fix patch for changed file
+   * yarn run postinstall now runs in prepare()
+
 # 2.1.65-1
   * Default to current deck in csv import if settings allow it.
   * Disable Toggle Bury when nothing is selected (thanks to Abdo).
diff --git a/strip-type-checking-deps.patch b/strip-type-checking-deps.patch
index 36b08b2931d6..d9c4e0346698 100644
--- a/strip-type-checking-deps.patch
+++ b/strip-type-checking-deps.patch
@@ -3,7 +3,7 @@ Mypy-protobuf generates mypy stub files from protobuf specs and should
 therefore be stripped.
 --- a/build/configure/src/python.rs
 +++ b/build/configure/src/python.rs
-@@ -86,9 +86,7 @@ pub struct GenPythonProto {
+@@ -87,9 +87,7 @@ pub struct GenPythonProto {
  impl BuildAction for GenPythonProto {
      fn command(&self) -> &str {
          "$protoc $
@@ -13,10 +13,10 @@ therefore be stripped.
          -Iproto $in"
      }
 
-@@ -106,7 +104,6 @@ impl BuildAction for GenPythonProto {
+@@ -107,7 +105,6 @@ impl BuildAction for GenPythonProto {
              .collect();
          build.add_inputs("in", &self.proto_files);
-         build.add_inputs("protoc", inputs!["$protoc_binary"]);
+         build.add_inputs("protoc", inputs![":protoc_binary"]);
 -        build.add_inputs("protoc-gen-mypy", inputs![":pyenv:protoc-gen-mypy"]);
          build.add_outputs("", python_outputs);
      }