diff options
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.patch | 17 |
1 files changed, 7 insertions, 10 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 @@ | |||
1 | From 2b72ad7955fe19abb4a0b4ebb6bc7aa498e454bc Mon Sep 17 00:00:00 2001 | 1 | From 434be8d326adb02b7b0960481f045dc1a443cfce Mon Sep 17 00:00:00 2001 |
2 | From: Raphael Freudiger <laser_b@gmx.ch> | 2 | From: Raphael Freudiger <laser_b@gmx.ch> |
3 | Date: Tue, 10 Jan 2017 15:49:55 +0100 | 3 | Date: Tue, 10 Jan 2017 15:49:55 +0100 |
4 | Subject: [PATCH] fix build without xkbcommon-evdev | 4 | Subject: [PATCH] fix build without xkbcommon-evdev |
@@ -16,17 +16,17 @@ Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> | |||
16 | 3 files changed, 11 insertions(+), 6 deletions(-) | 16 | 3 files changed, 11 insertions(+), 6 deletions(-) |
17 | 17 | ||
18 | diff --git a/src/client/client.pro b/src/client/client.pro | 18 | diff --git a/src/client/client.pro b/src/client/client.pro |
19 | index 7482cfd..cb3578c 100644 | 19 | index eae7ad52..0bb7b188 100644 |
20 | --- a/src/client/client.pro | 20 | --- a/src/client/client.pro |
21 | +++ b/src/client/client.pro | 21 | +++ b/src/client/client.pro |
22 | @@ -120,3 +120,5 @@ MODULE_PLUGIN_TYPES = \ | 22 | @@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \ |
23 | wayland-decoration-client \ | 23 | wayland-decoration-client \ |
24 | wayland-shell-integration | 24 | wayland-shell-integration |
25 | load(qt_module) | 25 | load(qt_module) |
26 | + | 26 | + |
27 | +LIBS += -lxkbcommon | 27 | +LIBS += -lxkbcommon |
28 | diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro | 28 | diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro |
29 | index dc9000d..4eebfd6 100644 | 29 | index dc9000d9..4eebfd64 100644 |
30 | --- a/src/compositor/compositor.pro | 30 | --- a/src/compositor/compositor.pro |
31 | +++ b/src/compositor/compositor.pro | 31 | +++ b/src/compositor/compositor.pro |
32 | @@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) | 32 | @@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) |
@@ -36,10 +36,10 @@ index dc9000d..4eebfd6 100644 | |||
36 | + | 36 | + |
37 | +LIBS += -lxkbcommon | 37 | +LIBS += -lxkbcommon |
38 | diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp | 38 | diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp |
39 | index 55381b4..5c054c6 100644 | 39 | index c30f7b18..e6f1a0b3 100644 |
40 | --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp | 40 | --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp |
41 | +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp | 41 | +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp |
42 | @@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) | 42 | @@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) |
43 | xkb_state = xkb_state_new(keymap); | 43 | xkb_state = xkb_state_new(keymap); |
44 | } | 44 | } |
45 | 45 | ||
@@ -52,7 +52,7 @@ index 55381b4..5c054c6 100644 | |||
52 | 52 | ||
53 | void QWaylandKeyboardPrivate::createXKBKeymap() | 53 | void QWaylandKeyboardPrivate::createXKBKeymap() |
54 | { | 54 | { |
55 | @@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() | 55 | @@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() |
56 | } | 56 | } |
57 | #endif | 57 | #endif |
58 | 58 | ||
@@ -66,6 +66,3 @@ index 55381b4..5c054c6 100644 | |||
66 | void QWaylandKeyboardPrivate::sendRepeatInfo() | 66 | void QWaylandKeyboardPrivate::sendRepeatInfo() |
67 | { | 67 | { |
68 | Q_FOREACH (Resource *resource, resourceMap()) { | 68 | Q_FOREACH (Resource *resource, resourceMap()) { |
69 | -- | ||
70 | 2.9.3 | ||
71 | |||