Add EPEL apps at latest versions and fix all EPEL dependency conflicts
Some checks failed
Build RPMs / build (push) Has been cancelled

Add 8 new packages built from upstream KDE sources at versions matching
the rest of SonicDE (Gear 26.04.3, Plasma 6.7.4):
- colord-kde 26.04.3
- dolphin-plugins 26.04.3
- filelight 26.04.3
- kde-gtk-config 6.7.4
- kde-inotify-survey 26.04.3
- ksanecore 26.04.3 (dependency for skanpage)
- plasma-discover 6.7.4 (with snap backend disabled)
- skanpage 26.04.3

These packages replace the EPEL versions and use SonicDE dependencies
instead of kf6-*/plasma-* packages, ensuring they are upgraded (not
removed) when SonicDE is installed alongside EPEL KDE.

Fix EPEL dependencies in existing SonicDE packages that caused packages
to be removed during dnf upgrade --allowerasing:
- sonic-desktop-interface: kde-cli-tools -> sonic-terminal-tools,
  kmenuedit -> sonic-launcher-menu-edit, kwrited -> sonic-write-daemon,
  signon-plugin-oauth2 and plasma-systemsettings changed to Recommends
- sonic-workspace: kio-fuse -> sonic-frameworks-io-fuse,
  polkit-kde -> sonic-polkit-agent,
  xdg-desktop-portal-kde -> xdg-desktop-portal-sonicde,
  plasma-keyboard and kde-settings-plasma changed to Recommends
- sonic-workspace-addons: kf6-plasma -> sonic-interface-libraries
- kde-gtk-config: breeze-gtk-common -> sonic-silver-gtk-common
- sonic-login-manager: kde-settings-plasma changed to Recommends
- kcm-soniclogin: plasma-systemsettings changed to Recommends
- sonic-rpm-macros: kde-qdoc-common changed to Recommends
- sonic-welcome-center: add Obsoletes for plasma-welcome

Also includes Obsoletes/Provides fixes across all spec files for proper
EPEL package replacement, and Conflicts tag removal from spec files.

Result: dnf upgrade --allowerasing from standard EPEL KDE removes 0
packages. dnf install of SonicDE packages installs 195 packages with
0 removals.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
test 2026-08-27 17:11:06 +00:00
commit a88703e93e
153 changed files with 6147 additions and 988 deletions

View file

@ -0,0 +1,13 @@
--- a/src/x11/pipewirestream.cpp
+++ b/src/x11/pipewirestream.cpp
@@ -24,6 +24,10 @@
#include <spa/pod/builder.h>
#include <spa/utils/defs.h>
+#ifndef SPA_POD_ALIGN
+#define SPA_POD_ALIGN 8
+#endif
+
namespace {
constexpr uint32_t s_bufferCount = 3;
constexpr uint32_t s_defaultWidth = 1;

View file

@ -11,7 +11,7 @@
Name: xdg-desktop-portal-sonicde
Summary: Backend implementation for xdg-desktop-portal using Qt/KF5
Version: 6.7.4
Release: 1%{?dist}
Release: 5%{?dist}
License: BSD-2-Clause AND CC0-1.0 AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only)
#URL: https://invent.kde.org/plasma/%%{name}
@ -20,6 +20,7 @@ URL: https://github.com/Sonic-DE/%{reponame}
#Source0: https://download.kde.org/%%{stable_kf6}/plasma/%%{version}/%%{name}-%%{version}.tar.xz
Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{reponame}-%{version}.tar.gz
#Source1: https://download.kde.org/%%{stable_kf6}/plasma/%%{version}/%%{name}-%%{version}.tar.xz.sig
Patch0: spa-pod-align.patch
BuildRequires: sonic-frameworks-cmake-modules
BuildRequires: sonic-rpm-macros
@ -62,8 +63,8 @@ Requires: xdg-desktop-portal
Requires: xdg-desktop-portal-gtk
Supplements: sonic-desktop-interface
Provides: xdg-desktop-portal-kde = %{version}-%{release}
Conflicts: xdg-desktop-portal-kde < %{version}-%{release}
Provides: xdg-desktop-portal-kde%{?_isa} = %{version}-%{release}
Obsoletes: xdg-desktop-portal-kde < %{version}-%{release}
%description
A backend implementation for xdg-desktop-portal that is using Qt/KF5 and various
@ -88,13 +89,19 @@ pieces of KDE infrastructure.
%files -f xdg-desktop-portal-kde.lang
%license LICENSES/*
%{_libexecdir}/xdg-desktop-portal-sonicde
%{_libexecdir}/xdg-desktop-portal-kde
%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.sonicde.service
%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.kde.service
%{_datadir}/xdg-desktop-portal/portals/sonicde.portal
%{_datadir}/xdg-desktop-portal/portals/kde.portal
%{_datadir}/applications/org.freedesktop.impl.portal.desktop.sonicde.desktop
%{_datadir}/applications/org.freedesktop.impl.portal.desktop.kde.desktop
%{_datadir}/knotifications6/xdg-desktop-portal-kde.notifyrc
%{_datadir}/qlogging-categories6/xdp-kde.categories
%{_userunitdir}/plasma-xdg-desktop-portal-sonicde.service
%{_userunitdir}/plasma-xdg-desktop-portal-kde.service
%{_datadir}/xdg-desktop-portal/sonicde-portals.conf
%changelog
* Mon Aug 24 2026 Anders da Silva Rytter Hansen <andersrh@users.noreply.github.com> - 6.7.4-1