aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwayland
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-08-19 15:44:17 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-20 19:30:06 +0200
commit2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (patch)
treebdf9c293b998f776a26d6ad2ec273f282333f929 /recipes-qt/qt5/qtwayland
parenta0b2220b5e08a7914d55afec0ff6e2316cb47404 (diff)
qt: refresh remaining patches and add links to meta-qt5 repos
* remove qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch which is already applied and fuzzy patch just apply the same section twice * restore qttools/0001-add-noqtwebkit-configuration.patch which was removed from SRC_URI in 5.9 upgrade * add comment with link to meta-qt5 repository where the meta-qt5 .patch files are maintained, include branch and tag name so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland')
-rw-r--r--recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch17
-rw-r--r--recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch35
2 files changed, 7 insertions, 45 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
index 555bb28f..a86868e9 100644
--- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
+++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
@@ -1,4 +1,4 @@
-From 2b72ad7955fe19abb4a0b4ebb6bc7aa498e454bc Mon Sep 17 00:00:00 2001
+From 434be8d326adb02b7b0960481f045dc1a443cfce Mon Sep 17 00:00:00 2001
From: Raphael Freudiger <laser_b@gmx.ch>
Date: Tue, 10 Jan 2017 15:49:55 +0100
Subject: [PATCH] fix build without xkbcommon-evdev
@@ -16,17 +16,17 @@ Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/client/client.pro b/src/client/client.pro
-index 7482cfd..cb3578c 100644
+index eae7ad52..0bb7b188 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
-@@ -120,3 +120,5 @@ MODULE_PLUGIN_TYPES = \
+@@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \
wayland-decoration-client \
wayland-shell-integration
load(qt_module)
+
+LIBS += -lxkbcommon
diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro
-index dc9000d..4eebfd6 100644
+index dc9000d9..4eebfd64 100644
--- a/src/compositor/compositor.pro
+++ b/src/compositor/compositor.pro
@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri)
@@ -36,10 +36,10 @@ index dc9000d..4eebfd6 100644
+
+LIBS += -lxkbcommon
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
-index 55381b4..5c054c6 100644
+index c30f7b18..e6f1a0b3 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
-@@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap)
+@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap)
xkb_state = xkb_state_new(keymap);
}
@@ -52,7 +52,7 @@ index 55381b4..5c054c6 100644
void QWaylandKeyboardPrivate::createXKBKeymap()
{
-@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap()
+@@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap()
}
#endif
@@ -66,6 +66,3 @@ index 55381b4..5c054c6 100644
void QWaylandKeyboardPrivate::sendRepeatInfo()
{
Q_FOREACH (Resource *resource, resourceMap()) {
---
-2.9.3
-
diff --git a/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch b/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
deleted file mode 100644
index 29c9180c..00000000
--- a/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3d30fd8df9b55449844207295ad3d51cc8bb44b1 Mon Sep 17 00:00:00 2001
-From: Robert Griebl <robert.griebl@pelagicore.com>
-Date: Thu, 15 Dec 2016 17:43:00 +0100
-Subject: [PATCH 2/2] Fix initial window property values being propagated
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was broken since the the shell-surface refactoring.
-
-Change-Id: I130b7396e85c570a9d11d609af6b3016e3f706f0
-Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
-Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
----
- src/client/qwaylandwindow.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index c8be9c1..b6f16f0 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -176,6 +176,9 @@ void QWaylandWindow::initWindow()
- mShellSurface->setAppId(appId);
- }
- }
-+ // the user may have already set some window properties, so make sure to send them out
-+ for (auto it = m_properties.cbegin(); it != m_properties.cend(); ++it)
-+ mShellSurface->sendProperty(it.key(), it.value());
- }
-
- // Enable high-dpi rendering. Scale() returns the screen scale factor and will
---
-2.9.3
-