diff options
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.patch | 68 |
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 @@ | |||
| 1 | From b0d3cfec7837dcf818c08454a16eb44d78337a9f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 30 Nov 2019 10:07:43 -0800 | ||
| 4 | Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t | ||
| 5 | |||
| 6 | time element is deprecated on new input_event structure in kernel's | ||
| 7 | input.h [1] | ||
| 8 | |||
| 9 | [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | Signed-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 | |||
| 19 | diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc | ||
| 20 | index 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(×tamp); | ||
| 32 | return timestamp; | ||
| 33 | } | ||
| 34 | diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | ||
| 35 | index 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()); | ||
| 53 | diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | ||
| 54 | index 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; | ||
