diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-01-18 13:30:22 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2023-01-18 13:30:25 +0100 |
commit | 323388f49e3a9ef2f6966414a2b5f97fa96f687b (patch) | |
tree | 7191119265f343eb45692114eac89194d8701552 | |
parent | 052f05bb4f2fcb61af882010659245da949d2b5e (diff) |
qtbase: Fix evdevtouch build with 64bit time_t on glibc
* one more fix is needed for evdevtouch in 5.12
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 9 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 11 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0021-evdevtouch-fix-input_event-time-related-compile.patch | 56 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0022-Always-build-uic-and-qvkgen.patch (renamed from recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0023-Avoid-renameeat2-for-native-sdk-builds.patch (renamed from recipes-qt/qt5/qtbase/0022-Avoid-renameeat2-for-native-sdk-builds.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0024-Bootstrap-without-linkat-feature.patch (renamed from recipes-qt/qt5/qtbase/0023-Bootstrap-without-linkat-feature.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 3 |
7 files changed, 72 insertions, 13 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 83eb549b..a237f2b2 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -25,7 +25,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.13 +# 5.12.meta-qt5-shared.14 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -47,14 +47,15 @@ SRC_URI += "\ file://0018-qfloat16-Include-limits-header.patch \ file://0019-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch \ file://0020-evdevkeyboard-fix-input_event-time-related-compile.patch \ + file://0021-evdevtouch-fix-input_event-time-related-compile.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.13 +# 5.12.meta-qt5-native.14 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ - file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0022-Always-build-uic-and-qvkgen.patch \ + file://0023-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index d4db457a..d262dc3a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.13 +# 5.12.meta-qt5-shared.14 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -40,19 +40,20 @@ SRC_URI += "\ file://0018-qfloat16-Include-limits-header.patch \ file://0019-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch \ file://0020-evdevkeyboard-fix-input_event-time-related-compile.patch \ + file://0021-evdevtouch-fix-input_event-time-related-compile.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.13 +# 5.12.meta-qt5-native.14 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ - file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0022-Always-build-uic-and-qvkgen.patch \ + file://0023-Avoid-renameeat2-for-native-sdk-builds.patch \ " # only for qtbase-native SRC_URI += " \ - file://0023-Bootstrap-without-linkat-feature.patch \ + file://0024-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0021-evdevtouch-fix-input_event-time-related-compile.patch b/recipes-qt/qt5/qtbase/0021-evdevtouch-fix-input_event-time-related-compile.patch new file mode 100644 index 00000000..6106213e --- /dev/null +++ b/recipes-qt/qt5/qtbase/0021-evdevtouch-fix-input_event-time-related-compile.patch @@ -0,0 +1,56 @@ +From d1942b9bf89aa129b47a01fb3e70e53d89ecfe2a Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Mon, 4 May 2020 23:19:25 +0200 +Subject: [PATCH] evdevtouch: fix input_event time related compile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + evdevtouch/qevdevtouchhandler.cpp: In member function ‘void QEvdevTouchScreenData::processInputEvent(input_event*)’: + evdevtouch/qevdevtouchhandler.cpp:579:29: error: ‘struct input_event’ has no member named ‘time’; did you mean ‘type’? + m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0; + ^~~~ + type + evdevtouch/qevdevtouchhandler.cpp:579:49: error: ‘struct input_event’ has no member named ‘time’; did you mean ‘type’? + m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0; + ^~~~ + type + +Task-number: QTBUG-84012 +Change-Id: Ib8d726a0baf2bdc85da9341229fffaddc0e373ee +Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> +(cherry picked from commit 71fb4d081c7f3675939ac8c62063631a18175fd1) +--- + .../input/evdevtouch/qevdevtouchhandler.cpp | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +index 70271c7fd6..4e20b3c8db 100644 +--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp ++++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +@@ -55,6 +55,14 @@ + #include <linux/input.h> + #endif + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#endif ++ ++#ifndef input_event_usec ++#define input_event_usec time.tv_usec ++#endif ++ + #include <math.h> + + #if QT_CONFIG(mtdev) +@@ -568,7 +576,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) + + // update timestamps + m_lastTimeStamp = m_timeStamp; +- m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0; ++ m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0; + + m_lastTouchPoints = m_touchPoints; + m_touchPoints.clear(); diff --git a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0022-Always-build-uic-and-qvkgen.patch index 3cb5ab24..ec2f5220 100644 --- a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0022-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From 4dde34f5b142ab7700469e566cbed78699438460 Mon Sep 17 00:00:00 2001 +From 23c7e76d2d1b7e1cef31fc1846d53ed08d3e823b Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen diff --git a/recipes-qt/qt5/qtbase/0022-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0023-Avoid-renameeat2-for-native-sdk-builds.patch index fa77ef5a..d70a3dc9 100644 --- a/recipes-qt/qt5/qtbase/0022-Avoid-renameeat2-for-native-sdk-builds.patch +++ b/recipes-qt/qt5/qtbase/0023-Avoid-renameeat2-for-native-sdk-builds.patch @@ -1,4 +1,4 @@ -From 026db0b6cbffba8c46df8b1eb739ef53df9b413d Mon Sep 17 00:00:00 2001 +From 9c0b58449f104fae266eb0276497429784c6713f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Sun, 14 Apr 2019 13:27:58 +0200 Subject: [PATCH] Avoid renameeat2 for native(sdk) builds diff --git a/recipes-qt/qt5/qtbase/0023-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0024-Bootstrap-without-linkat-feature.patch index b0bcb776..1c31cf96 100644 --- a/recipes-qt/qt5/qtbase/0023-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0024-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From d83c11c9c197195164af9a3ac202740c0c8673cb Mon Sep 17 00:00:00 2001 +From 32df31b265c28f503dc1482efa11fd0717ff5c42 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index c3c68b1e..ae77e066 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.13 +# 5.12.meta-qt5-shared.14 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -36,6 +36,7 @@ SRC_URI += "\ file://0018-qfloat16-Include-limits-header.patch \ file://0019-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch \ file://0020-evdevkeyboard-fix-input_event-time-related-compile.patch \ + file://0021-evdevtouch-fix-input_event-time-related-compile.patch \ " # for syncqt |