zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plasma-workspace: Make kwayland an optional dependency

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2014-12-18 17:27:16 +01:00
parent 6f7a71c123
commit aff73186be
13 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-kde/others-tier3/plasma-workspace/files/0001-Initial-Wayland-support.patch
View File

@@ -1,7 +1,7 @@
From 0d22c828b7d8b73a1030e33af2aef21d033859d3 Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
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.

2
recipes-kde/others-tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch
View File

@@ -1,7 +1,7 @@
From 5133618013e0806e709a123e1f3bc20c8e51afc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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

2
recipes-kde/others-tier3/plasma-workspace/files/0003-Initial-Wayland-support-II.patch
View File

@@ -1,7 +1,7 @@
From d811d01b610432c3ae6480883f01b7367254e2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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

2
recipes-kde/others-tier3/plasma-workspace/files/0004-Initial-Wayland-support-III.patch
View File

@@ -1,7 +1,7 @@
From 69d6878240c2b5aa680efa1cd76d0e18e5c42e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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

2
recipes-kde/others-tier3/plasma-workspace/files/0005-Initial-Wayland-support-IV.patch
View File

@@ -1,7 +1,7 @@
From 7e38e15ce6ed9a1b01feb243abe911287a5b0627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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

2
recipes-kde/others-tier3/plasma-workspace/files/0006-Initial-Wayland-support-V.patch
View File

@@ -1,7 +1,7 @@
From 1c52091870af571e2488f5ae0b94805130f24620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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

2
recipes-kde/others-tier3/plasma-workspace/files/0007-HACK-enable-task_wayland.cpp-stub-for-non-x11-builds.patch
View File

@@ -1,7 +1,7 @@
From 12cf21754b2ea41b13930943d6065a907dbd0a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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

2
recipes-kde/others-tier3/plasma-workspace/files/0008-fix-build-for-QT_NO_SESSIONMANAGER.patch
View File

@@ -1,7 +1,7 @@
From 81fbb6d0d806f7934e24145fcd329a6a67b04952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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

2
recipes-kde/others-tier3/plasma-workspace/files/0009-Stub-down-sessionrunner-in-x11-less-environments.patch
View File

@@ -1,7 +1,7 @@
From 723e5d63a56f83fdc341f8f290df0453d7756ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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

2
recipes-kde/others-tier3/plasma-workspace/files/0010-align-phonon-path.patch
View File

@@ -1,7 +1,7 @@
From 508b26cd817083058aeaadb2d173e93545c5a938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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

2
recipes-kde/others-tier3/plasma-workspace/files/0011-kglobalaccel-add-wayland-stub.patch
View File

@@ -1,7 +1,7 @@
From 2e42d537e1f783098da35ae2c93bdd6a6c8fe4c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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

29
recipes-kde/others-tier3/plasma-workspace/files/0012-Make-KWayland-optional.patch Normal file
View File

@@ -0,0 +1,29 @@
From 2001810ae3b816e9bf094ab31678d21247ce8045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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 <schnitzeltony@googlemail.com>
---
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

1
recipes-kde/others-tier3/plasma-workspace/plasma-workspace_5.1.2.bb
View File

@@ -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