bump to 23.10

4 files changed, 90 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73cbc1b128fe..9620d1fad13b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = anki
 	pkgdesc = Helps you remember facts (like words/phrases in a foreign language) efficiently
-	pkgver = 2.1.66
-	pkgrel = 2
+	pkgver = 23.10
+	pkgrel = 1
 	url = https://apps.ankiweb.net/
 	changelog = anki.changelog
 	arch = x86_64
@@ -41,18 +41,18 @@ pkgbase = anki
 	conflicts = anki-git
 	conflicts = anki-official-binary-bundle
 	conflicts = anki-qt5
-	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 = 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 = disable-git-checks.patch
 	source = no-update.patch
 	source = strip-formatter-deps.patch
 	source = strip-type-checking-deps.patch
-	sha256sums = 128a5eb82d3ef19c438716657ae709ff0b05750882b7724f3fb9efd119d222bb
-	sha256sums = d633c7c5498a0b9f237ea92782b57b8055b034bf25e90c0c3d29f04db6ad6ef4
-	sha256sums = 7a74f90a22a8feff0ed911ba3eef80b799832ad87b9de9e0a56adc3aad13251f
+	sha256sums = 20d622d47c0cf70f3522b976be0dd9404ba0e4cac8d0b5363cbbbc404a9f5dad
+	sha256sums = 685e15923c909ca99cec51f2b7c568738277fbd0f74e3a0f37f7d1034982495e
+	sha256sums = d2add0c54a7481da3d30d5c1f5a237591eceeb68dd5ab6599384b84badae3273
 	sha256sums = 89f1d00764e0f151600f6a21d7ced4289b3ce3f900ded40fe5da95e658fc9db4
-	sha256sums = f934553a5ce9e046a0b8253e10da16e661b27375e2b54d6bb915267f32aff807
+	sha256sums = cc546f4e5af642af89f82be0375800c2721dd904c0a212cf46f6459495b75bff
 	sha256sums = 9858fefa254812980d252b29fc6f32bd19bb83ee7e5a96d72c707626ed5193a7
 	sha256sums = 198bc2ec14439e3ba41a03c4823f07df4b0c559c1dcbdaf678416ed12a720c2e
 
diff --git a/PKGBUILD b/PKGBUILD
index 8e599f59e929..e6ea5e2644cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,9 +9,9 @@
 # anki -> git rev-parse $pkgver --short=8
 # ftl -> git submodule
 declare -gA _tags=(
- [ftl_core]="bcc4822d4613b7310ed82da8b51029f5ea52c5c1"
- [ftl_desktop]="75af3ed4a3992bccae7eba3bc8ee9fa5c4645c0b"
- [anki]="cf16ce1d"
+ [ftl_core]="8dfb51ed11584ebd33c2b3996892640b72bd298f"
+ [ftl_desktop]="82a545c307cd6872fc98c3b1db718090e1f2d87e"
+ [anki]="51a10f0"
 )
 declare -gA _caches=(
     [yarn]="yarn-cache"
@@ -19,8 +19,8 @@ declare -gA _caches=(
 )
 
 pkgname=anki
-pkgver=2.1.66
-pkgrel=2
+pkgver=23.10
+pkgrel=1
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
 url="https://apps.ankiweb.net/"
 license=('AGPL3')
@@ -77,11 +77,11 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/ankitects/anki/archive/refs
         "strip-formatter-deps.patch"
         "strip-type-checking-deps.patch"
 )
-sha256sums=('128a5eb82d3ef19c438716657ae709ff0b05750882b7724f3fb9efd119d222bb'
-            'd633c7c5498a0b9f237ea92782b57b8055b034bf25e90c0c3d29f04db6ad6ef4'
-            '7a74f90a22a8feff0ed911ba3eef80b799832ad87b9de9e0a56adc3aad13251f'
+sha256sums=('20d622d47c0cf70f3522b976be0dd9404ba0e4cac8d0b5363cbbbc404a9f5dad'
+            '685e15923c909ca99cec51f2b7c568738277fbd0f74e3a0f37f7d1034982495e'
+            'd2add0c54a7481da3d30d5c1f5a237591eceeb68dd5ab6599384b84badae3273'
             '89f1d00764e0f151600f6a21d7ced4289b3ce3f900ded40fe5da95e658fc9db4'
-            'f934553a5ce9e046a0b8253e10da16e661b27375e2b54d6bb915267f32aff807'
+            'cc546f4e5af642af89f82be0375800c2721dd904c0a212cf46f6459495b75bff'
             '9858fefa254812980d252b29fc6f32bd19bb83ee7e5a96d72c707626ed5193a7'
             '198bc2ec14439e3ba41a03c4823f07df4b0c559c1dcbdaf678416ed12a720c2e'
 )
diff --git a/anki.changelog b/anki.changelog
index 751ee678716d..9caa2a8aadb3 100644
--- a/anki.changelog
+++ b/anki.changelog
@@ -1,3 +1,65 @@
+# 23.10-1
+Notable changes:
+   * Anki's version numbering scheme has changed to year.month(.patch).
+   * Quite a few add-ons will need updates to support the Qt 6 version of this release. Some porting notes are available.
+   * Support for FSRS (which improves upon the scheduling provided by SM-2) is now integrated into Anki. You can compute the model weights directly inside Anki, and no longer need to use custom scheduling. If you have previously used FSRS, please delete the text in the custom scheduling section before enabling FSRS, and ensure the helper add-on has been updated to the 23.10 version if you are using it. By @L-M-Sherlock with help from @dae and @asukaminato0721 in #2633, #2654 and https://github.com/open-spaced-repetition/fsrs-rs.
+   * Anki now has built-in support for creating image occlusions. Select the automatically-added "Image Occlusion" notetype in the add screen to use it. Glutanimate intends to update his add-on soon to work with the new system. By @krmanik, with help from @glutanimate, @hikaru-y, @abdnh and @dae in #2367, #2485, #2600, #2602, #2649, #2689, #2705 and more.
+   * .apkg imports are able to merge changed notetypes, and can exclude scheduling data. By @RumovZ in #2612
+   * Performance improvements to things like browser loading in the official builds.
+   * You can now customize the video driver in Qt6 in the preferences, which can help to work around graphical issues. @abdnh in #2643
+   * Add an option to stop the timer on answer by @abdnh in #2673
+   * Allow searching for missing custom data properties by @abdnh in #2626
+   * Support searching for custom data strings by @abdnh in #2634
+   * Support for the v2 scheduler has been dropped.
+   * .apkg exports now default to the new format.
+   * New cards can now be gathered by deck then random note.
+
+ Smaller tweaks/fixes:
+   * Add a backend method to add notes in bulk by @abdnh in #2659
+   * Add ability to tab to DuplicateLink by @SteelColossus in #2646
+   * Add profile name in profile deletion confirmation message by @chandraiyengar in #2722
+   * Add Sphinx documentation generation functionality by @gsingh93 in #2720
+   * added Translator by @platynowy in #2653
+   * Allow full screen mode on new Qt6 drivers by @abdnh in #2660
+   * Allow saving window position when window fullscreen on Qt 6
+   * Better error messages when csv file is in the wrong format
+   * Change “Delete Note” shortcut to cmd+backspace by @montyevans in #2614
+   * Check DB now fixes invalid UTF-8 in tags.
+   * Close import log page on error by @abdnh in #2639
+   * Display a more friendly message when one or more add-ons fail at startup
+   * Do not show [object Object] in import log by @abdnh in #2636
+   * Don't rely on the presence of revlogs to decide whether deck configs should be imported.
+   * Fix a11y issues with Badge component by @adeleke5140 in #2721
+   * Fix an error when repositioning tags (thanks to @abdnh)
+   * Fix an issue caused by adding a colon to the start or end of a deck name by @swektr in #2748
+   * Fix answer button tooltips not reflecting configured shortcuts by @abdnh in #2657
+   * Fix error when closing Find Duplicates screen early by @abdnh in #2669
+   * Fix intermittent browser error triggered by an early resize event by @abdnh in #2671
+   * Fix misleading warning when changing notetype from/to cloze by @abdnh in #2744
+   * Fix ModuleNotFoundError: No module named 'distutils' by @virinci in #2723
+   * Fix pasting from external programs not working after copying text inside the editor.
+   * Fix reversed float left/right icons
+   * Fix some issues with undo/redo in mask editor by @hikaru-y in #2649
+   * Fix typo: notetypeId → noteId by @glutanimate in #2615
+   * Fix unable to save field dialog if certain fields are deleted by @swektr in #2663
+   * Fix unescaped HTML in type-in-the-answer by @abdnh in #2658
+   * Implemented support to audio_did_seek_relative by @evandrocoan in #2632
+   * Reduce shaking of bottom bar by @abdnh in #2734
+   * Rework media syncing to make it a little faster, and avoid duplicate errors when your password has changed. #2647
+   * Skip template checks in Fields screen by @abdnh in #2670
+   * Support AVIF by @nihil-admirari in #2630
+   * Support Qt.TextFormat.MarkdownText in aqt.utils by @abdnh in #2675
+   * The "edit current card" window is now a main window, which fixes some shortcut keys on macOS. By @abdnh in #2732
+   * Tooltips for CSV import and import page refactoring by @RumovZ in #2655
+   * Tweak browser column labels to card type, note type by @Gustaf-C in #2751
+   * Change export notes' parent window in card browser by @kelciour in #2761
+   * Fix Linux install script CWD check by @virinci in #2775
+   * Make it possible to silent uninstall with WinGet by @kelciour in #2757
+   * Refresh reviewer as the day rolls over by @abdnh in #2756
+   * Update to Qt 6.5.3 on Windows/Mac
+   * Fix error on 'Previous Card Info' when deleting a note by @abdnh in #2790
+   * Fix HTML editor not displaying properly when expanding field by @hikaru-y in #2792
+
 # 2.1.66-2
 PKGBUILD:
    * pin nodejs>=18
diff --git a/no-update.patch b/no-update.patch
index 7a41ad13d3f5..7dc6228e2c68 100644
--- a/no-update.patch
+++ b/no-update.patch
@@ -1,11 +1,13 @@
+diff --git a/qt/aqt/update.py b/qt/aqt/update.py
+index 212ddf93d..6f716cc04 100644
 --- a/qt/aqt/update.py
 +++ b/qt/aqt/update.py
-@@ -33,6 +33,8 @@
-         }
-
-     def run(self) -> None:
-+        return
+@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
+ 
+ 
+ def check_for_update() -> None:
++    return
 +
-         if not self.config["updates"]:
-             return
-         d = self._data()
+     from aqt import mw
+ 
+     def do_check(_col: Collection) -> CheckForUpdateResponse: