From 9f26f7deec3999e2d030d1b54efdc47a0a88ce54 Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Tue, 3 Jan 2023 22:54:53 +0800 Subject: [PATCH 1/3] Fix anki (#98) * Fix stuff * Fix obsoletes * Oh my goodness how did I forgot the patch --- anda/apps/anki-qt5/anki-qt5.spec | 20 ++++++++------------ anda/apps/anki/anki.spec | 15 +++++---------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec index 200afa430b..183973e8f9 100644 --- a/anda/apps/anki-qt5/anki-qt5.spec +++ b/anda/apps/anki-qt5/anki-qt5.spec @@ -4,16 +4,16 @@ Release: %autorelease 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: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command +BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks +BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson python3-pyqt5-sip +BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc 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 -Patch0: 0001-Force-qt5.patch -Patch1: 0001-No-update.patch +Obsoletes: anki <= 2.1.15 BuildArch: noarch Conflicts: anki +Patch0: 0001-No-update.patch +Patch1: 0001-Force-qt5.patch %description Anki is a program designed to help you remember facts (such as words @@ -24,16 +24,12 @@ as possible. Anki is based on a theory called spaced repetition. git clone https://github.com/ankitects/anki . git checkout %{version} %patch0 -p1 - -cat > .cargo/config.toml << EOF -[target.x86_64-unknown-linux-gnu] -rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold"] -EOF +%patch1 -p1 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5 %build -./tools/build +mold -run ./tools/build %install for file in out/wheels/*.whl; do diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec index 9360ccab76..cf22c9ca3e 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -4,13 +4,13 @@ Release: %autorelease 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-pyqt6 python3-simplejson -BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command +BuildRequires: python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks +BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson +BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc 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 +Obsoletes: anki <= 2.1.15 BuildArch: noarch -ExclusiveArch: %{qt6_qtwebengine_arches} noarch Conflicts: anki-qt5 Patch0: 0001-No-update.patch @@ -24,15 +24,10 @@ git clone https://github.com/ankitects/anki . git checkout %{version} %patch0 -p1 -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 %build -./tools/build +mold -run ./tools/build %install From 4ef41e0a5250d37e6fec04795f55eeab3c6cc20d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 4 Jan 2023 03:12:31 +0000 Subject: [PATCH 2/3] Automatic Update: latte-dock-nightly --- anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec index 846cb96cbb..0e4b1d704e 100644 --- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec +++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/KDE/latte-dock/ -%global commit af28885b81c5cfa32703ccf6c973341872790855 +%global commit 29ae2aa6986f108ee2afb92776b89892854b2b89 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} From ae54760033a2aa22b720784282eeb7f23136771b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 4 Jan 2023 03:35:48 +0000 Subject: [PATCH 3/3] Automatic Update: tau-hydrogen --- anda/others/tau-hydrogen/tau-hydrogen.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/others/tau-hydrogen/tau-hydrogen.spec b/anda/others/tau-hydrogen/tau-hydrogen.spec index f4c487349f..bfa5a02a1c 100644 --- a/anda/others/tau-hydrogen/tau-hydrogen.spec +++ b/anda/others/tau-hydrogen/tau-hydrogen.spec @@ -1,6 +1,6 @@ Summary: tauOS Icon Theme Name: tau-hydrogen -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} License: GPLv3 URL: https://github.com/tau-OS/tau-hydrogen