From ab289adfd22aacd38fba2992d7a5a0cf9c760988852270b6580eba23493d35cb Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 29 Feb 2024 12:54:45 +0000 Subject: [PATCH] - Fix build with SDL2 versions older than 2.0.16 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-desktop?expand=0&rev=7 --- plasma6-desktop.changes | 5 +++++ plasma6-desktop.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/plasma6-desktop.changes b/plasma6-desktop.changes index 04a7258..3c0d1c3 100644 --- a/plasma6-desktop.changes +++ b/plasma6-desktop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 29 12:54:32 UTC 2024 - Christophe Marin + +- Fix build with SDL2 versions older than 2.0.16 + ------------------------------------------------------------------- Wed Feb 21 18:36:36 UTC 2024 - Fabian Vogt diff --git a/plasma6-desktop.spec b/plasma6-desktop.spec index 345049f..159ff45 100644 --- a/plasma6-desktop.spec +++ b/plasma6-desktop.spec @@ -194,6 +194,10 @@ Conflicts: plasma5-desktop Requires: (plasma6-kimpanel-ibus if ibus) Requires: (plasma6-kimpanel-scim if scim) +%if %{pkg_vcmp cmake(sdl2) >= 2.0.16} +%bcond_without gamecontroller_kcm +%endif + %description This package contains the basic packages for a Plasma workspace. @@ -258,7 +262,9 @@ rm -rv %{buildroot}%{_kf6_sharedir}/dbus-1/interfaces/ %{_kf6_applicationsdir}/kcm_clock.desktop %{_kf6_applicationsdir}/kcm_componentchooser.desktop %{_kf6_applicationsdir}/kcm_desktoppaths.desktop +%if %{with gamecontroller_kcm} %{_kf6_applicationsdir}/kcm_gamecontroller.desktop +%endif %{_kf6_applicationsdir}/kcm_kded.desktop %{_kf6_applicationsdir}/kcm_keyboard.desktop %{_kf6_applicationsdir}/kcm_keys.desktop @@ -303,7 +309,9 @@ rm -rv %{buildroot}%{_kf6_sharedir}/dbus-1/interfaces/ %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_baloofile.so %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_componentchooser.so %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_desktoppaths.so +%if %{with gamecontroller_kcm} %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_gamecontroller.so +%endif %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_kded.so %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_keyboard.so %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_keys.so