diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0002-Initial-Wayland-support-II.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0002-Initial-Wayland-support-II.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0003-Initial-Wayland-support-III.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0003-Initial-Wayland-support-III.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0004-Initial-Wayland-support-IV.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0004-Initial-Wayland-support-IV.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0005-Initial-Wayland-support-V.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0005-Initial-Wayland-support-V.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0006-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0006-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0007-Do-check-for-kwin-only-in-case-X11-was-found.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0007-Do-check-for-kwin-only-in-case-X11-was-found.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0008-Stub-down-sessionrunner-in-x11-less-environments.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0008-Stub-down-sessionrunner-in-x11-less-environments.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0014-dataengines-mouse-fix-build-in-X11-less-environments.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0009-dataengines-mouse-fix-build-in-X11-less-environments.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0014-dataengines-mouse-fix-build-in-X11-less-environments.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0009-dataengines-mouse-fix-build-in-X11-less-environments.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0013-fix-missuse-of-HAVE_X11.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0010-fix-missuse-of-HAVE_X11.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0013-fix-missuse-of-HAVE_X11.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0010-fix-missuse-of-HAVE_X11.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0011-fix-build-for-QT_NO_SESSIONMANAGER.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0011-fix-build-for-QT_NO_SESSIONMANAGER.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch deleted file mode 100644 index e2f103e1..00000000 --- a/recipes-kde/plasma/tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 2e42d537e1f783098da35ae2c93bdd6a6c8fe4c8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 16 Dec 2014 23:22:47 +0100 -Subject: [PATCH 11/12] kglobalaccel: add wayland stub -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - kglobalaccel/CMakeLists.txt | 3 ++ - kglobalaccel/kglobalaccel_wayland.cpp | 50 ++++++++++++++++++++++++++++ - kglobalaccel/kglobalaccel_wayland.h | 62 +++++++++++++++++++++++++++++++++++ - 3 files changed, 115 insertions(+) - create mode 100644 kglobalaccel/kglobalaccel_wayland.cpp - create mode 100644 kglobalaccel/kglobalaccel_wayland.h - -diff --git a/kglobalaccel/CMakeLists.txt b/kglobalaccel/CMakeLists.txt -index bdeedaf..5315b2c 100644 ---- a/kglobalaccel/CMakeLists.txt -+++ b/kglobalaccel/CMakeLists.txt -@@ -27,6 +27,9 @@ endif () - if ( Q_WS_QWS ) - set( kglobalaccel_SRCS ${kglobalaccel_SRCS} kglobalaccel_qws.cpp ) - endif () -+if ( KF5Wayland_FOUND ) -+ set( kglobalaccel_SRCS ${kglobalaccel_SRCS} kglobalaccel_wayland.cpp ) -+endif () - - configure_file(config-kglobalaccel.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kglobalaccel.h ) - -diff --git a/kglobalaccel/kglobalaccel_wayland.cpp b/kglobalaccel/kglobalaccel_wayland.cpp -new file mode 100644 -index 0000000..fb95952 ---- /dev/null -+++ b/kglobalaccel/kglobalaccel_wayland.cpp -@@ -0,0 +1,50 @@ -+/* This file is part of the KDE libraries -+ Copyright (C) 2014 Andreas Müller -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public License -+ along with this library; see the file COPYING.LIB. If not, write to -+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. -+*/ -+ -+#include "kglobalaccel_wayland.h" -+ -+#include "globalshortcutsregistry.h" -+#include "kkeyserver.h" -+#include -+ -+#include -+ -+#include -+#include -+ -+ -+KGlobalAccelImpl::KGlobalAccelImpl(GlobalShortcutsRegistry *owner) -+ : QObject(owner) -+{ -+} -+ -+KGlobalAccelImpl::~KGlobalAccelImpl() -+{ -+} -+ -+bool KGlobalAccelImpl::grabKey( int keyQt, bool grab ) -+{ -+ return false; -+} -+ -+void KGlobalAccelImpl::setEnabled( bool enable ) -+{ -+} -+ -+#include "kglobalaccel_wayland.moc" -diff --git a/kglobalaccel/kglobalaccel_wayland.h b/kglobalaccel/kglobalaccel_wayland.h -new file mode 100644 -index 0000000..d686ae3 ---- /dev/null -+++ b/kglobalaccel/kglobalaccel_wayland.h -@@ -0,0 +1,62 @@ -+/* This file is part of the KDE libraries -+ Copyright (C) 2014 Andreas Müller -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public License -+ along with this library; see the file COPYING.LIB. If not, write to -+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. -+*/ -+ -+#ifndef _KGLOBALACCEL_WAYLAND_H -+#define _KGLOBALACCEL_WAYLAND_H -+ -+#include -+ -+class GlobalShortcutsRegistry; -+/** -+ * @internal -+ * -+ * The KGlobalAccel private class handles grabbing of global keys, -+ * and notification of when these keys are pressed. -+ */ -+class KGlobalAccelImpl : public QObject -+{ -+ Q_OBJECT -+ -+public: -+ KGlobalAccelImpl( GlobalShortcutsRegistry *owner); -+ virtual ~KGlobalAccelImpl(); -+ -+public: -+ /** -+ * This function registers or unregisters a certain key for global capture, -+ * depending on \b grab. -+ * -+ * Before destruction, every grabbed key will be released, so this -+ * object does not need to do any tracking. -+ * -+ * \param key the Qt keycode to grab or release. -+ * \param grab true to grab they key, false to release the key. -+ * -+ * \return true if successful, otherwise false. -+ */ -+ bool grabKey(int key, bool grab); -+ -+ /// Enable/disable all shortcuts. There will not be any grabbed shortcuts at this point. -+ void setEnabled(bool); -+ -+private: -+ -+}; -+ -+#endif // _KGLOBALACCEL_WAYLAND_H --- -1.8.3.1 - diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch deleted file mode 100644 index 3af99067..00000000 --- a/recipes-kde/plasma/tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2001810ae3b816e9bf094ab31678d21247ce8045 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 18 Dec 2014 17:21:18 +0100 -Subject: [PATCH 12/12] Make KWayland optional -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d86e815..08bb296 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,7 +70,7 @@ if(X11_FOUND AND XCB_XCB_FOUND) - set(HAVE_X11 1) - endif() - --find_package(KF5Wayland CONFIG REQUIRED COMPONENTS WaylandClient) -+find_package(KF5Wayland CONFIG COMPONENTS WaylandClient) - set_package_properties(KF5Wayland PROPERTIES - TYPE OPTIONAL - PURPOSE "Required for the workspace on Wayland") --- -1.8.3.1 - diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0010-align-phonon-path.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0012-align-phonon-path.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0010-align-phonon-path.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0012-align-phonon-path.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0015-fix-paths-in-startkde.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0013-fix-paths-in-startkde.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0015-fix-paths-in-startkde.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0013-fix-paths-in-startkde.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0016-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0014-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0016-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0014-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0017-startkde-fix-path-for-start_kdeinit_wrapper.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0015-startkde-fix-path-for-start_kdeinit_wrapper.patch similarity index 100% rename from recipes-kde/plasma/tier3/plasma-workspace/files/0017-startkde-fix-path-for-start_kdeinit_wrapper.patch rename to recipes-kde/plasma/tier3/plasma-workspace/files/0015-startkde-fix-path-for-start_kdeinit_wrapper.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb index 7b29b060..af780487 100644 --- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb +++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb @@ -29,8 +29,8 @@ DEPENDS += " \ kcrash \ libksysguard \ libkscreen \ + kwayland \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libsm libxcb kwin", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \ zlib \ " @@ -40,22 +40,24 @@ SRC_URI[sha256sum] = "43eece34f9ca2a15dc01aa4163db7d97aea09daab6b337cf4062ec2a4e SRC_URI += " \ file://0001-Initial-Wayland-support.patch \ - file://0002-Do-check-for-kwin-only-in-case-X11-was-found.patch \ - file://0003-Initial-Wayland-support-II.patch \ - file://0004-Initial-Wayland-support-III.patch \ - file://0005-Initial-Wayland-support-IV.patch \ - file://0006-Initial-Wayland-support-V.patch \ - file://0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch \ - file://0008-fix-build-for-QT_NO_SESSIONMANAGER.patch \ - file://0009-Stub-down-sessionrunner-in-x11-less-environments.patch \ - file://0010-align-phonon-path.patch \ - file://0011-kglobalaccel-add-wayland-stub.patch \ - file://0012-Make-KWayland-optional.patch \ - file://0013-fix-missuse-of-HAVE_X11.patch \ - file://0014-dataengines-mouse-fix-build-in-X11-less-environments.patch \ - file://0015-fix-paths-in-startkde.patch \ - file://0016-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch \ - file://0017-startkde-fix-path-for-start_kdeinit_wrapper.patch \ + file://0002-Initial-Wayland-support-II.patch \ + file://0003-Initial-Wayland-support-III.patch \ + file://0004-Initial-Wayland-support-IV.patch \ + file://0005-Initial-Wayland-support-V.patch \ + \ + file://0006-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch \ + \ + file://0007-Do-check-for-kwin-only-in-case-X11-was-found.patch \ + file://0008-Stub-down-sessionrunner-in-x11-less-environments.patch \ + file://0009-dataengines-mouse-fix-build-in-X11-less-environments.patch \ + file://0010-fix-missuse-of-HAVE_X11.patch \ + \ + file://0011-fix-build-for-QT_NO_SESSIONMANAGER.patch \ + \ + file://0012-align-phonon-path.patch \ + file://0013-fix-paths-in-startkde.patch \ + file://0014-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch \ + file://0015-startkde-fix-path-for-start_kdeinit_wrapper.patch \ " # Notes on patches