11 files changed, 68 insertions, 72 deletions
diff --git a/source/kde/kde/build/oxygen-sounds b/source/kde/kde/build/oxygen-sounds
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/source/kde/kde/build/oxygen-sounds
@@ -0,0 +1 @@
+1
diff --git a/source/kde/kde/build/plasma-framework b/source/kde/kde/build/plasma-framework
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/plasma-framework
+++ b/source/kde/kde/build/plasma-framework
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace
index 00750edc0..d00491fd7 100644
--- a/source/kde/kde/build/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
@@ -1 +1 @@
-3
+1
diff --git a/source/kde/kde/modules/plasma b/source/kde/kde/modules/plasma
index 872f6ea9b..3bd09ed7f 100644
--- a/source/kde/kde/modules/plasma
+++ b/source/kde/kde/modules/plasma
@@ -6,7 +6,8 @@ breeze-gtk
 breeze-grub
 #breeze-plymouth
 kwayland-integration
-kwayland-server
+# obsolete, removed:
+#kwayland-server
 plasma-integration
 kinfocenter
 libksysguard
@@ -18,6 +19,7 @@ kwrited
 libkscreen
 milou
 oxygen
+oxygen-sounds
 plasma-workspace
 kde-cli-tools
 # Circular dependency between plasma-workspace and kde-cli-tools:
diff --git a/source/kde/kde/patch/kwin.patch b/source/kde/kde/patch/kwin.patch
deleted file mode 100644
index 829028e5b..000000000
--- a/source/kde/kde/patch/kwin.patch
+++ /dev/null
@@ -1 +0,0 @@
-cat $CWD/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch b/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch
deleted file mode 100644
index 7968887a6..000000000
--- a/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 76abce728d3abb94c71076e6211a0da655397b0f Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Tue, 12 Nov 2019 13:18:26 +0100
-Subject: [PATCH] Bypass wayland interface blacklisting
-
-Currently the check isn't worth anything and it breaks some applications.
-See discussion on https://phabricator.kde.org/D22571 and https://phabricator.kde.org/T4437#207062.
----
- src/wayland_server.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
-index e93d51911..95f3a746a 100644
---- a/src/wayland_server.cpp
-+++ b/src/wayland_server.cpp
-@@ -130,6 +130,7 @@ public:
-     QSet<QString> m_reported;
- 
-     bool allowInterface(KWaylandServer::ClientConnection *client, const QByteArray &interfaceName) override {
-+        return true;
-         if (client->processId() == getpid()) {
-             return true;
-         }
--- 
-2.25.1
-
diff --git a/source/kde/kde/patch/plasma-framework.patch b/source/kde/kde/patch/plasma-framework.patch
new file mode 100644
index 000000000..23919a6e5
--- /dev/null
+++ b/source/kde/kde/patch/plasma-framework.patch
@@ -0,0 +1 @@
+cat $CWD/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch b/source/kde/kde/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch
new file mode 100644
index 000000000..300612763
--- /dev/null
+++ b/source/kde/kde/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch
@@ -0,0 +1,42 @@
+From dff1b034c1162062aa2292099d3d01fc53dafdf6 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Tue, 14 Jun 2022 14:05:32 +0200
+Subject: [PATCH] Revert "Use QT_FEATURE_foo to detect opengl* support, and
+ TARGET for glesv2"
+
+This reverts commit 31884dc195c815054bfa6b15a90753d2d0ae1ea9.
+---
+ CMakeLists.txt                             | 3 ++-
+ src/declarativeimports/core/CMakeLists.txt | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6698a2091..63229cdfb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -118,7 +118,8 @@ set_package_properties(EGL PROPERTIES
+                        TYPE OPTIONAL
+                       )
+ 
+-if(OpenGL_GLX_FOUND AND X11_FOUND AND QT_FEATURE_opengl)
++get_target_property(QtGui_Enabled_Features Qt${QT_MAJOR_VERSION}::Gui QT_ENABLED_PUBLIC_FEATURES)
++if(OpenGL_GLX_FOUND AND X11_FOUND AND (QtGui_Enabled_Features MATCHES "opengl"))
+     add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.")
+     set(HAVE_GLX 1)
+ else()
+diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt
+index d08b4c619..2136bb985 100644
+--- a/src/declarativeimports/core/CMakeLists.txt
++++ b/src/declarativeimports/core/CMakeLists.txt
+@@ -70,7 +70,7 @@ else()
+ 
+ endif()
+ 
+-if(TARGET Qt${QT_MAJOR_VERSION}::Gui_GLESv2)
++if(QtGui_Enabled_Features MATCHES "opengles2")
+     target_link_libraries(corebindingsplugin Qt${QT_MAJOR_VERSION}::Gui_GLESv2)
+ endif()
+ 
+-- 
+GitLab
+
diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch
index 1c69240c6..77645b0cb 100644
--- a/source/kde/kde/patch/plasma-workspace.patch
+++ b/source/kde/kde/patch/plasma-workspace.patch
@@ -1,2 +1 @@
 cat $CWD/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-cat $CWD/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch b/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch
deleted file mode 100644
index 352bed917..000000000
--- a/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Mon, 16 May 2022 16:18:00 +0800
-Subject: [PATCH] kcms/desktoptheme: find metadata.json when loading
- ThemesModel
-
-Before this commit ThemesModel only finds metadata.desktop, but after
-KF5.94, the default theme metadata files have been ported to json format.
-
-BUG: 453830
-
-
-(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e)
----
- kcms/desktoptheme/themesmodel.cpp | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp
-index 6f0ecf4e3..296951742 100644
---- a/kcms/desktoptheme/themesmodel.cpp
-+++ b/kcms/desktoptheme/themesmodel.cpp
-@@ -155,7 +155,15 @@ void ThemesModel::load()
-         const QDir cd(ppath);
-         const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot);
-         for (const QString &pack : entries) {
--            const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop");
-+            const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator());
-+
-+            QString _metadata = QStringLiteral("%1json").arg(prefix);
-+            if (QFile::exists(_metadata)) {
-+                themes << _metadata;
-+                continue;
-+            }
-+
-+            _metadata = QStringLiteral("%1desktop").arg(prefix);
-             if (QFile::exists(_metadata)) {
-                 themes << _metadata;
-             }
--- 
-GitLab
-
diff --git a/source/kde/kde/slack-desc/oxygen-sounds b/source/kde/kde/slack-desc/oxygen-sounds
new file mode 100644
index 000000000..c8bf62ac8
--- /dev/null
+++ b/source/kde/kde/slack-desc/oxygen-sounds
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+oxygen-sounds: oxygen-sounds (KDE Oxygen sound pack)
+oxygen-sounds:
+oxygen-sounds: This package contains the KDE Oxygen sound pack.
+oxygen-sounds:
+oxygen-sounds:
+oxygen-sounds:
+oxygen-sounds:
+oxygen-sounds:
+oxygen-sounds:
+oxygen-sounds:
+oxygen-sounds: