bump to 2.1.55

4 files changed, 37 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a076aa0c784f..5d15a7b2fb37 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,27 @@
 pkgbase = anki-qt5
 	pkgdesc = Helps you remember facts (like words/phrases in a foreign language) - Qt5 Build
-	pkgver = 2.1.54
+	pkgver = 2.1.55
 	pkgrel = 1
 	url = https://apps.ankiweb.net/
 	arch = x86_64
 	license = AGPL3
 	makedepends = rsync
 	makedepends = git
-	makedepends = bazel
-	makedepends = clang
-	makedepends = python-pip
+	makedepends = ninja
+	makedepends = python-installer
 	depends = python-beautifulsoup4
-	depends = python-requests
-	depends = python-wheel
-	depends = python-pysocks
+	depends = python-flask
+	depends = python-waitress
 	depends = python-decorator
-	depends = python-protobuf
+	depends = python-markdown
 	depends = python-orjson
+	depends = python-protobuf
+	depends = python-pysocks
 	depends = python-distro
-	depends = python-send2trash
-	depends = python-markdown
+	depends = python-flask-cors
 	depends = python-jsonschema
-	depends = python-pyaudio
-	depends = python-pyqtwebengine
+	depends = python-requests
+	depends = python-send2trash
 	depends = python-flask
 	depends = python-flask-cors
 	depends = python-waitress
@@ -36,13 +35,11 @@ pkgbase = anki-qt5
 	conflicts = anki-git
 	conflicts = anki-official-binary-bundle
 	options = !ccache
-	source = anki-qt5-2.1.54.tar.gz::https://github.com/ankitects/anki/archive/refs/tags/2.1.54.tar.gz
+	source = anki-2.1.55::git+https://github.com/ankitects/anki#tag=2.1.55
 	source = no-update.patch
-	source = inc_qt_timeout.patch
 	source = force_qt5.patch
-	sha256sums = c8db4aee849f6cc50e451b99633feac34d54bed5ef564ffaaf56acf4e1f6ada4
+	sha256sums = SKIP
 	sha256sums = 137827586d2a72adddaaf98599afa9fc80cdd73492d7f5cbcf4d2f6082e5f797
-	sha256sums = 281e12217f6b60ff64ad66e58aaf0cdb8bed16ffe2a3e6ab9e6ff5e773b4cabf
-	sha256sums = fc477627179cbc0f88190e05abe1256bf1e62367620331ddf574303356d21169
+	sha256sums = c5e6e1b2ed7999e9ef7f855aed4c97c4ace846237421507f408a64a8258a09fd
 
 pkgname = anki-qt5
diff --git a/PKGBUILD b/PKGBUILD
index cd24282039e4..80f3eb1493d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 # Contributor: Dave Pretty <david dot pretty at gmail dot com>
 
 pkgname=anki-qt5
-pkgver=2.1.54
+pkgver=2.1.55
 pkgrel=1
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) - Qt5 Build"
 url="https://apps.ankiweb.net/"
@@ -18,24 +18,24 @@ provides=('anki')
 conflicts=('anki' 'anki-bin' 'anki-git' 'anki-official-binary-bundle')
 options=('!ccache')
 depends=(
-    # anki and aqt
+    # anki & aqt
     'python-beautifulsoup4'
-    'python-requests'
-    'python-wheel'
+    'python-flask'
+    'python-waitress'
 
     # anki
-    'python-pysocks' # requests[socks]
     'python-decorator'
-    'python-protobuf'
+    'python-markdown'
     'python-orjson'
+    'python-protobuf'
+    'python-pysocks'
     'python-distro'
 
-    # aqt
-    'python-send2trash'
-    'python-markdown'
+    #aqt
+    'python-flask-cors'
     'python-jsonschema'
-    'python-pyaudio'
-    'python-pyqtwebengine'
+    'python-requests'
+    'python-send2trash'
     'python-flask'
     'python-flask-cors'
     'python-waitress'
@@ -45,69 +45,44 @@ makedepends=(
     'rsync'
     'git'
 
-    'bazel'
-    'clang'
-    'python-pip'
+    'ninja'
+    'python-installer'
 )
 optdepends=(
     'lame: record sound'
     'mpv: play sound. prefered over mplayer'
     'mplayer: play sound'
 )
-source=("$pkgname-$pkgver.tar.gz::https://github.com/ankitects/anki/archive/refs/tags/${pkgver}.tar.gz"
+source=("anki-${pkgver}::git+https://github.com/ankitects/anki#tag=${pkgver}"
 "no-update.patch"
-"inc_qt_timeout.patch"
 "force_qt5.patch"
 )
-sha256sums=('c8db4aee849f6cc50e451b99633feac34d54bed5ef564ffaaf56acf4e1f6ada4'
+sha256sums=('SKIP'
 '137827586d2a72adddaaf98599afa9fc80cdd73492d7f5cbcf4d2f6082e5f797'
-'281e12217f6b60ff64ad66e58aaf0cdb8bed16ffe2a3e6ab9e6ff5e773b4cabf'
-'fc477627179cbc0f88190e05abe1256bf1e62367620331ddf574303356d21169'
+'c5e6e1b2ed7999e9ef7f855aed4c97c4ace846237421507f408a64a8258a09fd'
 )
 
-_bazel_build() {
-    bazel build -c opt wheels
-    _status=$?
-    bazel shutdown
-    if [[ $_status -gt 0 ]]; then
-        exit $_status # or call false
-    fi
-}
 
 prepare(){
     cd "anki-$pkgver"
     # pro-actively prevent "module not found" error
     [ -d ts/node_modules ] && rm -r ts/node_modules
     patch -p1 < "$srcdir/no-update.patch"
-    patch -p1 < "$srcdir/inc_qt_timeout.patch"
     patch -p1 < "$srcdir/force_qt5.patch"
-    rm .bazelversion
 }
 
 build() {
     cd "anki-$pkgver"
-    #fixes linker for clang users
-    if [ "$CC" = clang ] && [ "$CXX" = 'clang++' ]; then
-        export LDSHARED="/usr/bin/clang -shared"
-    fi
-    # build requires java 11 to work, does not compile with java 17
-    export JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
-    echo "####################
-Beginning compilation... This step is known to be prone to failure by the anki devs.
-If the build is failing retry the installation. This usually fixes the problem.
-A too slow internet connection can also hinder the dependency fetching process because of hardcoded timeouts in bazel.
-If the problem persists consider removing data in ~/.cache/bazel and your AUR manager cache (~/.cache/paru/clone/anki for paru) and retry again.
-####################"
-    _bazel_build
+    ./tools/build
 }
 
 package() {
     cd "anki-$pkgver"
-    PIP_CONFIG_FILE=/dev/null pip install --isolated --root="$pkgdir" --ignore-installed --no-deps .bazel/out/k8-opt/bin/qt/aqt/aqt-*.whl .bazel/out/k8-opt/bin/pylib/anki/anki-*.whl
 
-    install -Dm755 qt/runanki.py "$pkgdir"/usr/bin/anki
-    install -Dm644 qt/bundle/lin/anki.desktop "$pkgdir"/usr/share/applications/anki.desktop
-    install -Dm644 qt/bundle/lin/anki.png "$pkgdir"/usr/share/pixmaps/anki.png
+    for file in out/wheels/*.whl; do
+    	python -m installer --destdir="$pkgdir" $file
+    done
+
     find $pkgdir -iname __pycache__ | xargs -r rm -rf
     find $pkgdir -iname direct_url.json | xargs -r rm -rf
 }
diff --git a/force_qt5.patch b/force_qt5.patch
index a5f91fe73ea2..90ab116f531f 100644
--- a/force_qt5.patch
+++ b/force_qt5.patch
@@ -1,8 +1,8 @@
 --- a/qt/aqt/qt/__init__.py
 +++ b/qt/aqt/qt/__init__.py
-@@ -9,16 +9,7 @@ import sys
+@@ -9,16 +9,7 @@
  import traceback
- from typing import Callable, Union
+ from typing import Callable, TypeVar, Union
 
 -try:
 -    import PyQt6
diff --git a/inc_qt_timeout.patch b/inc_qt_timeout.patch
deleted file mode 100644
index f4ea058d2fa0..000000000000
--- a/inc_qt_timeout.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/python/pyqt/defs.bzl
-+++ b/python/pyqt/defs.bzl
-@@ -1,7 +1,7 @@
- # based off https://github.com/ali5h/rules_pip/blob/master/defs.bzl
-
- def _execute(repository_ctx, arguments, quiet = False):
--    return repository_ctx.execute(arguments, environment = {}, quiet = quiet)
-+    return repository_ctx.execute(arguments, environment = {}, quiet = quiet, timeout=6000)
-
- def _install_pyqt_impl(repository_ctx):
-     python_interpreter = repository_ctx.attr.python_interpreter