From b68aa7ab9bb167670b04a83a4c0a2c363bbb2a44a57b7c225c0c1ee54a5c71c4 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Mon, 25 Mar 2024 12:00:33 +0000 Subject: [PATCH] - Replace the 'cmake(KQuickImageEditor)' BuildRequires with kquickimageeditor-devel to pick the correct flavor - Build with GCC 13 on Leap 15 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaidan?expand=0&rev=26 --- kaidan.changes | 7 +++++++ kaidan.spec | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/kaidan.changes b/kaidan.changes index 5a2d492..ba16c4c 100644 --- a/kaidan.changes +++ b/kaidan.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 25 11:52:13 UTC 2024 - Christophe Marin + +- Replace the 'cmake(KQuickImageEditor)' BuildRequires with + kquickimageeditor-devel to pick the correct flavor +- Build with GCC 13 on Leap 15 + ------------------------------------------------------------------- Mon May 22 21:10:32 UTC 2023 - Jaime Marquínez Ferrándiz diff --git a/kaidan.spec b/kaidan.spec index b558974..035195f 100644 --- a/kaidan.spec +++ b/kaidan.spec @@ -27,6 +27,13 @@ Source1: https://download.kde.org/unstable/%{name}/%{name}-%{version}.tar Source2: kaidan.keyring BuildRequires: cmake >= 3.3 BuildRequires: extra-cmake-modules >= 5.40.0 +%if 0%{?suse_version} == 1500 +BuildRequires: gcc13-c++ +BuildRequires: gcc13-PIE +%endif +# Both Qt 5 and Qt 6 flavors use the same cmake config name, use the -devel package name +# BuildRequires: cmake(KQuickImageEditor) +BuildRequires: kquickimageeditor-devel BuildRequires: update-desktop-files BuildRequires: cmake(KF5CoreAddons) >= 5.67.0 BuildRequires: cmake(KF5KIO) >= 5.67.0 @@ -34,7 +41,6 @@ BuildRequires: cmake(KF5Kirigami2) >= 5.67.0 BuildRequires: cmake(KF5KirigamiAddons) >= 0.7.0 BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5QQC2DeskopStyle) -BuildRequires: cmake(KQuickImageEditor) BuildRequires: cmake(QXmpp) >= 1.5.0 BuildRequires: cmake(Qt5Concurrent) BuildRequires: cmake(Qt5Core) >= 5.14.0 @@ -67,6 +73,9 @@ using the qxmpp XMPP client library and Qt 5. %autosetup -p1 %build +%if 0%{?suse_version} == 1500 +export CXX=g++-13 +%endif %cmake_kf5 -d build '-DI18N:BOOL=ON' '-DQUICK_COMPILER:BOOL=ON' %cmake_build