[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-vault/files/, ...

[Andreas Sturmlechner]

commit:     65f310c7af19d6dcea8faef2a18af137f533653a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 12:52:31 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 12:52:31 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=65f310c7

kde-plasma: Cleanup obsolete patches and metadata

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ....19.2-use-PlasmaExtras.PlaceholderMessage.patch |  57 -----------
 .../files/libksysguard-5.18.90-unused-dep.patch    |  92 -----------------
 .../files/libkworkspace-5.18.80-standalone.patch   | 113 ---------------------
 ...lasma-nm-5.19.2-fix-inline-password-field.patch |  30 ------
 ....19.2-use-PlasmaExtras.PlaceholderMessage.patch |  57 -----------
 ....19.2-use-PlasmaExtras.PlaceholderMessage.patch |  44 --------
 kde-plasma/plasma-workspace/metadata.xml           |   1 -
 .../files/powerdevil-5.19.4-ddcutil-0.9.9.patch    |  24 -----
 kde-plasma/xdg-desktop-portal-kde/metadata.xml     |   3 -
 9 files changed, 421 deletions(-)

diff --git a/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
deleted file mode 100644
index 3c41eb2c69..0000000000
--- a/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 161c1b92bced7996e92026ff9ae503593f6590f6 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@×××.org>
-Date: Sun, 14 Jun 2020 09:10:38 -0600
-Subject: [PATCH] Port applet 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
----
- CMakeLists.txt                                        | 6 ------
- src/applet/package/contents/ui/FullRepresentation.qml | 4 +---
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9067851..5ddce978 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,12 +33,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
- find_package(KDED ${KF5_MIN_VERSION} REQUIRED)
- find_package(SharedMimeInfo REQUIRED)
- 
--find_package(KF5Kirigami2 ${KF5_MIN_VERSION} CONFIG)
--set_package_properties(KF5Kirigami2 PROPERTIES
--    DESCRIPTION "A QtQuick based components set"
--    TYPE RUNTIME
--)
--
- include(KDEInstallDirs)
- include(KDECMakeSettings)
- include(KDECompilerSettings NO_POLICY_SCOPE)
-diff --git a/src/applet/package/contents/ui/FullRepresentation.qml b/src/applet/package/contents/ui/FullRepresentation.qml
-index 5bd32f15..e77bf295 100644
---- a/src/applet/package/contents/ui/FullRepresentation.qml
-+++ b/src/applet/package/contents/ui/FullRepresentation.qml
-@@ -27,8 +27,6 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.plasma.components 3.0 as PlasmaComponents3
- import org.kde.plasma.private.bluetooth 1.0 as PlasmaBt
- 
--import org.kde.kirigami 2.12 as Kirigami
--
- PlasmaComponents3.Page {
- 
-     Action {
-@@ -99,7 +97,7 @@ PlasmaComponents3.Page {
-         // Not inside the ListView because we want the listview to be hidden
-         // when Bluetooth is disabled, yet still show an "Enable Bluetooth"
-         // message
--        Kirigami.PlaceholderMessage {
-+        PlasmaExtras.PlaceholderMessage {
-             anchors.centerIn: parent
-             anchors.left: parent.left
-             anchors.right: parent.right
--- 
-2.27.0
-

diff --git a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch b/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch
deleted file mode 100644
index 903b7b8bcf..0000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From fa06754147850ba06659f21e57cd7a724ecf8c49 Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <martin.sandsmark@×××.org>
-Date: Sat, 23 May 2020 18:26:12 +0200
-Subject: [PATCH] remove unnecessary dependency
-
----
- CMakeLists.txt                   | 13 +------------
- signalplotter/CMakeLists.txt     |  1 -
- signalplotter/ksignalplotter.cpp |  2 +-
- signalplotter/ksignalplotter_p.h |  2 ++
- 4 files changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b12ead7..063cb05 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,14 +46,6 @@ set_package_properties(Qt5WebChannel PROPERTIES
- 
- find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n JobWidgets WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service GlobalAccel KIO Package Declarative NewStuff)
- 
--find_package(KF5 OPTIONAL_COMPONENTS Plasma)
--set_package_properties(KF5Plasma PROPERTIES
--                       URL "https://cgit.kde.org/plasma-framework.git/"
--                       DESCRIPTION "The library of the plasma project"
--                       TYPE OPTIONAL
--                       PURPOSE "Used by signalplotter to use Plasma themes"
--                      )
--
- find_package(ZLIB REQUIRED)
- set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams"
-                        URL "http://www.zlib.net"
-@@ -113,10 +105,7 @@ add_subdirectory( processcore )
- add_subdirectory( processui )
- add_subdirectory( sensors )
- add_subdirectory( faces )
--
--if (KF5Plasma_FOUND)
--    add_subdirectory( signalplotter )
--endif()
-+add_subdirectory( signalplotter )
- add_subdirectory( ksgrd )
- 
- if(BUILD_TESTING)
-diff --git a/signalplotter/CMakeLists.txt b/signalplotter/CMakeLists.txt
-index fd11f01..231fcf7 100644
---- a/signalplotter/CMakeLists.txt
-+++ b/signalplotter/CMakeLists.txt
-@@ -16,7 +16,6 @@ target_link_libraries(ksignalplotter
-         KF5::IconThemes
-     PRIVATE
-         KSysGuard::ProcessCore
--        KF5::Plasma
- )
- 
- set_target_properties(ksignalplotter
-diff --git a/signalplotter/ksignalplotter.cpp b/signalplotter/ksignalplotter.cpp
-index 4e6c278..df7c705 100644
---- a/signalplotter/ksignalplotter.cpp
-+++ b/signalplotter/ksignalplotter.cpp
-@@ -42,7 +42,6 @@
- #ifdef GRAPHICS_SIGNAL_PLOTTER
- #include <QGraphicsSceneResizeEvent>
- #include <QStyleOptionGraphicsItem>
--#include <Plasma/Theme>
- #endif
- 
- #include <klocalizedstring.h>
-@@ -52,6 +51,7 @@
- 
- #ifdef SVG_SUPPORT
- #include <Plasma/Svg>
-+#include <Plasma/Theme>
- #endif
- 
- 
-diff --git a/signalplotter/ksignalplotter_p.h b/signalplotter/ksignalplotter_p.h
-index 81912f5..082f97c 100644
---- a/signalplotter/ksignalplotter_p.h
-+++ b/signalplotter/ksignalplotter_p.h
-@@ -24,7 +24,9 @@
- //#define USE_QIMAGE
- 
- // SVG support causes it to crash at the moment :(
-+// (when re-enabling this remember to also link against plasma-framework)
- //#define SVG_SUPPORT
-+
- // Use a separate child widget to draw the graph in
- #ifndef KSYSGUARD_KSIGNALPLOTTER_P_H
- #define KSYSGUARD_KSIGNALPLOTTER_P_H
--- 
-2.26.2
-

diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
deleted file mode 100644
index 8f0523ab8e..0000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 85564b5264546866be56b9bc546689fbab20506d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@g.o>
-Date: Fri, 13 Mar 2020 00:14:31 +0100
-Subject: [PATCH] libkworkspace: Allow standalone build
-
----
- CMakeLists.txt | 71 ++++++++++++++++++++++++++++++++++--
- 1 file changed, 67 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 85cbb5e6c..de17e9287 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,56 @@
-+project(libkworkspace)
-+
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+    set(PROJECT_VERSION "GENTOO_PV")
-+    set(PROJECT_VERSION_MAJOR 5)
-+
-+    cmake_minimum_required(VERSION 3.0)
-+
-+    set(QT_MIN_VERSION "5.12.0")
-+    set(KF5_MIN_VERSION "5.58.0")
-+    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
-+    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
-+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-+
-+    include(KDEInstallDirs)
-+    include(KDECMakeSettings)
-+    include(KDECompilerSettings NO_POLICY_SCOPE)
-+    include(ECMMarkNonGuiExecutable)
-+    include(CMakePackageConfigHelpers)
-+    include(WriteBasicConfigVersionFile)
-+    include(CheckIncludeFiles)
-+    include(FeatureSummary)
-+    include(ECMQtDeclareLoggingCategory)
-+    include(KDEPackageAppTemplates)
-+    include(ECMMarkAsTest)
-+    include(GenerateExportHeader)
-+
-+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Init Plasma WindowSystem)
-+
-+    find_package(KWinDBusInterface CONFIG REQUIRED)
-+    find_package(KScreenLocker 5.13.80 REQUIRED)
-+    find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
-+
-+    find_package(X11)
-+    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+                URL "http://www.x.org"
-+                TYPE OPTIONAL
-+                PURPOSE "Required for X11 support")
-+
-+    if(X11_FOUND)
-+        find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
-+        set(HAVE_X11 1)
-+    endif()
-+
-+    if(BUILD_TESTING)
-+        find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+    endif()
-+
-+    check_include_files(unistd.h HAVE_UNISTD_H)
-+
-+    configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
-+    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
-+endif()
- 
- set(kworkspace_LIB_SRCS kdisplaymanager.cpp
-                         kworkspace.cpp
-@@ -16,9 +69,18 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface)
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
-+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
-+else()
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
-+set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
-+set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
-+endif()
- 
- set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
-                             "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
-@@ -34,11 +96,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
- 
--set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
--
--set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
--
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
- 
- 
-@@ -105,3 +163,8 @@ if(BUILD_TESTING)
-     add_subdirectory(autotests)
-     add_subdirectory(tests)
- endif()
-+
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-+    install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
-+    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+endif()
--- 
-2.25.1
-

diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch
deleted file mode 100644
index 170e20ea22..0000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 271332cfc19ede398854113d037abfb35503179f Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@×××.org>
-Date: Thu, 18 Jun 2020 15:34:40 +0000
-Subject: [PATCH] [WIP] [applet] Fix inline password field component not
- working properly
-
-BUG: 423093
-FIXED-IN: 5.20
----
- applet/contents/ui/ConnectionItem.qml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/applet/contents/ui/ConnectionItem.qml b/applet/contents/ui/ConnectionItem.qml
-index 98240928..06c7ab25 100644
---- a/applet/contents/ui/ConnectionItem.qml
-+++ b/applet/contents/ui/ConnectionItem.qml
-@@ -231,8 +231,8 @@ PlasmaExtras.ExpandableListItem {
-                 if (!predictableWirelessPassword && !Uuid) {
-                     handler.addAndActivateConnection(DevicePath, SpecificPath)
-                 } else if (connectionItem.customExpandedViewContent == passwordDialogComponent) {
--                    if (passwordDialogComponent.password != "") {
--                        handler.addAndActivateConnection(DevicePath, SpecificPath, passwordDialogComponent.password)
-+                    if (connectionItem.customExpandedViewContentItem.password != "") {
-+                        handler.addAndActivateConnection(DevicePath, SpecificPath, connectionItem.customExpandedViewContentItem.password)
-                         connectionItem.customExpandedViewContent = detailsComponent
-                         connectionItem.collapse()
-                     } else {
--- 
-2.27.0
-

diff --git a/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
deleted file mode 100644
index 9e5785d9d5..0000000000
--- a/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f8f7179824f5540ee64900d20af39dfc9bacd490 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@×××.org>
-Date: Sun, 14 Jun 2020 09:09:48 -0600
-Subject: [PATCH] Port applet 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
----
- CMakeLists.txt                      | 6 ------
- plasma/package/contents/ui/main.qml | 4 +---
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e7aa0df..bc7c260 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,12 +66,6 @@ if (KF5NetworkManagerQt_FOUND)
- endif()
- find_package (KSysGuard REQUIRED)
- 
--find_package(KF5Kirigami2 ${KF5_DEP_VERSION} CONFIG)
--set_package_properties(KF5Kirigami2 PROPERTIES
--    DESCRIPTION "A QtQuick based components set"
--    TYPE RUNTIME
--)
--
- include_directories (
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/common
-diff --git a/plasma/package/contents/ui/main.qml b/plasma/package/contents/ui/main.qml
-index 22c7428..bfac7a9 100644
---- a/plasma/package/contents/ui/main.qml
-+++ b/plasma/package/contents/ui/main.qml
-@@ -26,8 +26,6 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.plasma.extras 2.0 as PlasmaExtras
- 
--import org.kde.kirigami 2.12 as Kirigami
--
- Item {
-     property var vaultsModel: plasmoid.nativeInterface.vaultsModel
-     property var vaultsModelActions: plasmoid.nativeInterface.vaultsModel.actionsModel()
-@@ -77,7 +75,7 @@ Item {
- 
-             interactive: false
- 
--            Kirigami.PlaceholderMessage {
-+            PlasmaExtras.PlaceholderMessage {
-                 id: noVaultsMessage
- 
-                 anchors.centerIn: parent
--- 
-2.27.0
-

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
deleted file mode 100644
index 527e199cc6..0000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From faef126255222f727219bf69ac2b89857dc61ab2 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@×××.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 0bd6064a5..cac8380db 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.27.0
-

diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 8339214de8..26cbff4eeb 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="appstream">Enable AppStream software metadata support</flag>
 		<flag name="geolocation">Enables dataengine providing location information</flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
-		<flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag>
 		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch b/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
deleted file mode 100644
index 3a1c4c3815..0000000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fcb26be2fb279e6ad3b7b814d26a5921d16201eb Mon Sep 17 00:00:00 2001
-From: Johannes Jordan <kde@××××××××.de>
-Date: Mon, 29 Jun 2020 10:51:40 +0000
-Subject: [PATCH] Fix compilation with ddcutil 0.9.9
-
----
- daemon/backends/upower/ddcutilbrightness.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/daemon/backends/upower/ddcutilbrightness.cpp b/daemon/backends/upower/ddcutilbrightness.cpp
-index e712c05a..a75aac5c 100644
---- a/daemon/backends/upower/ddcutilbrightness.cpp
-+++ b/daemon/backends/upower/ddcutilbrightness.cpp
-@@ -56,7 +56,6 @@ void DDCutilBrightness::detect()
-         
-         DDCA_Feature_List vcpList;
-         ddca_get_feature_list_by_dref(DDCA_SUBSET_COLOR, dh, false, &vcpList);
--        qCDebug(POWERDEVIL) << "ddca_feature_list: "<< ddca_feature_list_string(&vcpList, "0x", ",");
-         QVector<uint16_t> tmpVcpList;
-         for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) {
-             DDCA_Non_Table_Vcp_Value returnValue;
--- 
-GitLab
-

diff --git a/kde-plasma/xdg-desktop-portal-kde/metadata.xml b/kde-plasma/xdg-desktop-portal-kde/metadata.xml
index bcfc8e0c39..2fdbf33d96 100644
--- a/kde-plasma/xdg-desktop-portal-kde/metadata.xml
+++ b/kde-plasma/xdg-desktop-portal-kde/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@g.o</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
-	</use>
 </pkgmetadata>