bump to 23.10.1

4 files changed, 45 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9620d1fad13b..137cda5e728c 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 = 23.10
+	pkgver = 23.10.1
 	pkgrel = 1
 	url = https://apps.ankiweb.net/
 	changelog = anki.changelog
@@ -41,17 +41,17 @@ pkgbase = anki
 	conflicts = anki-git
 	conflicts = anki-official-binary-bundle
 	conflicts = anki-qt5
-	source = anki-23.10.tar.gz::https://github.com/ankitects/anki/archive/refs/tags/23.10.tar.gz
-	source = anki-core-i18n-8dfb51ed11584ebd33c2b3996892640b72bd298f.tar.gz::https://github.com/ankitects/anki-core-i18n/archive/8dfb51ed11584ebd33c2b3996892640b72bd298f.tar.gz
-	source = anki-desktop-ftl-82a545c307cd6872fc98c3b1db718090e1f2d87e.tar.gz::https://github.com/ankitects/anki-desktop-ftl/archive/82a545c307cd6872fc98c3b1db718090e1f2d87e.tar.gz
+	source = anki-23.10.1.tar.gz::https://github.com/ankitects/anki/archive/refs/tags/23.10.1.tar.gz
+	source = anki-core-i18n-45c91b32dee9f52ae051fe5e1f3d574fa3b62d67.tar.gz::https://github.com/ankitects/anki-core-i18n/archive/45c91b32dee9f52ae051fe5e1f3d574fa3b62d67.tar.gz
+	source = anki-desktop-ftl-c0e842b10586d2a72357db1aa9e366ea695ac266.tar.gz::https://github.com/ankitects/anki-desktop-ftl/archive/c0e842b10586d2a72357db1aa9e366ea695ac266.tar.gz
 	source = disable-git-checks.patch
 	source = no-update.patch
 	source = strip-formatter-deps.patch
 	source = strip-type-checking-deps.patch
-	sha256sums = 20d622d47c0cf70f3522b976be0dd9404ba0e4cac8d0b5363cbbbc404a9f5dad
-	sha256sums = 685e15923c909ca99cec51f2b7c568738277fbd0f74e3a0f37f7d1034982495e
-	sha256sums = d2add0c54a7481da3d30d5c1f5a237591eceeb68dd5ab6599384b84badae3273
-	sha256sums = 89f1d00764e0f151600f6a21d7ced4289b3ce3f900ded40fe5da95e658fc9db4
+	sha256sums = 561fc902f3ad35e51686938e706d5a267bbc9a905ca0e9cc5be59b1617f3a551
+	sha256sums = 9fab0284a3110ec91cf5f346b18e9b9513ac566f25f262a61295dc538dc5ac6e
+	sha256sums = 576d1a75236cb6817bc98410753c87a637efa29dc0d52cc2ab585c7ae531f35a
+	sha256sums = 809037694be7c6926da74fb18955a11f2404c7558a07c444ebddbf94b37f7584
 	sha256sums = cc546f4e5af642af89f82be0375800c2721dd904c0a212cf46f6459495b75bff
 	sha256sums = 9858fefa254812980d252b29fc6f32bd19bb83ee7e5a96d72c707626ed5193a7
 	sha256sums = 198bc2ec14439e3ba41a03c4823f07df4b0c559c1dcbdaf678416ed12a720c2e
diff --git a/PKGBUILD b/PKGBUILD
index e6ea5e2644cc..15a62300f1b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,9 +9,9 @@
 # anki -> git rev-parse $pkgver --short=8
 # ftl -> git submodule
 declare -gA _tags=(
- [ftl_core]="8dfb51ed11584ebd33c2b3996892640b72bd298f"
- [ftl_desktop]="82a545c307cd6872fc98c3b1db718090e1f2d87e"
- [anki]="51a10f0"
+ [ftl_core]="45c91b32dee9f52ae051fe5e1f3d574fa3b62d67"
+ [ftl_desktop]="c0e842b10586d2a72357db1aa9e366ea695ac266"
+ [anki]="fac9e0e"
 )
 declare -gA _caches=(
     [yarn]="yarn-cache"
@@ -19,7 +19,7 @@ declare -gA _caches=(
 )
 
 pkgname=anki
-pkgver=23.10
+pkgver=23.10.1
 pkgrel=1
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
 url="https://apps.ankiweb.net/"
@@ -77,10 +77,10 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/ankitects/anki/archive/refs
         "strip-formatter-deps.patch"
         "strip-type-checking-deps.patch"
 )
-sha256sums=('20d622d47c0cf70f3522b976be0dd9404ba0e4cac8d0b5363cbbbc404a9f5dad'
-            '685e15923c909ca99cec51f2b7c568738277fbd0f74e3a0f37f7d1034982495e'
-            'd2add0c54a7481da3d30d5c1f5a237591eceeb68dd5ab6599384b84badae3273'
-            '89f1d00764e0f151600f6a21d7ced4289b3ce3f900ded40fe5da95e658fc9db4'
+sha256sums=('561fc902f3ad35e51686938e706d5a267bbc9a905ca0e9cc5be59b1617f3a551'
+            '9fab0284a3110ec91cf5f346b18e9b9513ac566f25f262a61295dc538dc5ac6e'
+            '576d1a75236cb6817bc98410753c87a637efa29dc0d52cc2ab585c7ae531f35a'
+            '809037694be7c6926da74fb18955a11f2404c7558a07c444ebddbf94b37f7584'
             'cc546f4e5af642af89f82be0375800c2721dd904c0a212cf46f6459495b75bff'
             '9858fefa254812980d252b29fc6f32bd19bb83ee7e5a96d72c707626ed5193a7'
             '198bc2ec14439e3ba41a03c4823f07df4b0c559c1dcbdaf678416ed12a720c2e'
diff --git a/anki.changelog b/anki.changelog
index 9caa2a8aadb3..13bc97552268 100644
--- a/anki.changelog
+++ b/anki.changelog
@@ -1,3 +1,29 @@
+# 23.10.1-1
+General:
+  * Update all platforms to Qt 6.6. This change fixes Japanese input on macOS.
+  * Fix Anki failing to run on older macOS versions.
+  * The Linux Qt6 build requires a newer glibc, so older distros like Debian 11 won't work with it.
+  * Fix syncserver failing to run in macOS packaged build.
+  * Fix some potential security issues.
+  * Fix 'creating backup' showing for longer than necessary.
+  * Add tooltip to mask editor button.
+  * Allow creation of empty filtered decks by @Gustaf-C in #2788
+  * Add confirmation for upload when AnkiWeb collection determined empty.
+  * Fix add-ons screen showing 'requires Anki >= 2.1.231000'.
+  * Fix overflowing filenames displacing import button by @RumovZ in #2806
+  * Fix Anki closing before 'your clock is wrong' message appears.
+  * Hide "toggle masks" in "Hide One, Guess One" mode by @abdnh in #2817
+  * Change tooltip strings for image occlusion center alignments by @snowtimeglass in #2815
+  * Check video tags in media check.
+
+FSRS:
+  * Prompt user to save preset changes before they compute FSRS weights.
+  * Fix panic when enabling FSRS with add-on-rescheduled cards.
+  * Add an info box so the non-linear nature of desired retention can be seen
+  * Improve presentation of log loss and RMSE by @user1823 in #2805
+  * Rename FSRS weights to parameters
+  * Handle stability < 0.5 in stability graph
+
 # 23.10-1
 Notable changes:
    * Anki's version numbering scheme has changed to year.month(.patch).
diff --git a/disable-git-checks.patch b/disable-git-checks.patch
index 9c8f719e8a01..da7a056898b7 100644
--- a/disable-git-checks.patch
+++ b/disable-git-checks.patch
@@ -13,7 +13,7 @@ We provide source tarballs without git functionality.
      fn files(&mut self, build: &mut impl build::FilesHandle) {
 --- a/build/runner/src/build.rs
 +++ b/build/runner/src/build.rs
-@@ -161,12 +161,7 @@ fn maybe_update_buildhash(build_root: &Utf8Path) {
+@@ -161,13 +161,7 @@ fn maybe_update_buildhash(build_root: &Utf8Path) {
  }
 
  fn get_buildhash() -> String {
@@ -21,7 +21,8 @@ We provide source tarballs without git functionality.
 -        .args(["rev-parse", "--short=8", "HEAD"])
 -        .output()
 -        .expect("git");
--    assert!(output.status.success(), "git failed");
+-    assert!(output.status.success(),
+-            "Invoking 'git' failed. Make sure you're building from a clone of the git repo, and that 'git' is installed.");
 -    String::from_utf8(output.stdout).unwrap().trim().into()
 +    String::from("MY_REV").trim().into()
  }