Plasma 5.20 Beta again - untested and needs a bit of cleanup still

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=536
2020-09-21 06:29:59 +00:00
parent 48d4851cc4
commit 1aaae39720
11 changed files with 113 additions and 183 deletions
--- a/0001-Ignore-default-sddm-face-icons.patch
+++ b/0001-Ignore-default-sddm-face-icons.patch
@@ -8,12 +8,12 @@ They are not compatible with the theme
 lookandfeel/contents/components/UserList.qml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

-diff --git a/lookandfeel/contents/components/UserList.qml b/lookandfeel/contents/components/UserList.qml
-index 62c95c7..c8f88de 100644
--- a/lookandfeel/contents/components/UserList.qml
-+++ b/lookandfeel/contents/components/UserList.qml
-@@ -42,7 +42,13 @@ ListView {
-     preferredHighlightEnd: preferredHighlightBegin
+Index: plasma-workspace-5.15.80git.20200820T102416~bcaf3886d/lookandfeel/contents/components/UserList.qml
+===================================================================
+--- plasma-workspace-5.15.80git.20200820T102416~bcaf3886d.orig/lookandfeel/contents/components/UserList.qml	2020-08-20 18:24:16.000000000 +0200
+++ plasma-workspace-5.15.80git.20200820T102416~bcaf3886d/lookandfeel/contents/components/UserList.qml	2020-08-20 21:38:45.160535922 +0200
+@@ -47,7 +47,13 @@
+     interactive: count > 1
 
     delegate: UserDelegate {
 -        avatarPath: model.icon || ""
@@ -25,8 +25,5 @@ index 62c95c7..c8f88de 100644
 +            return model.icon
 +        }
         iconSource: model.iconName || "user-identity"
+         fontSize: view.fontSize
 
-         name: {
-- 
-2.10.0
-
--- a/0001-Port-applets-to-use-PlasmaExtras.PlaceholderMessage.patch
+++ b/0001-Port-applets-to-use-PlasmaExtras.PlaceholderMessage.patch
@@ -1,44 +0,0 @@
-From 6c58e330bd4693a1f826bf2ef6f6b4fc42328d7a Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 14 Jun 2020 09:08:21 -0600
-Subject: [PATCH] Port applets to use PlasmaExtras.PlaceholderMessage
-
-The Kirigami version uses QQC2 elements which don't respect the plasma
-theme and color scheme, leading to thing slooking out of place
-especially when using a dark color theme or scheme.
-
-Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
---
- applets/clipboard/contents/ui/Menu.qml                          | 2 +-
- .../notifications/package/contents/ui/FullRepresentation.qml    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml
-index 42fd6b61c..9ad21ca3a 100644
--- a/applets/clipboard/contents/ui/Menu.qml
-+++ b/applets/clipboard/contents/ui/Menu.qml
-@@ -55,7 +55,7 @@ PlasmaExtras.ScrollArea {
-             onAction: menu.action(uuid)
-         }
- 
-        Kirigami.PlaceholderMessage {
-+        PlasmaExtras.PlaceholderMessage {
-             id: emptyHint
- 
-             anchors.centerIn: parent
-diff --git a/applets/notifications/package/contents/ui/FullRepresentation.qml b/applets/notifications/package/contents/ui/FullRepresentation.qml
-index b34dee7af..989cb4341 100644
--- a/applets/notifications/package/contents/ui/FullRepresentation.qml
-+++ b/applets/notifications/package/contents/ui/FullRepresentation.qml
-@@ -585,7 +585,7 @@ PlasmaComponents3.Page {
-                     }
-                 }
- 
-                Kirigami.PlaceholderMessage {
-+                PlasmaExtras.PlaceholderMessage {
-                     anchors.centerIn: parent
-                     width: parent.width - (units.largeSpacing * 4)
- 
-- 
-2.25.1
-
--- a/0001-Use-qdbus-qt5.patch
+++ b/0001-Use-qdbus-qt5.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] Use qdbus-qt5
 startkde/startplasma-wayland.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
-index 5b0e0746d..c651ea4fe 100644
--- a/startkde/startplasma-wayland.cpp
-+++ b/startkde/startplasma-wayland.cpp
-@@ -71,7 +71,7 @@ int main(int /*argc*/, char** /*argv*/)
+Index: plasma-workspace-5.15.80git.20200711T203602~d68c16b27/startkde/startplasma-wayland.cpp
+===================================================================
+--- plasma-workspace-5.15.80git.20200711T203602~d68c16b27.orig/startkde/startplasma-wayland.cpp	2020-07-11 22:36:02.000000000 +0200
+++ plasma-workspace-5.15.80git.20200711T203602~d68c16b27/startkde/startplasma-wayland.cpp	2020-07-12 10:44:19.999795526 +0200
+@@ -72,7 +72,7 @@
     runEnvironmentScripts();
 
     if (!qEnvironmentVariableIsSet("DBUS_SESSION_BUS_ADDRESS")) {
--- a/0001-ksmserver-Use-UpdateLaunchEnvJob-to-sync-SESSION_MAN.patch
+++ b/0001-ksmserver-Use-UpdateLaunchEnvJob-to-sync-SESSION_MAN.patch
@@ -1,50 +0,0 @@
-From d24cef54d68fb29994ed610bc70867d6fc811287 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Tue, 1 Sep 2020 13:56:51 +0100
-Subject: [PATCH] [ksmserver] Use UpdateLaunchEnvJob to sync SESSION_MANAGER
- env
-
-ksmserver starts in plasma-session. It currently sets the
-SESSION_MANAGER env back to just kinit and plasma-session which is then
-used for anything else that plasma-session starts.
-
-This is after start-plasma has synced the environment to DBus/systemd.
-
-By using the shared UpdateLaunchEnvJob we can sync all these places.
-
-BUG: 425982
---
- ksmserver/server.cpp | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
-index d7e24a750..29e6b914f 100644
--- a/ksmserver/server.cpp
-+++ b/ksmserver/server.cpp
-@@ -97,6 +97,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #include "kscreenlocker_interface.h"
- #include "kwinsession_interface.h"
- 
-+#include <updatelaunchenvjob.h>
-+
- KSMServer* the_server = nullptr;
- 
- KSMServer* KSMServer::self()
-@@ -661,12 +663,8 @@ KSMServer::KSMServer(InitFlags flags)
-         fclose(f);
-         setenv( "SESSION_MANAGER", session_manager, true  );
- 
-        // Pass env. var to kdeinit.
-        org::kde::KLauncher klauncher( QStringLiteral( "org.kde.klauncher5" ), QStringLiteral( "/KLauncher" ), QDBusConnection::sessionBus());
-        klauncher.setLaunchEnv( QStringLiteral( "SESSION_MANAGER" ), QString::fromLocal8Bit( (const char*) session_manager ) );
-
-        org::kde::Startup startup(QStringLiteral("org.kde.Startup"), QStringLiteral("/Startup"), QDBusConnection::sessionBus());
-        startup.updateLaunchEnv( QStringLiteral( "SESSION_MANAGER" ), QString::fromLocal8Bit( (const char*) session_manager ) );
-+        auto updateEnvJob = new UpdateLaunchEnvJob(QStringLiteral("SESSION_MANAGER"), QString::fromLatin1(session_manager));
-+        updateEnvJob->start();
- 
-         free(session_manager);
-     }
-- 
-2.28.0
-
--- a/0001-sddm-theme-lockscreen-Fix-login-button-size.patch
+++ b/0001-sddm-theme-lockscreen-Fix-login-button-size.patch
@@ -1,45 +0,0 @@
-From 2f9129410401c2d734aff1602b37be70cebbb74b Mon Sep 17 00:00:00 2001
-From: Noah Davis <noahadvs@gmail.com>
-Date: Mon, 14 Sep 2020 10:18:57 -0400
-Subject: [PATCH] [sddm-theme/lockscreen] Fix login button size
-
-Some users reported this button becoming too small after KF5.74 was released, but I could not reproduce it myself. However, this code did look suspicious. Hopefully this fixes the issue.
-
-(cherry picked from commit 9a8fc811282e303ec2f93c978228a85961dae263)
---
- lookandfeel/contents/lockscreen/MainBlock.qml | 3 ++-
- sddm-theme/Login.qml                          | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml
-index 4bd5df0e5..70b43d959 100644
--- a/lookandfeel/contents/lockscreen/MainBlock.qml
-+++ b/lookandfeel/contents/lockscreen/MainBlock.qml
-@@ -97,7 +97,8 @@ SessionManagementScreen {
-         PlasmaComponents.Button {
-             id: loginButton
-             Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Unlock")
-            implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
-+            Layout.preferredHeight: passwordBox.implicitHeight
-+            Layout.preferredWidth: loginButton.Layout.preferredHeight
- 
-             PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
-                     anchors.fill: parent
-diff --git a/sddm-theme/Login.qml b/sddm-theme/Login.qml
-index 49d6805d8..3daaebf57 100644
--- a/sddm-theme/Login.qml
-+++ b/sddm-theme/Login.qml
-@@ -112,8 +112,8 @@ SessionManagementScreen {
-         PlasmaComponents.Button {
-             id: loginButton
-             Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In")
-            implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
-            Layout.rightMargin: 1 // prevents it from extending beyond the username field
-+            Layout.preferredHeight: passwordBox.implicitHeight
-+            Layout.preferredWidth: loginButton.Layout.preferredHeight
- 
-             PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
-                 anchors.fill: parent
-- 
-2.25.1
-
--- a/plasma-workspace-5.19.5.tar.xz
+++ b/plasma-workspace-5.19.5.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:490329e08e63016edd696a9132bf80b76ef51dacf53308b865d2e27b67ce8127
-size 5682264
--- a/plasma-workspace-5.19.5.tar.xz.sig
+++ b/plasma-workspace-5.19.5.tar.xz.sig
@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl9OJTQACgkQ7JTRj38F
-mX4EawgAnn06VlIGA4mx90mJVjtebTfDx/ZYoVs5qvfsJzsu7kNm8IF1oN68qzx2
-TQqEuw1G8k4PY0T3gF3Q1Puir0ks6o8RU3RfUzrtkeJBBVHCWKU6VxJGHfleaSvs
-73WVugcDsxkGrr6q1aodtoXmixlzHcbzqtknxbnanaZ4v0G8jlfiGwF5L3y9ECUv
-mrIizL0+ysgIKY1JdcmIPx/NPvWchzxzSzg6mrylhyAQb9iqdbpkm/xhwYlEcjcm
-hlg9md3ljp9+7koYrd2+CXyPWa8jSM3QRqXfrTUpq4REP97Fpue7CQR2uKqc6Pt0
-DYy0JZJXeYbH1+uPFfAPgbaCiVa7yg==
-=PkzS
-----END PGP SIGNATURE-----
--- a/plasma-workspace-5.19.90.tar.xz
+++ b/plasma-workspace-5.19.90.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8443749557af2f6288a144d3df46d3c0c271e7a9068fc46334faf7c3b6e2ab76
+size 9037212
--- a/plasma-workspace-5.19.90.tar.xz.sig
+++ b/plasma-workspace-5.19.90.tar.xz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAl9jTU0ACgkQEZaMRJKM
+rvw18QgAkrhSilxKqGaXdYmBV8O++4gNy8IstOLz4cBNzqjWE5469mUPgMbV78a9
+wAvl5XhXlV1wEb6o0FpBYYrncQSUA3tWgH/oow1Q1VZ9SDtyyzgiDVveAUlEHuW6
+/Ewg+JeRnvN/33WY6HFwgGuJPbZ0tdZzJrd96iBh71p0aQ58vKwC08rkuWXTPqwP
+GmV/dqvA4Z+SYnE/jDxe3oRfCkoR3AuoGJsKOwGleWZmbsz0QIAI0w2YnGWl1Dhd
+lluOKMDCCgMk74OCemjGrIphL7ojryG7IwxX6p/mDFS2OuK0mhx+iFtQZAtnAjI1
+zIbU2DPfTS9R1CtFwRZ23aD6akK+ZA==
+=y6WV
+-----END PGP SIGNATURE-----
--- a/plasma5-workspace.changes
+++ b/plasma5-workspace.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Sep 17 20:03:11 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.19.90
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/plasma-5.19.90
+- Too many changes to list here
+- Refresh patches:
+  * 0001-Ignore-default-sddm-face-icons.patch
+  * 0001-Use-qdbus-qt5.patch
+- Drop patches, now upstream:
+  * 0001-Port-applets-to-use-PlasmaExtras.PlaceholderMessage.patch
+  * 0001-ksmserver-Use-UpdateLaunchEnvJob-to-sync-SESSION_MAN.patch
+  * 0001-sddm-theme-lockscreen-Fix-login-button-size.patch
+
 -------------------------------------------------------------------
 Wed Sep 16 20:18:17 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>

--- a/plasma5-workspace.spec
+++ b/plasma5-workspace.spec
@@ -27,33 +27,30 @@ Name:           plasma5-workspace
 %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
 # Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
 %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
-Version:        5.19.5
+Version:        5.19.90
 Release:        0
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0-or-later
 Group:          System/GUI/KDE
 URL:            http://www.kde.org/
-Source:         https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
+Source:         plasma-workspace-%{version}.tar.xz
 %if %{with lang}
-Source1:        https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
+Source1:        plasma-workspace-%{version}.tar.xz.sig
 Source2:        plasma.keyring
 %endif
 Source3:        baselibs.conf
 Source4:        plasmafullwayland.desktop
-# PATCH-FIX-UPSTREAM
-Patch1:         0001-Port-applets-to-use-PlasmaExtras.PlaceholderMessage.patch
 # PATCHES 501-??? are PATCH-FIX-OPENSUSE
 Patch501:       0001-Use-qdbus-qt5.patch
 Patch502:       0001-Ignore-default-sddm-face-icons.patch
 Patch503:       0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch
 # PATCH-FEATURE-OPENSUSE
 Patch506:       0001-Revert-No-icons-on-the-desktop-by-default.patch
-# PATCH-FIX-UPSTREAM
-Patch510:       0001-ksmserver-Use-UpdateLaunchEnvJob-to-sync-SESSION_MAN.patch
-Patch511:       0001-sddm-theme-lockscreen-Fix-login-button-size.patch
 BuildRequires:  breeze5-icons
 BuildRequires:  fdupes
 BuildRequires:  kf5-filesystem
+BuildRequires:  libQt5Gui-private-headers-devel
+BuildRequires:  libQt5PlatformHeaders-devel >= 5.4.0
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  cmake(AppStreamQt) >= 0.10.4
@@ -93,25 +90,31 @@ BuildRequires:  cmake(KF5XmlRpcClient)
 BuildRequires:  cmake(KScreenLocker) >= %{_plasma5_version}
 BuildRequires:  cmake(KUserFeedback)
 BuildRequires:  cmake(Phonon4Qt5) >= 4.6.60
+BuildRequires:  cmake(PlasmaWaylandProtocols) >= 1.1.0
 #!BuildIgnore:  kdialog
-BuildRequires:  libQt5PlatformHeaders-devel >= 5.4.0
 BuildRequires:  cmake(KWinDBusInterface) >= %{_plasma5_version}
 BuildRequires:  cmake(Qt5Concurrent) >= 5.4.0
 BuildRequires:  cmake(Qt5DBus) >= 5.4.0
+BuildRequires:  cmake(Qt5Gui) >= 5.4.0
 BuildRequires:  cmake(Qt5Network) >= 5.4.0
 BuildRequires:  cmake(Qt5Qml) >= 5.4.0
 BuildRequires:  cmake(Qt5Quick) >= 5.4.0
 BuildRequires:  cmake(Qt5QuickWidgets) >= 5.4.0
 BuildRequires:  cmake(Qt5Script) >= 5.4.0
 BuildRequires:  cmake(Qt5Sql) >= 5.4.0
+BuildRequires:  cmake(Qt5Svg) >= 5.4.0
 BuildRequires:  cmake(Qt5Test) >= 5.4.0
+BuildRequires:  cmake(Qt5WaylandClient)
 BuildRequires:  cmake(Qt5Widgets) >= 5.4.0
 BuildRequires:  cmake(Qt5X11Extras) >= 5.4.0
 BuildRequires:  cmake(ScreenSaverDBusInterface) >= %{_plasma5_version}
 BuildRequires:  cmake(dbusmenu-qt5)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(libgps)
 BuildRequires:  pkgconfig(libqalculate)
 BuildRequires:  pkgconfig(sm)
+BuildRequires:  pkgconfig(wayland-client) >= 1.15
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb-composite)
@@ -121,6 +124,8 @@ BuildRequires:  pkgconfig(xcb-randr)
 BuildRequires:  pkgconfig(xcb-shm)
 BuildRequires:  pkgconfig(xcb-util)
 BuildRequires:  pkgconfig(xcb-xfixes)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xft)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(zlib)
@@ -340,7 +345,12 @@ Plasma 5 session with Wayland from a display manager.
  touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
  ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop

+# boo#1175025: remove when it is fixed
+%if 0%{?suse_version} >= 1550
+  %fdupes -s %{buildroot}/%{_prefix}
+%else
  %fdupes %{buildroot}/%{_prefix}
+%endif

 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -383,6 +393,8 @@ fi

 %files
 %license COPYING*
+%{_kf5_applicationsdir}/org.kde.kcolorschemeeditor.desktop
+%{_kf5_applicationsdir}/org.kde.kfontview.desktop
 %{_kf5_bindir}/kcminit
 %{_kf5_bindir}/kcminit_startup
 %{_kf5_bindir}/klipper
@@ -397,16 +409,29 @@ fi
 %{_kf5_bindir}/startplasma-wayland
 %{_kf5_bindir}/startplasma-x11
 %{_kf5_bindir}/plasma-shutdown
+%{_kf5_bindir}/kde-systemd-start-condition
+%{_kf5_bindir}/lookandfeeltool
+%{_kf5_bindir}/kcolorschemeeditor
+%{_kf5_bindir}/krdb
 %{_kf5_configdir}/autostart/org.kde.plasmashell.desktop
 %{_kf5_configdir}/autostart/klipper.desktop
+%{_kf5_configkcfgdir}/
+%{_kf5_knsrcfilesdir}/colorschemes.knsrc
+%{_kf5_knsrcfilesdir}/gtk_themes.knsrc
+%{_kf5_knsrcfilesdir}/kfontinst.knsrc
+%{_kf5_knsrcfilesdir}/icons.knsrc
+%{_kf5_knsrcfilesdir}/lookandfeel.knsrc
+%{_kf5_knsrcfilesdir}/plasma-themes.knsrc
 %{_kf5_knsrcfilesdir}/plasmoids.knsrc
 %{_kf5_knsrcfilesdir}/wallpaper.knsrc
 %{_kf5_knsrcfilesdir}/wallpaperplugin.knsrc
+%{_kf5_knsrcfilesdir}/xcursor.knsrc
+
 %config %{_kf5_configdir}/taskmanagerrulesrc
 %config %{_kf5_configdir}/plasmanotifyrc
 %dir %{_kf5_libdir}/libexec
-%{_kf5_libdir}/libexec/ksyncdbusenv
 %{_kf5_libdir}/libexec/ksmserver-logout-greeter
+%{_kf5_libdir}/libexec/plasma-changeicons
 %{_kf5_libdir}/libkdeinit5_kcminit.so
 %{_kf5_libdir}/libkdeinit5_kcminit_startup.so
 %{_kf5_libdir}/libkdeinit5_klipper.so
@@ -415,6 +440,8 @@ fi
 %{_kf5_libdir}/libexec/baloorunner
 %{_kf5_libdir}/libexec/plasma-sourceenv.sh
 %{_kf5_libdir}/libexec/startplasma-waylandsession
+%{_kf5_libdir}/libexec/plasma-dbus-run-session-if-needed
+%{_kf5_libdir}/kconf_update_bin/krdb_clearlibrarypath
 %{_kf5_plugindir}/
 %{_kf5_qmldir}/
 %{_kf5_applicationsdir}/org.kde.klipper.desktop
@@ -422,14 +449,30 @@ fi
 %{_kf5_applicationsdir}/org.kde.systemmonitor.desktop
 %{_kf5_applicationsdir}/plasma-windowed.desktop
 %{_kf5_configkcfgdir}/freespacenotifier.kcfg
+%{_kf5_configkcfgdir}/iconssettingsbase.kcfg
+%{_kf5_configkcfgdir}/feedbacksettings.kcfg
+%dir %{_kf5_sharedir}/krunner/
+%dir %{_kf5_sharedir}/krunner/dbusplugins/
+%{_kf5_sharedir}/kcontrol/
+%{_kf5_sharedir}/kdisplay/
+%{_kf5_sharedir}/kpackage/
+%{_kf5_sharedir}/kfontinst/
+%{_kf5_sharedir}/kxmlgui5/
+%{_kf5_sharedir}/dbus-1/services/org.kde.fontinst.service
+%{_kf5_sharedir}/dbus-1/system-services/org.kde.fontinst.service
 %{_kf5_sharedir}/dbus-1/services/org.kde.LogoutPrompt.service
 %{_kf5_sharedir}/dbus-1/services/org.kde.baloorunner.service
 %{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service
 %{_kf5_sharedir}/dbus-1/services/org.kde.plasma.Notifications.service
 %{_kf5_sharedir}/dbus-1/services/org.kde.KSplash.service
 %{_kf5_sharedir}/dbus-1/services/org.kde.Shutdown.service
+%{_kf5_sharedir}/dbus-1/system.d/org.kde.fontinst.conf
 %{_kf5_sharedir}/desktop-directories/
 %{_kf5_sharedir}/kconf_update/
+%{_kf5_sharedir}/polkit-1/actions/org.kde.fontinst.policy
+%{_kf5_sharedir}/krunner/dbusplugins/plasma-runner-baloosearch.desktop
+%{_kf5_sharedir}/konqsidebartng/
+
 %dir %{_kf5_htmldir}
 %dir %lang(en) %{_kf5_htmldir}/en
 %doc %lang(en) %{_kf5_htmldir}/en/klipper/
@@ -446,6 +489,10 @@ fi
 %{_kf5_sharedir}/solid/
 %{_kf5_sharedir}/kio_desktop/
 %{_kf5_iconsdir}/hicolor/48x48/apps/klipper.svg
+%{_kf5_iconsdir}/hicolor/*/mimetypes/fonts-package.png
+%{_kf5_iconsdir}/hicolor/*/apps/kfontview.png
+%{_kf5_iconsdir}/hicolor/scalable/apps/preferences-desktop-font-installer.svgz
+
 %{_kf5_appstreamdir}/
 %dir %{_kf5_sharedir}/sddm
 %dir %{_kf5_sharedir}/sddm/themes
@@ -455,6 +502,19 @@ fi
 %dir %{_kf5_sharedir}/kpackage/kcms
 %{_kf5_sharedir}/kpackage/kcms/kcm_translations
 %{_kf5_sharedir}/kpackage/kcms/kcm_feedback
+%{_kf5_sharedir}/kpackage/kcms/kcm5_icons
+%{_kf5_sharedir}/kpackage/kcms/kcm_desktoptheme
+%{_kf5_bindir}/kfontinst
+%{_kf5_bindir}/kfontview
+%dir %{_kf5_libdir}/libexec/kauth
+%{_kf5_libdir}/libexec/kauth/fontinst
+%{_kf5_libdir}/libexec/kauth/fontinst_helper
+%{_kf5_libdir}/libexec/kauth/fontinst_x11
+%{_kf5_libdir}/libexec/kfontprint
+%exclude %{_kf5_libdir}/libkfontinst.so
+%{_kf5_libdir}/libkfontinst.so.*
+%exclude %{_kf5_libdir}/libkfontinstui.so
+%{_kf5_libdir}/libkfontinstui.so.*

 %files -n xembedsniproxy
 %license COPYING*
@@ -478,11 +538,7 @@ fi
 %{_kf5_libdir}/cmake/LibKWorkspace/
 %{_kf5_libdir}/cmake/LibTaskManager/
 %{_kf5_libdir}/cmake/LibColorCorrect/
-%dir %{_kf5_libdir}/cmake/LibNotificationManager/
-%{_kf5_libdir}/cmake/LibNotificationManager/LibNotificationManagerConfig.cmake
-%{_kf5_libdir}/cmake/LibNotificationManager/LibNotificationManagerConfigVersion.cmake
-%{_kf5_libdir}/cmake/LibNotificationManager/LibNotificationManagerLibraryTargets-none.cmake
-%{_kf5_libdir}/cmake/LibNotificationManager/LibNotificationManagerLibraryTargets.cmake
+%{_kf5_libdir}/cmake/LibNotificationManager/
 %{_kf5_libdir}/libkworkspace5.so
 %{_kf5_libdir}/libplasma-geolocation-interface.so
 %{_kf5_libdir}/libtaskmanager.so