aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-14 07:49:03 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-16 09:45:29 +0000
commit682ad61c071a9710e9f9d8a32ab1b5f3c14953d1 (patch)
tree3a0188611c3938ef559efa2b353ceae5e51eb70a /recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
parentfe6dbe144acbcbcbe37f5e9a07a08e414dbce036 (diff)
qt: upgrade to 5.9.6
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch')
-rw-r--r--recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch8
1 files changed, 4 insertions, 4 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 b2ff754c..13f0ce86 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 c9c02d1a7d48f97bcbf85dca884e65b6ed3ec7c1 Mon Sep 17 00:00:00 2001
+From 237d370278dd68fbb16308e2fad044cbcba9797a 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,7 +16,7 @@ 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 eae7ad5..0bb7b18 100644
+index eae7ad52..0bb7b188 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
@@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \
@@ -26,7 +26,7 @@ index eae7ad5..0bb7b18 100644
+
+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,7 +36,7 @@ index dc9000d..4eebfd6 100644
+
+LIBS += -lxkbcommon
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
-index c30f7b1..e6f1a0b 100644
+index c30f7b18..e6f1a0b3 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap)