Update to new build system

2 files changed, 11 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49a4f3faf3f9..c186fa9f4f29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,18 @@
 pkgbase = anki-git
 	pkgdesc = Helps you remember facts (like words/phrases in a foreign language) efficiently
-	pkgver = r9412.bc6ede7c1
+	pkgver = r9764.797270802
 	pkgrel = 1
 	url = http://ankisrs.net/
 	arch = any
 	license = AGPL3
 	makedepends = git
 	makedepends = rsync
-	makedepends = bazel
+	makedepends = ninja
 	makedepends = clang
-	makedepends = maturin
 	makedepends = rust
+	makedepends = libxcrypt-compat
 	makedepends = python-pip
-	makedepends = python-mypy-protobuf
 	makedepends = npm
-	makedepends = typescript
-	makedepends = jre11-openjdk
 	depends = python-beautifulsoup4
 	depends = python-requests
 	depends = python-wheel
@@ -33,7 +30,8 @@ pkgbase = anki-git
 	depends = python-flask
 	depends = python-flask-cors
 	depends = python-waitress
-	depends = python-pyqt5
+	depends = python-pyqt6
+	depends = python-pyqt6-webengine
 	optdepends = lame: record sound
 	optdepends = mpv: play sound. prefered over mplayer
 	optdepends = mplayer: play sound
diff --git a/PKGBUILD b/PKGBUILD
index 0fbf561fc5b0..641908e91a8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # Contributor: Dave Pretty <david dot pretty at gmail dot com>
 
 pkgname=anki-git
-pkgver=r9412.bc6ede7c1
+pkgver=r9764.797270802
 pkgrel=1
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
 url="http://ankisrs.net/"
@@ -40,23 +40,21 @@ depends=(
     'python-flask'
     'python-flask-cors'
     'python-waitress'
-    'python-pyqt5'
+    'python-pyqt6'
+    'python-pyqt6-webengine'
 )
 makedepends=(
     'git'
     'rsync'
 
-    'bazel'
+    'ninja'
     'clang'
 
-    'maturin'
     'rust'
+    'libxcrypt-compat'
 
     'python-pip'
-    'python-mypy-protobuf'
     'npm'
-    'typescript'
-    'jre11-openjdk'
 )
 optdepends=(
     'lame: record sound'
@@ -80,18 +78,10 @@ pkgver() {
 prepare() {
     cd "$pkgname"
 
-    # Disable foring a specific bazel version to build with
-    rm .bazelversion
-
-    # Work around option that got removed in bazel
-    sed -i 's/--experimental_no_product_name_out_symlink//g' .bazelrc
-
     # Put translations in place.
     #ln -sf "$srcdir"/ankitects-anki-core-i18n-*/ rslib/ftl/repo
     #ln -sf "$srcdir"/ankitects-anki-desktop-ftl-*/ qt/ftl/repo
     #ln -sf "$srcdir"/ankitects-anki-desktop-i18n-*/ qt/po/repo
-
-    echo "build --action_env=PYO3_PYTHON=/usr/bin/python3" > "$srcdir/$pkgname/user.bazelrc"
 }
 
 build() {
@@ -99,13 +89,12 @@ build() {
 
     export CC=/usr/bin/clang
     export CXX=/usr/bin/clang++
-    export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
     ./tools/build
 }
 
 package() {
     cd "$pkgname"
-    PIP_CONFIG_FILE=/dev/null pip install --isolated --root="$pkgdir" --ignore-installed --no-deps .bazel/out/dist/anki-*.whl .bazel/out/dist/aqt-*.whl
+    PIP_CONFIG_FILE=/dev/null pip install --isolated --root="$pkgdir" --ignore-installed --no-deps out/wheels/*.whl
 
     install -Dm755 qt/runanki.py "$pkgdir"/usr/bin/anki
     install -Dm644 qt/bundle/lin/anki.desktop "$pkgdir"/usr/share/applications/anki.desktop