From 988d0bea85ddbe2216ac9fd73cdb48621ecaab96 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 5 May 2025 04:00:49 -0700 Subject: [PATCH] fix(lightly-qt6): Update script and build (#4673) (#4680) * fix(lightly-qt6): Funny missing labels in update.rhai Signed-off-by: Gilver * While I'm here Signed-off-by: Gilver * That was the name of the CMake file but okay Signed-off-by: Gilver * Update lightly-qt6.spec Signed-off-by: Gilver * Update lightly-qt6.spec Signed-off-by: Gilver * Try to rule out any missing build deps but I don't think it's that Signed-off-by: Gilver * ? Signed-off-by: Gilver * Update lightly-qt6.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 05c1d59a060a448a12352735ec1d57bfaa7fde18) Co-authored-by: Gilver --- anda/themes/lightly-qt6/lightly-qt6.spec | 13 +++++++++++-- anda/themes/lightly-qt6/update.rhai | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/anda/themes/lightly-qt6/lightly-qt6.spec b/anda/themes/lightly-qt6/lightly-qt6.spec index ae5a5462fb..1540ed38e2 100644 --- a/anda/themes/lightly-qt6/lightly-qt6.spec +++ b/anda/themes/lightly-qt6/lightly-qt6.spec @@ -2,6 +2,7 @@ %global _style lightly %global dev boehs %global _qt_major_version 6 +%global _qt_old_major 5 %global forgeurl https://github.com/%{dev}/%{style} %global commit 00ca23447844114d41bfc0d37cf8823202c082e8 @@ -49,7 +50,10 @@ BuildRequires: cmake(KF%{_qt_major_version}Kirigami2) BuildRequires: cmake(KF%{_qt_major_version}Notifications) BuildRequires: cmake(KF%{_qt_major_version}Package) BuildRequires: cmake(KF%{_qt_major_version}WindowSystem) - + +BuildRequires: cmake(Qt%{_qt_old_major}Core) +BuildRequires: cmake(Qt%{_qt_old_major}Gui) + BuildRequires: cmake(KDecoration2) BuildRequires: cmake(KWayland) BuildRequires: cmake(Plasma) @@ -71,7 +75,12 @@ Lightly is a fork of breeze theme style that aims to be visually modern and mini %forgeautosetup -p1 %build -%cmake_kf6 -DQT_MAJOR_VERSION=%{_qt_major_version} +%cmake_kf6 \ + -DQT_MAJOR_VERSION=%{_qt_major_version} \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=OFF \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON %cmake_build %install diff --git a/anda/themes/lightly-qt6/update.rhai b/anda/themes/lightly-qt6/update.rhai index 36206e82eb..7bb777b29d 100644 --- a/anda/themes/lightly-qt6/update.rhai +++ b/anda/themes/lightly-qt6/update.rhai @@ -1,6 +1,6 @@ import "andax/bump_extras.rhai" as bump; -fn main() { +fn main(labels) { let branch = bump::as_bodhi_ver(labels.branch); let url = `https://bodhi.fedoraproject.org/updates/?search=qt6-6.&status=stable&releases=${branch}&rows_per_page=1&page=1`; for entry in get(url).json().updates[0].title.split(' ') { @@ -11,4 +11,4 @@ fn main() { } } -open_file("anda/themes/lightly-qt6/VER6.txt").write(`${main()}`); // will trig rebuild when changed +open_file("anda/themes/lightly-qt6/VER6.txt").write(`${main(labels)}`); // will trig rebuild when changed