From aff73186bee93c18ec86e2665378283404be6367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 18 Dec 2014 17:27:16 +0100 Subject: [PATCH] plasma-workspace: Make kwayland an optional dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../files/0001-Initial-Wayland-support.patch | 2 +- ...-for-kwin-only-in-case-X11-was-found.patch | 2 +- .../0003-Initial-Wayland-support-II.patch | 2 +- .../0004-Initial-Wayland-support-III.patch | 2 +- .../0005-Initial-Wayland-support-IV.patch | 2 +- .../0006-Initial-Wayland-support-V.patch | 2 +- ..._wayland.cpp-stub-for-non-x11-builds.patch | 2 +- ...8-fix-build-for-QT_NO_SESSIONMANAGER.patch | 2 +- ...ssionrunner-in-x11-less-environments.patch | 2 +- .../files/0010-align-phonon-path.patch | 2 +- .../0011-kglobalaccel-add-wayland-stub.patch | 2 +- .../files/0012-Make-KWayland-optional.patch | 29 +++++++++++++++++++ .../plasma-workspace_5.1.2.bb | 1 + 13 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 recipes-kde/others-tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0001-Initial-Wayland-support.patch b/recipes-kde/others-tier3/plasma-workspace/files/0001-Initial-Wayland-support.patch index a492e3db..7cf418df 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0001-Initial-Wayland-support.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0001-Initial-Wayland-support.patch @@ -1,7 +1,7 @@ From 0d22c828b7d8b73a1030e33af2aef21d033859d3 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sun, 7 Sep 2014 18:01:36 +0200 -Subject: [PATCH 01/11] Initial Wayland support +Subject: [PATCH 01/12] Initial Wayland support Add KF5Wayland check and port a few components. diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch b/recipes-kde/others-tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch index 4316087b..73cbb92d 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch @@ -1,7 +1,7 @@ From 5133618013e0806e709a123e1f3bc20c8e51afc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 11 Dec 2014 13:37:36 +0100 -Subject: [PATCH 02/11] Do check for kwin only in case X11 was found +Subject: [PATCH 02/12] Do check for kwin only in case X11 was found MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch b/recipes-kde/others-tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch index 2e5a4ef3..79ddf684 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch @@ -1,7 +1,7 @@ From d811d01b610432c3ae6480883f01b7367254e2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 11 Dec 2014 13:54:24 +0100 -Subject: [PATCH 03/11] Initial Wayland support II +Subject: [PATCH 03/12] Initial Wayland support II MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch b/recipes-kde/others-tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch index c3c231e2..8602612b 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch @@ -1,7 +1,7 @@ From 69d6878240c2b5aa680efa1cd76d0e18e5c42e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 11 Dec 2014 14:01:47 +0100 -Subject: [PATCH 04/11] Initial Wayland support III +Subject: [PATCH 04/12] Initial Wayland support III MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch b/recipes-kde/others-tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch index 383594d5..1f91a244 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch @@ -1,7 +1,7 @@ From 7e38e15ce6ed9a1b01feb243abe911287a5b0627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 11 Dec 2014 15:33:08 +0100 -Subject: [PATCH 05/11] Initial Wayland support IV +Subject: [PATCH 05/12] Initial Wayland support IV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch b/recipes-kde/others-tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch index 07fd39e1..17bee29b 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch @@ -1,7 +1,7 @@ From 1c52091870af571e2488f5ae0b94805130f24620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 16 Dec 2014 21:02:35 +0100 -Subject: [PATCH 06/11] Initial Wayland support V +Subject: [PATCH 06/12] Initial Wayland support V MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch b/recipes-kde/others-tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch index 962bfa56..3a77f085 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch @@ -1,7 +1,7 @@ From 12cf21754b2ea41b13930943d6065a907dbd0a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 11 Dec 2014 15:15:43 +0100 -Subject: [PATCH 07/11] HACK: enable task_wayland.cpp stub for non x11 builds +Subject: [PATCH 07/12] HACK: enable task_wayland.cpp stub for non x11 builds to make linker happy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch b/recipes-kde/others-tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch index 0ce4f702..df2a5fe1 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch @@ -1,7 +1,7 @@ From 81fbb6d0d806f7934e24145fcd329a6a67b04952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 11 Dec 2014 17:07:06 +0100 -Subject: [PATCH 08/11] fix build for QT_NO_SESSIONMANAGER +Subject: [PATCH 08/12] fix build for QT_NO_SESSIONMANAGER MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch b/recipes-kde/others-tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch index 3e7ffe85..2b3acdb6 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch @@ -1,7 +1,7 @@ From 723e5d63a56f83fdc341f8f290df0453d7756ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 16 Dec 2014 22:18:12 +0100 -Subject: [PATCH 09/11] Stub down sessionrunner in x11-less environments +Subject: [PATCH 09/12] Stub down sessionrunner in x11-less environments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0010-align-phonon-path.patch b/recipes-kde/others-tier3/plasma-workspace/files/0010-align-phonon-path.patch index a580b3c8..89f2de5a 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0010-align-phonon-path.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0010-align-phonon-path.patch @@ -1,7 +1,7 @@ From 508b26cd817083058aeaadb2d173e93545c5a938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 16 Dec 2014 22:40:40 +0100 -Subject: [PATCH 10/11] align phonon path +Subject: [PATCH 10/12] align phonon path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch b/recipes-kde/others-tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch index 8ce7f407..e2f103e1 100644 --- a/recipes-kde/others-tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch +++ b/recipes-kde/others-tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch @@ -1,7 +1,7 @@ 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/11] kglobalaccel: add wayland stub +Subject: [PATCH 11/12] kglobalaccel: add wayland stub MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/recipes-kde/others-tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch b/recipes-kde/others-tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch new file mode 100644 index 00000000..3af99067 --- /dev/null +++ b/recipes-kde/others-tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch @@ -0,0 +1,29 @@ +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/others-tier3/plasma-workspace/plasma-workspace_5.1.2.bb b/recipes-kde/others-tier3/plasma-workspace/plasma-workspace_5.1.2.bb index 0d4e3449..913ae7bc 100644 --- a/recipes-kde/others-tier3/plasma-workspace/plasma-workspace_5.1.2.bb +++ b/recipes-kde/others-tier3/plasma-workspace/plasma-workspace_5.1.2.bb @@ -49,6 +49,7 @@ SRC_URI += " \ 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 \ " # Notes on patches