From b38a98d8b4e2c230445df8b66427763165a7bb80 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 18 Jun 2025 00:18:11 -0700 Subject: [PATCH] feat(flameshot): revert to commit with qt5 (#5554) (#5556) * feat(flameshot): revert to commit with qt5 * feat(flameshot-nightly): terminate update script --------- (cherry picked from commit b4ba3c2c3b432b6e56a18ceb4052593e6f7e2f0d) Signed-off-by: madomado Co-authored-by: madomado --- anda/apps/flameshot/flameshot-nightly.spec | 31 +++++++++++----------- anda/apps/flameshot/update.rhai | 1 + 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/anda/apps/flameshot/flameshot-nightly.spec b/anda/apps/flameshot/flameshot-nightly.spec index 3fb71bac76..9f8cc301df 100644 --- a/anda/apps/flameshot/flameshot-nightly.spec +++ b/anda/apps/flameshot/flameshot-nightly.spec @@ -1,9 +1,10 @@ #? https://github.com/flameshot-org/flameshot/blob/master/packaging/rpm/fedora/flameshot.spec %global ver 12.1.0 -%global commit d420a53a4a61cb39842ee632fb8183ab07b58879 +%global commit 4edfb2ac1d71e7f75fcdcb850ff6bce5fb148a7b %global shortcommit %{sub %{commit} 1 7} -%global commit_date 20250617 +#global commit_date 20250608 +%global commit_date 20250618 %global devel_name QtColorWidgets Name: flameshot.nightly @@ -12,7 +13,7 @@ Release: 2%?dist License: GPL-3.0-or-later AND ASL-2.0 AND GPL-2.0-only AND LGPL-3.0-only AND FAL-1.3 Summary: Powerful yet simple to use screenshot software URL: https://flameshot.org -%dnl Source0: https://github.com/flameshot-org/flameshot/archive/%commit/flameshot-%commit.tar.gz +Source0: https://github.com/flameshot-org/flameshot/archive/%commit/flameshot-%commit.tar.gz Packager: madonuko BuildRequires: cmake >= 3.13.0 @@ -22,19 +23,19 @@ BuildRequires: libappstream-glib BuildRequires: ninja-build BuildRequires: desktop-file-utils -BuildRequires: cmake(Qt6Core) -BuildRequires: cmake(KF6GuiAddons) -BuildRequires: cmake(Qt6DBus) -BuildRequires: cmake(Qt6Gui) -BuildRequires: cmake(Qt6LinguistTools) -BuildRequires: cmake(Qt6Network) -BuildRequires: cmake(Qt6Svg) -BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt5Core) >= 5.9.0 +BuildRequires: cmake(KF5GuiAddons) >= 5.89.0 +BuildRequires: cmake(Qt5DBus) >= 5.9.0 +BuildRequires: cmake(Qt5Gui) >= 5.9.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.9.0 +BuildRequires: cmake(Qt5Network) >= 5.9.0 +BuildRequires: cmake(Qt5Svg) >= 5.9.0 +BuildRequires: cmake(Qt5Widgets) >= 5.9.0 Requires: hicolor-icon-theme -Requires: qt6-qtbase -Requires: qt6-qttools -Requires: qt6-qtsvg%{?_isa} +Requires: qt5-qtbase >= 5.9.0 +Requires: qt5-qttools >= 5.9.0 +Requires: qt5-qtsvg%{?_isa} >= 5.9.0 %dnl Provides: flameshot = %version-%release Conflicts: flameshot @@ -67,7 +68,7 @@ Requires: %{name} = %{version} Development files for Flameshot. %prep -%git_clone https://github.com/flameshot-org/flameshot.git %commit +%autosetup -p1 -n flameshot-%commit %build %cmake -G Ninja \ diff --git a/anda/apps/flameshot/update.rhai b/anda/apps/flameshot/update.rhai index 5350ca331b..514949abd6 100644 --- a/anda/apps/flameshot/update.rhai +++ b/anda/apps/flameshot/update.rhai @@ -1,3 +1,4 @@ +terminate(); rpm.global("commit", gh_commit("flameshot-org/flameshot")); if rpm.changed() { let v = gh("flameshot-org/flameshot");