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:
authorJani Suonpera <jani.suonpera@qt.io>2020-11-03 12:43:11 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-11-17 07:09:19 +0200
commit72459ce0639eb3ce408558a7abede945e1f8ddc9 (patch)
tree775d465f8db9fab5c4202be3d4a17f9cead61ee2 /recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
parent6557244eca22a8722cf0fde2f3cc62f45cb72651 (diff)
downloadmeta-qt5-72459ce0639eb3ce408558a7abede945e1f8ddc9.tar.gz
Submodule update for 5.15v5.15.2
Modify patches for removing "Fuzz detected". Remove patches which already merged to upstream branch. Add depends jpeg-native and freetype-native. Task-number: QTBUG-86641 Change-Id: I40c6fed9b47d6a7749069554ea080db3e017f724 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
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.patch54
1 files changed, 8 insertions, 46 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
index 05917cd6..63a460cc 100644
--- 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
@@ -1,4 +1,4 @@
1From c769d6be7210a2fbc866e36f87ad21bcc91e9c6e Mon Sep 17 00:00:00 2001 1From ddedffaeb9f04ac8530f87f5010e0008dc548b96 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Nov 2019 10:07:43 -0800 3Date: Sat, 30 Nov 2019 10:07:43 -0800
4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t 4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
@@ -11,27 +11,10 @@ input.h [1]
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13--- 13---
14 chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 4 ++--
15 chromium/ui/events/ozone/evdev/event_converter_evdev.h | 5 +++++ 14 chromium/ui/events/ozone/evdev/event_converter_evdev.h | 5 +++++
16 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++--- 15 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 3 +--
17 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | 5 +++++ 16 2 files changed, 6 insertions(+), 2 deletions(-)
18 4 files changed, 15 insertions(+), 5 deletions(-)
19 17
20diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
21index 9f27d39e209..f565dd2ce5c 100644
22--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
23+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
24@@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback(
25 base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent(
26 const input_event& event) {
27 base::TimeTicks timestamp =
28- ui::EventTimeStampFromSeconds(event.time.tv_sec) +
29- base::TimeDelta::FromMicroseconds(event.time.tv_usec);
30+ ui::EventTimeStampFromSeconds(event.input_event_sec) +
31+ base::TimeDelta::FromMicroseconds(event.input_event_usec);
32 ValidateEventTimeClock(&timestamp);
33 return timestamp;
34 }
35diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h 18diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
36index 717410f2ebc..a4cd55ca20e 100644 19index 717410f2ebc..a4cd55ca20e 100644
37--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h 20--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
@@ -49,37 +32,16 @@ index 717410f2ebc..a4cd55ca20e 100644
49 32
50 namespace ui { 33 namespace ui {
51diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 34diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
52index 363c3183e05..4fccfd62f84 100644 35index 01e49b7bbfd..4fccfd62f84 100644
53--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 36--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
54+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 37+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
55@@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { 38@@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
56 for (int i = 0; i < kDebugBufferSize; ++i) {
57 struct TouchEvent* te =
58 &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize];
59- if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0)
60+ if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0)
61 continue; 39 continue;
62 std::string event_string = base::StringPrintf( 40 std::string event_string = base::StringPrintf(
63- "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec, 41 "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
64- te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); 42- te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value,
65+ "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, 43- te->slot);
66+ te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); 44+ te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
67 report_content += event_string; 45 report_content += event_string;
68 } 46 }
69 file.Write(0, report_content.c_str(), report_content.length()); 47 file.Write(0, report_content.c_str(), report_content.length());
70diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
71index 0d5b83148f6..1f17608e94d 100644
72--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
73+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
74@@ -14,6 +14,11 @@
75
76 #include "base/component_export.h"
77
78+#ifndef input_event_sec
79+#define input_event_sec time.tv_sec
80+#define input_event_usec time.tv_usec
81+#endif
82+
83 namespace ui {
84
85 class EventDeviceInfo;