summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-01-11 14:55:56 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2020-01-11 14:59:12 +0100
commitb814111ed28cab46d9d896919b2b5fe308614e1d (patch)
tree09b7b2ee7a67ed0e732cc8d789499dde4b90bc8f /recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
parent1fde17e1a570aa5495ecbe8a8daae95b628db260 (diff)
downloadmeta-qt5-b814111ed28cab46d9d896919b2b5fe308614e1d.tar.gz
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
* fixes 0004-mkspecs-Allow-builds-with-libc-glibc.patch which didn't apply at all, because the modified mkspecs/features/configure.prf was dropped completely in: commit 047d61f188aae3fe3ebc689900b8a5c9fb6e901d Author: Michal Klocek michal.klocek@qt.io Date: Fri Aug 9 17:40:29 2019 +0200 Add webengine-core feature The same chunk can be found in src/buildtools/config/support.pri, so I've updated the .patch accordingly, but haven't tried the build with musl yet. * fixes 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch to apply ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_patch: Command Error: 'quilt --quiltrc /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch patching file chromium/cc/base/list_container_helper.cc Hunk #1 FAILED at 13. 1 out of 1 hunk FAILED -- rejects in file chromium/cc/base/list_container_helper.cc patching file chromium/cc/base/list_container_helper.h Hunk #1 FAILED at 8. Hunk #2 succeeded at 174 with fuzz 1. 1 out of 2 hunks FAILED -- rejects in file chromium/cc/base/list_container_helper.h Patch 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch does not apply (enforce with -f) ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/temp/log.do_patch.21067 NOTE: recipe qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0: task do_patch: Failed ERROR: Task (/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb:do_patch) failed with exit code '1' * build is still going (it will be a while on my slow builder) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000..0bd4a451
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,68 @@
1From b0d3cfec7837dcf818c08454a16eb44d78337a9f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Nov 2019 10:07:43 -0800
4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
5
6time element is deprecated on new input_event structure in kernel's
7input.h [1]
8
9[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 4 ++--
15 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++---
16 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | 5 +++++
17 3 files changed, 10 insertions(+), 5 deletions(-)
18
19diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
20index 5684f4121be..10f6357e6b5 100644
21--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
22+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
23@@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback(
24 base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent(
25 const input_event& event) {
26 base::TimeTicks timestamp =
27- ui::EventTimeStampFromSeconds(event.time.tv_sec) +
28- base::TimeDelta::FromMicroseconds(event.time.tv_usec);
29+ ui::EventTimeStampFromSeconds(event.input_event_sec) +
30+ base::TimeDelta::FromMicroseconds(event.input_event_usec);
31 ValidateEventTimeClock(&timestamp);
32 return timestamp;
33 }
34diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
35index 363c3183e05..4fccfd62f84 100644
36--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
37+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
38@@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
39 for (int i = 0; i < kDebugBufferSize; ++i) {
40 struct TouchEvent* te =
41 &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize];
42- if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0)
43+ if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0)
44 continue;
45 std::string event_string = base::StringPrintf(
46- "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec,
47- te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
48+ "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
49+ te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
50 report_content += event_string;
51 }
52 file.Write(0, report_content.c_str(), report_content.length());
53diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
54index ccd3a499a38..5a2da89d09a 100644
55--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
56+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
57@@ -14,6 +14,11 @@
58
59 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
60
61+#ifndef input_event_sec
62+#define input_event_sec time.tv_sec
63+#define input_event_usec time.tv_usec
64+#endif
65+
66 namespace ui {
67
68 class EventDeviceInfo;