From 650a436381cc03151f05cf3ff97cbedc96276318 Mon Sep 17 00:00:00 2001 From: Anders da Silva Rytter Hansen Date: Thu, 12 Mar 2026 18:24:22 -0300 Subject: [PATCH] commit current changes --- SonicDE/sonic-desktop-interface.spec | 6 +-- SonicDE/sonic-interface-libraries.spec | 36 +++++++++++++--- SonicDE/sonic-libworkspace.spec | 15 ++++++- SonicDE/sonic-win.spec | 59 +++++++++++++++++++------- SonicDE/sonic-workspace.spec | 39 ++++++++++++++--- SonicDE/sonicde-meta.spec | 2 +- 6 files changed, 120 insertions(+), 37 deletions(-) diff --git a/SonicDE/sonic-desktop-interface.spec b/SonicDE/sonic-desktop-interface.spec index 565b765..6909fb0 100644 --- a/SonicDE/sonic-desktop-interface.spec +++ b/SonicDE/sonic-desktop-interface.spec @@ -94,11 +94,7 @@ for the SonicDE desktop, fork of plasma-desktop. %autosetup -p1 %build -%cmake_kf6 \ -%if 0%{?rhel} >= 10 - -DBUILD_KCM_MOUSE_X11=OFF \ - -DBUILD_KCM_TOUCHPAD_X11=OFF -%endif +%cmake_kf6 %cmake_build diff --git a/SonicDE/sonic-interface-libraries.spec b/SonicDE/sonic-interface-libraries.spec index d31086d..c7efc51 100644 --- a/SonicDE/sonic-interface-libraries.spec +++ b/SonicDE/sonic-interface-libraries.spec @@ -1,3 +1,6 @@ +%define _disable_source_fetch 0 +%define debug_package %{nil} + Name: sonic-interface-libraries Version: 6.4.5 Release: 1%{?dist} @@ -5,7 +8,7 @@ Summary: Foundation of the SonicDE user interface (fork of libplasma) License: LGPL-2.0-or-later URL: https://github.com/Sonic-DE/sonic-interface-libraries -Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildRequires: extra-cmake-modules BuildRequires: gcc-c++ @@ -53,6 +56,16 @@ BuildRequires: cmake(PlasmaActivities) BuildRequires: wayland-devel BuildRequires: kwayland-devel +# X11 Support +BuildRequires: libX11-devel +BuildRequires: libxcb-devel +BuildRequires: xcb-util-devel +BuildRequires: libXcursor-devel +BuildRequires: libXrender-devel +BuildRequires: libXext-devel +BuildRequires: libXfixes-devel +BuildRequires: libXi-devel + Conflicts: libplasma %description @@ -84,16 +97,25 @@ Development files for sonic-interface-libraries. %files -f %{name}.lang %license LICENSES/* -%{_libdir}/libSonicPlasma.so.* -%{_qt6_plugindir}/plasma/ +%{_libdir}/libPlasma.so.* +%{_libdir}/libPlasmaQuick.so.* +%{_qt6_plugindir}/kf6/ %{_qt6_qmldir}/org/kde/plasma/ +%{_qt6_qmldir}/org/kde/kirigami/styles/Plasma/ %{_datadir}/plasma/ -%{_datadir}/qlogging-categories6/ +%{_datadir}/qlogging-categories6/*.categories +%{_datadir}/qlogging-categories6/*.renamecategories %files devel -%{_includedir}/SonicPlasma/ -%{_libdir}/libSonicPlasma.so -%{_libdir}/cmake/SonicPlasma/ +%{_includedir}/Plasma/ +%{_includedir}/PlasmaQuick/ +%{_libdir}/libPlasma.so +%{_libdir}/libPlasmaQuick.so +%{_libdir}/cmake/Plasma/ +%{_libdir}/cmake/PlasmaQuick/ +%{_datadir}/doc/qt6/Plasma.qch +%{_datadir}/doc/qt6/Plasma.tags +%{_datadir}/kdevappwizard/templates/*.tar.bz2 %changelog * Wed Mar 11 2026 Anders Rh - 6.4.5-1 diff --git a/SonicDE/sonic-libworkspace.spec b/SonicDE/sonic-libworkspace.spec index 977a4a4..fe34018 100644 --- a/SonicDE/sonic-libworkspace.spec +++ b/SonicDE/sonic-libworkspace.spec @@ -1,3 +1,6 @@ +%define _disable_source_fetch 0 +%define debug_package %{nil} + Name: sonic-libworkspace Version: 6.4.5 Release: 1%{?dist} @@ -5,7 +8,7 @@ Summary: KWorkspace library for SonicDE License: LGPL-2.0-or-later URL: https://github.com/Sonic-DE/sonic-libworkspace -Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/refs/tags/%{version}.tar.gz BuildRequires: extra-cmake-modules BuildRequires: kf6-rpm-macros @@ -17,6 +20,16 @@ BuildRequires: cmake(KF6I18n) BuildRequires: cmake(KF6WindowSystem) BuildRequires: cmake(KF6KIO) +# X11 Support +BuildRequires: libX11-devel +BuildRequires: libxcb-devel +BuildRequires: libSM-devel +BuildRequires: libICE-devel +BuildRequires: libXext-devel +BuildRequires: libXrender-devel +BuildRequires: libXcursor-devel +BuildRequires: xcb-util-devel + %description Library for common workspace components in SonicDE. diff --git a/SonicDE/sonic-win.spec b/SonicDE/sonic-win.spec index b6ddfc4..46c1348 100644 --- a/SonicDE/sonic-win.spec +++ b/SonicDE/sonic-win.spec @@ -3,9 +3,11 @@ Name: sonic-win Version: 6.4.5 -Release: 1%{?dist} +Release: 3%{?dist} Summary: KWin window manager for SonicDE (fork of kwin) +%global plasma_version %{version} + License: GPL-2.0-or-later URL: https://github.com/Sonic-DE/sonic-win Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -59,7 +61,7 @@ BuildRequires: pkgconfig(libudev) %if 0%{?rhel} == 10 # Integrate with Xlibre on EL10 BuildRequires: xlibre-xserver-devel -Requires: xlibre-xserver +Requires: xlibre-xserver-Xorg Requires: xlibre-xf86-input-libinput %else BuildRequires: pkgconfig(xwayland) @@ -106,8 +108,15 @@ BuildRequires: cmake(PlasmaActivities) BuildRequires: libeis-devel BuildRequires: pkgconfig(libcanberra) -# Conflicts with standard kwin -Conflicts: kwin +# Conflicts with kwin-x11 +Conflicts: kwin-x11 + +Requires: sonic-interface-libraries%{?_isa} >= %{plasma_version} +Requires: kscreenlocker%{?_isa} +Requires: kf6-kirigami2%{?_isa} +Requires: kf6-kdeclarative%{?_isa} +Requires: qt6-qtmultimedia%{?_isa} +Requires: qt6-qtdeclarative%{?_isa} %description Sonic Win is a fork of KWin, the window manager and compositor for SonicDE, @@ -115,7 +124,7 @@ focusing on an optimized X11 experience. %package libs Summary: KWin libraries for SonicDE -Conflicts: kwin-libs +Conflicts: kwin-x11-libs %description libs Shared libraries for sonic-win. @@ -123,7 +132,7 @@ Shared libraries for sonic-win. %package devel Summary: Development files for %{name} Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Conflicts: kwin-devel +Conflicts: kwin-x11-devel %description devel Development files for sonic-win. @@ -137,22 +146,40 @@ Development files for sonic-win. %install %cmake_install -%find_lang %{name} --all-name +# The translation domain in the source is likely still 'kwin' +%find_lang kwin --all-name --with-html -%files -f %{name}.lang +%files -f kwin.lang %license LICENSES/* -%{_bindir}/sonic-win -%{_libdir}/qt6/plugins/org.kde.kwin.* -%{_datadir}/sonic-win/ -%{_datadir}/qlogging-categories6/sonic-win.categories +# Binares and specialized folders +%{_bindir}/kwin_x11 +%{_libdir}/kconf_update_bin/kwin* +%{_libexecdir}/kwin* +%{_userunitdir}/plasma-kwin_x11.service + +# Database and plugins +%{_libdir}/qt6/plugins/ +%{_qt6_qmldir}/org/kde/*/ + +# Data and Assets +%{_datadir}/kwin-x11/ +%{_datadir}/applications/*.desktop +%{_datadir}/dbus-1/interfaces/*.xml +%{_datadir}/icons/hicolor/*/apps/kwin-x11.* +%{_datadir}/kconf_update/kwin-x11.upd +%{_datadir}/knotifications6/kwin-x11.notifyrc +%{_datadir}/knsrcfiles/*.knsrc +%{_datadir}/krunner/dbusplugins/*.desktop +%{_datadir}/qlogging-categories6/*.categories %files libs -%{_libdir}/libSonicWin*.so.* +# Libraries +%{_libdir}/lib*.so.* %files devel -%{_includedir}/SonicWin/ -%{_libdir}/libSonicWin*.so -%{_libdir}/cmake/SonicWin/ +%{_includedir}/ +%{_libdir}/lib*.so +%{_libdir}/cmake/ %changelog * Wed Mar 11 2026 Anders Rh - 6.4.5-1 diff --git a/SonicDE/sonic-workspace.spec b/SonicDE/sonic-workspace.spec index 4ca271c..3969b36 100644 --- a/SonicDE/sonic-workspace.spec +++ b/SonicDE/sonic-workspace.spec @@ -1,3 +1,6 @@ +%define _disable_source_fetch 0 +%define debug_package %{nil} + Name: sonic-workspace Version: 6.4.5 Release: 1%{?dist} @@ -5,7 +8,7 @@ Summary: Core workspace components for SonicDE (fork of plasma-workspace) License: GPL-2.0-or-later URL: https://github.com/Sonic-DE/sonic-workspace -Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildRequires: extra-cmake-modules BuildRequires: kf6-rpm-macros @@ -13,6 +16,9 @@ BuildRequires: qt6-qtbase-devel BuildRequires: qt6-qtdeclarative-devel BuildRequires: qt6-qtsvg-devel BuildRequires: qt6-qtwayland-devel +BuildRequires: qt6-qtlocation-devel +BuildRequires: qt6-qtshadertools-devel +BuildRequires: qcoro-qt6-devel BuildRequires: cmake(Qt6Core5Compat) BuildRequires: cmake(KF6Config) @@ -34,7 +40,11 @@ BuildRequires: cmake(KF6WidgetsAddons) BuildRequires: cmake(KF6WindowSystem) BuildRequires: cmake(KF6XmlGui) BuildRequires: cmake(KF6DocTools) -BuildRequires: cmake(KF6JS) +BuildRequires: cmake(KF6ItemModels) +BuildRequires: cmake(KF6KDED) +BuildRequires: cmake(KF6StatusNotifierItem) +BuildRequires: cmake(KF6UnitConversion) +BuildRequires: cmake(KF6Wallet) BuildRequires: cmake(KF6KCMUtils) BuildRequires: cmake(KF6NewStuff) BuildRequires: cmake(KF6Package) @@ -45,16 +55,30 @@ BuildRequires: cmake(KF6TextEditor) BuildRequires: cmake(KF6TextWidgets) BuildRequires: cmake(KF6Svg) BuildRequires: cmake(KF6Kirigami2) -BuildRequires: knighttime-devel - +BuildRequires: cmake(KF6KirigamiAddons) +BuildRequires: cmake(KF6NetworkManagerQt) +BuildRequires: cmake(KF6QuickCharts) +BuildRequires: cmake(KF6UserFeedback) +BuildRequires: cmake(KF6Baloo) +BuildRequires: cmake(KF6Holidays) +BuildRequires: cmake(KF6KDESu) +BuildRequires: pkgconfig(libqalculate) +BuildRequires: sonic-win-devel BuildRequires: sonic-interface-libraries-devel -BuildRequires: sonic-libworkspace-devel +BuildRequires: kdecoration-devel +BuildRequires: libkscreen-devel +BuildRequires: libksysguard-devel +BuildRequires: plasma-activities-devel BuildRequires: cmake(KSysGuard) BuildRequires: cmake(Plasma5Support) BuildRequires: cmake(KScreenLocker) BuildRequires: cmake(Breeze) BuildRequires: cmake(KExiv2Qt6) BuildRequires: cmake(KPipeWire) +BuildRequires: cmake(PlasmaActivities) +BuildRequires: cmake(PlasmaActivitiesStats) +BuildRequires: cmake(KF6Screen) +BuildRequires: cmake(LayerShellQt) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xau) @@ -67,12 +91,13 @@ BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(xres) +BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(xxf86misc) BuildRequires: pkgconfig(xxf86vm) Requires: sonic-win @@ -81,7 +106,7 @@ Requires: xprop Requires: xrdb Requires: xsetroot -Conflicts: plasma-workspace +Conflicts: plasma-workspace-x11 %description Core workspace components for SonicDE, fork of plasma-workspace. diff --git a/SonicDE/sonicde-meta.spec b/SonicDE/sonicde-meta.spec index 9c23fe3..8e155f1 100644 --- a/SonicDE/sonicde-meta.spec +++ b/SonicDE/sonicde-meta.spec @@ -34,5 +34,5 @@ Desktop Environment (SonicDE) installation, focusing on an optimized X11 experie # No files, just dependencies %changelog -* Wed Mar 11 2026 Anders Rh - 6.6.2-1 +* Wed Mar 11 2026 Anders Rh - 6.4.5-1 - Initial release for SonicDE