diff --git a/.gitignore b/.gitignore index 6837a63..1c67163 100644 --- a/.gitignore +++ b/.gitignore @@ -92,4 +92,16 @@ /plasma-desktop-5.24.3.tar.xz /plasma-desktop-5.24.4.tar.xz /plasma-desktop-5.24.5.tar.xz -/plasma-desktop-5.24.6.tar.xz +/plasma-desktop-5.24.90.tar.xz +/plasma-desktop-5.25.0.tar.xz +/plasma-desktop-5.25.1.tar.xz +/plasma-desktop-5.25.2.tar.xz +/plasma-desktop-5.25.3.tar.xz +/plasma-desktop-5.25.4.tar.xz +/plasma-desktop-5.25.5.tar.xz +/plasma-desktop-5.25.90.tar.xz +/plasma-desktop-5.26.0.tar.xz +/plasma-desktop-5.26.1.tar.xz +/plasma-desktop-5.26.2.tar.xz +/plasma-desktop-5.26.3.tar.xz +/plasma-desktop-5.26.4.tar.xz diff --git a/plasma-desktop-5.18.4.1-override-include-dirs.patch b/plasma-desktop-5.18.4.1-override-include-dirs.patch new file mode 100644 index 0000000..3118913 --- /dev/null +++ b/plasma-desktop-5.18.4.1-override-include-dirs.patch @@ -0,0 +1,85 @@ +From b11915786a97f55074b7bfe4eec6f3c5cc08ae78 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 6 Apr 2020 00:41:07 +0200 +Subject: [PATCH 1/2] cmake modules: Allow include dir overrides for various + input drivers + +FindEvdev - evdev-properties.h +FindSynaptics - synaptics-properties.h +FindXorgLibinput - libinput-properties.h + +Hint: Dependency for touchpad (Synaptics): xserver-properties.h (xorg-server) +--- + cmake/modules/FindEvdev.cmake | 4 ++++ + cmake/modules/FindSynaptics.cmake | 4 ++++ + cmake/modules/FindXorgLibinput.cmake | 4 ++++ + 3 files changed, 12 insertions(+) + +diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake +index 153128a90..c19c31a96 100644 +--- a/cmake/modules/FindEvdev.cmake ++++ b/cmake/modules/FindEvdev.cmake +@@ -31,6 +31,8 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + ++if(NOT Evdev_INCLUDE_DIRS) ++ + find_package(PkgConfig) + pkg_check_modules(PC_EVDEV xorg-evdev>=2.8.99.1) + +@@ -39,6 +41,8 @@ find_path(Evdev_INCLUDE_DIRS + HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR} + ) + ++endif() ++ + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS) + +diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake +index fb5f9bc3e..eb56965e0 100644 +--- a/cmake/modules/FindSynaptics.cmake ++++ b/cmake/modules/FindSynaptics.cmake +@@ -31,6 +31,8 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + ++if(NOT Synaptics_INCLUDE_DIRS) ++ + find_package(PkgConfig) + pkg_check_modules(PC_SYNAPTICS xorg-synaptics) + +@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS + HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR} + ) + ++endif() ++ + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Synaptics REQUIRED_VARS Synaptics_INCLUDE_DIRS) + +diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake +index 1550751ae..5b7af5e79 100644 +--- a/cmake/modules/FindXorgLibinput.cmake ++++ b/cmake/modules/FindXorgLibinput.cmake +@@ -31,6 +31,8 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + ++if(NOT XORGLIBINPUT_INCLUDE_DIRS) ++ + find_package(PkgConfig) + pkg_check_modules(PC_XORGLIBINPUT xorg-libinput) + +@@ -39,6 +41,8 @@ find_path(XORGLIBINPUT_INCLUDE_DIRS + HINTS ${PC_XORGLIBINPUT_INCLUDE_DIRS} ${PC_XORGLIBINPUT_INCLUDEDIR} + ) + ++endif() ++ + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS) + +-- +2.26.2 diff --git a/plasma-desktop.spec b/plasma-desktop.spec index ca3c44f..da9d37b 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,4 +1,4 @@ -%global kf5_version_min 5.82 +%global kf5_version_min 5.98 %global synaptics 1 %global scim 1 @@ -9,7 +9,7 @@ Name: plasma-desktop Summary: Plasma Desktop shell -Version: 5.24.6 +Version: 5.26.4 Release: 1%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) @@ -56,10 +56,13 @@ BuildRequires: libxkbcommon-devel BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: qt5-qtbase-devel >= 5.9 +BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qtwayland-devel BuildRequires: phonon-qt5-devel +BuildRequires: wayland-protocols-devel BuildRequires: ibus-devel %if 0%{?scim} @@ -273,6 +276,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.knetattach.d %{_kf5_qmldir}/org/kde/plasma/private # TODO: -libs subpkg -- rex %{_kf5_qtplugindir}/*.so +%{_kf5_qtplugindir}/plasma/kcms/desktop/kcm_krunnersettings.so %{_kf5_qtplugindir}/plasma/kcms/systemsettings/*.so %{_kf5_qtplugindir}/plasma/kcms/systemsettings_qwidgets/*.so %{_kf5_plugindir}/kded/*.so @@ -301,6 +305,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.knetattach.d %{_kf5_datadir}/kpackage/kcms/* %{_kf5_datadir}/knsrcfiles/ %{_kf5_datadir}/kf5/kactivitymanagerd/workspace/ +%{_kf5_datadir}/kf5/kcm_recentFiles/workspace/settings/qml/recentFiles/BlacklistApplicationView.qml %{_kf5_datadir}/kcmsolidactions/ %{_kf5_datadir}/solid/devices/*.desktop %{_kf5_datadir}/dbus-1/system.d/*.conf @@ -326,8 +331,47 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.knetattach.d %changelog -* Wed Jul 13 2022 Troy Dawson - 5.24.6-1 -- Update to 5.24.6 +* Tue Nov 29 2022 Marc Deop - 5.26.4-1 +- 5.26.4 + +* Wed Nov 09 2022 Marc Deop - 5.26.3-1 +- 5.26.3 + +* Wed Oct 26 2022 Marc Deop - 5.26.2-1 +- 5.26.2 + +* Tue Oct 18 2022 Marc Deop - 5.26.1-1 +- 5.26.1 + +* Thu Oct 06 2022 Marc Deop - 5.26.0-1 +- 5.26.0 + +* Sat Sep 17 2022 Marc Deop - 5.25.90-1 +- 5.25.90 + +* Wed Sep 07 2022 Marc Deop - 5.25.5-1 +- 5.25.5 + +* Wed Aug 03 2022 Justin Zobel - 5.25.4-1 +- Update to 5.25.4 + +* Fri Jul 22 2022 Fedora Release Engineering - 5.25.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 12 2022 Marc Deop - 5.25.3-1 +- 5.25.3 + +* Tue Jun 28 2022 Marc Deop - 5.25.2-1 +- 5.25.2 + +* Tue Jun 21 2022 Marc Deop - 5.25.1-1 +- 5.25.1 + +* Thu Jun 09 2022 Marc Deop - 5.25.0-1 +- 5.25.0 + +* Fri May 20 2022 Marc Deop - 5.24.90-1 +- 5.24.90 * Tue May 03 2022 Marc Deop - 5.24.5-1 - 5.24.5 diff --git a/sources b/sources index 8c5187c..4964bf8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plasma-desktop-5.24.6.tar.xz) = 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023 +SHA512 (plasma-desktop-5.26.4.tar.xz) = 69c41879858bc60eff38c61e1d68d9b8ddfb9c83b28097b2052b43be3b16fb40f906d551667d1cdc7699496aab1f78ea2f7e51d4702c520ba125859fbdae126c