- 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
This commit is contained in:
Christophe Marin 2024-03-25 12:00:33 +00:00 committed by Git OBS Bridge
parent 0951c2b719
commit b68aa7ab9b
2 changed files with 17 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Mar 25 11:52:13 UTC 2024 - Christophe Marin <christophe@krop.fr>
- 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 <jaime.marquinez.ferrandiz@fastmail.net> Mon May 22 21:10:32 UTC 2023 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>

View File

@ -27,6 +27,13 @@ Source1: https://download.kde.org/unstable/%{name}/%{name}-%{version}.tar
Source2: kaidan.keyring Source2: kaidan.keyring
BuildRequires: cmake >= 3.3 BuildRequires: cmake >= 3.3
BuildRequires: extra-cmake-modules >= 5.40.0 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: update-desktop-files
BuildRequires: cmake(KF5CoreAddons) >= 5.67.0 BuildRequires: cmake(KF5CoreAddons) >= 5.67.0
BuildRequires: cmake(KF5KIO) >= 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(KF5KirigamiAddons) >= 0.7.0
BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5QQC2DeskopStyle) BuildRequires: cmake(KF5QQC2DeskopStyle)
BuildRequires: cmake(KQuickImageEditor)
BuildRequires: cmake(QXmpp) >= 1.5.0 BuildRequires: cmake(QXmpp) >= 1.5.0
BuildRequires: cmake(Qt5Concurrent) BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5Core) >= 5.14.0 BuildRequires: cmake(Qt5Core) >= 5.14.0
@ -67,6 +73,9 @@ using the qxmpp XMPP client library and Qt 5.
%autosetup -p1 %autosetup -p1
%build %build
%if 0%{?suse_version} == 1500
export CXX=g++-13
%endif
%cmake_kf5 -d build '-DI18N:BOOL=ON' '-DQUICK_COMPILER:BOOL=ON' %cmake_kf5 -d build '-DI18N:BOOL=ON' '-DQUICK_COMPILER:BOOL=ON'
%cmake_build %cmake_build