builds in clean chroot now

2 files changed, 14 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b248321ce834..b72bf7f74be0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = anki-qt5
 	pkgdesc = Helps you remember facts (like words/phrases in a foreign language) - Qt5 Build
 	pkgver = 2.1.55
-	pkgrel = 4
+	pkgrel = 5
 	url = https://apps.ankiweb.net/
 	arch = x86_64
 	license = AGPL3
 	makedepends = rsync
 	makedepends = git
 	makedepends = ninja
-	makedepends = rustup
+	makedepends = cargo
 	makedepends = python-installer
 	makedepends = libxcrypt-compat
+	makedepends = nodejs
 	depends = python-beautifulsoup4
-	depends = python-flask
 	depends = python-waitress
 	depends = python-decorator
 	depends = python-markdown
@@ -24,8 +24,8 @@ pkgbase = anki-qt5
 	depends = python-jsonschema
 	depends = python-requests
 	depends = python-send2trash
-	depends = python-flask
 	depends = python-flask-cors
+	depends = python-certifi
 	depends = python-waitress
 	depends = python-pyqt5
 	optdepends = lame: record sound
@@ -37,6 +37,7 @@ pkgbase = anki-qt5
 	conflicts = anki-git
 	conflicts = anki-official-binary-bundle
 	options = !ccache
+	options = !lto
 	source = anki-2.1.55::git+https://github.com/ankitects/anki#tag=2.1.55
 	source = no-update.patch
 	source = force_qt5.patch
diff --git a/PKGBUILD b/PKGBUILD
index 2140ddd254a5..d85927a6d175 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,18 +9,17 @@
 
 pkgname=anki-qt5
 pkgver=2.1.55
-pkgrel=4
+pkgrel=5
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) - Qt5 Build"
 url="https://apps.ankiweb.net/"
 license=('AGPL3')
 arch=('x86_64')
 provides=('anki')
 conflicts=('anki' 'anki-bin' 'anki-git' 'anki-official-binary-bundle')
-options=('!ccache')
+options=('!ccache' '!lto')
 depends=(
     # anki & aqt
     'python-beautifulsoup4'
-    'python-flask'
     'python-waitress'
 
     # anki
@@ -36,25 +35,27 @@ depends=(
     'python-jsonschema'
     'python-requests'
     'python-send2trash'
-    'python-flask'
-    'python-flask-cors'
+    'python-flask-cors' # python-flask required for anki & aqt but a dependency of -cors
+    'python-certifi'
     'python-waitress'
     'python-pyqt5'
 )
+
 makedepends=(
     'rsync'
     'git'
-
     'ninja'
-    'rustup'
+    'cargo'
     'python-installer'
     'libxcrypt-compat'
+    'nodejs'
 )
 optdepends=(
     'lame: record sound'
     'mpv: play sound. prefered over mplayer'
     'mplayer: play sound'
 )
+
 # using the tag tarballs does not work with the new (>= 2.1.55) build process.
 # the '.git' folder is not included in those but is required for a sucessful build
 source=("anki-${pkgver}::git+https://github.com/ankitects/anki#tag=${pkgver}"
@@ -82,13 +83,13 @@ build() {
 
 package() {
     cd "anki-$pkgver"
-
     for file in out/wheels/*.whl; do
     	python -m installer --destdir="$pkgdir" $file
     done
 
     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
+    # TODO: verify whether still required
     find $pkgdir -iname __pycache__ | xargs -r rm -rf
     find $pkgdir -iname direct_url.json | xargs -r rm -rf
 }