diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec index 3b97e70444..200afa430b 100644 --- a/anda/apps/anki-qt5/anki-qt5.spec +++ b/anda/apps/anki-qt5/anki-qt5.spec @@ -6,8 +6,7 @@ License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC URL: https://apps.ankiweb.net/ BuildRequires: python3-devel python3-setuptools python3-beautifulsoup4 python3-waitress python3-decorator python3-markdown python3-protobuf python3-pysocks BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-requests python3-send2trash python3-certifi python3-pyqt5-sip python3-simplejson -BuildRequires: desktop-file-utils libappstream-glib python3-installer make xdg-utils -BuildRequires: cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command +BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat ExclusiveArch: %{qt5_qtwebengine_arches} noarch @@ -25,9 +24,13 @@ as possible. Anki is based on a theory called spaced repetition. git clone https://github.com/ankitects/anki . git checkout %{version} %patch0 -p1 -%patch1 -p1 -# See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki +cat > .cargo/config.toml << EOF +[target.x86_64-unknown-linux-gnu] +rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold"] +EOF + +# See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5 %build ./tools/build diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec index 30ba846435..9360ccab76 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -5,9 +5,8 @@ Summary: Flashcard program for using space repetition learning License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY URL: https://apps.ankiweb.net/ BuildRequires: python3-devel python3-setuptools python3-beautifulsoup4 python3-waitress python3-decorator python3-markdown python3-protobuf python3-pysocks -BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-requests python3-send2trash python3-certifi python3-pyqt5-sip python3-simplejson -BuildRequires: desktop-file-utils libappstream-glib python3-installer make xdg-utils mold -BuildRequires: cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command +BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-requests python3-send2trash python3-certifi python3-pyqt6 python3-simplejson +BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat BuildArch: noarch @@ -24,7 +23,6 @@ as possible. Anki is based on a theory called spaced repetition. git clone https://github.com/ankitects/anki . git checkout %{version} %patch0 -p1 -%patch1 -p1 cat > .cargo/config.toml << EOF [target.x86_64-unknown-linux-gnu] @@ -36,6 +34,7 @@ EOF %build ./tools/build + %install for file in out/wheels/*.whl; do python -m installer --destdir="%{buildroot}" $file