From 13de43550479ca56f6e680369c32df8344524152 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 12 Mar 2018 14:43:43 +0200 Subject: qtwayland: remove obsolete patch Task-number: QTBUG-66307 Change-Id: I55922b5384b25038c453bbb2365e71f0a23f4040 Reviewed-by: Samuli Piippo --- .../0001-fix-build-without-xkbcommon-evdev.patch | 68 ---------------------- recipes-qt/qt5/qtwayland_git.bb | 7 --- 2 files changed, 75 deletions(-) delete mode 100644 recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch 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 deleted file mode 100644 index f6963d33..00000000 --- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 477e20becc2253629734ef51e5471500eb55635d Mon Sep 17 00:00:00 2001 -From: Raphael Freudiger -Date: Tue, 10 Jan 2017 15:49:55 +0100 -Subject: [PATCH] fix build without xkbcommon-evdev -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I4f52c4ad741fdd7063a18b67f5777b52f03726fe -Signed-off-by: Raphael Freudiger -Signed-off-by: Gordan Markuš ---- - src/client/client.pro | 2 ++ - src/compositor/compositor.pro | 2 ++ - src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------ - 3 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/client/client.pro b/src/client/client.pro -index eae7ad5..0bb7b18 100644 ---- a/src/client/client.pro -+++ b/src/client/client.pro -@@ -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 ---- a/src/compositor/compositor.pro -+++ b/src/compositor/compositor.pro -@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) - MODULE_PLUGIN_TYPES = \ - wayland-graphics-integration-server - load(qt_module) -+ -+LIBS += -lxkbcommon -diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp -index c30f7b1..e6f1a0b 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) - xkb_state = xkb_state_new(keymap); - } - --uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) --{ -- const uint offset = 8; -- Q_ASSERT(nativeScanCode >= offset); -- return nativeScanCode - offset; --} - - void QWaylandKeyboardPrivate::createXKBKeymap() - { -@@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() - } - #endif - -+uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) -+{ -+ const uint offset = 8; -+ Q_ASSERT(nativeScanCode >= offset); -+ return nativeScanCode - offset; -+} -+ - void QWaylandKeyboardPrivate::sendRepeatInfo() - { - Q_FOREACH (Resource *resource, resourceMap()) { diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 543aef56..546d8af4 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -39,13 +39,6 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" SRCREV = "7ce033cbf9a80d2ea5d687956da668cf4567d361" -# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.10 -# 5.10.meta-qt5.1 -# From https://bugreports.qt.io/browse/QTBUG-57767 -SRC_URI += " \ - file://0001-fix-build-without-xkbcommon-evdev.patch \ -" - BBCLASSEXTEND =+ "native nativesdk" # The same issue as in qtbase: -- cgit v1.2.3-54-g00ecf