summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
diff options
context:
space:
mode:
authorJani Suonpera <jani.suonpera@qt.io>2021-01-27 09:21:29 +0200
committerJani Suonpera <jani.suonpera@qt.io>2021-02-05 14:56:55 +0200
commita73de388e628a67490cdd7734779d405740b7fa3 (patch)
treec6410cd0062df9dde1fd02b56232027b7f865815 /recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
parent7dfe6ec495c3e56e4fbfb1dba23291589c28f7a7 (diff)
downloadmeta-qt5-a73de388e628a67490cdd7734779d405740b7fa3.tar.gz
qt5: update submodules for LTS 5.15
- Webengine-chromium branch changed from 83-based to 87-based. - PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations has been removed from src/buildtools/configure.json - DEPENDS nodejs-native added. This mandatory for chromium build. Task-number: QTBUG-90623 Change-Id: Ic933c88399422941114915afe5baa202850928f4 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000..ba734781
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,47 @@
1From 80c09862860702ce559c150784de50aa56282802 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.h | 5 +++++
15 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 3 +--
16 2 files changed, 6 insertions(+), 2 deletions(-)
17
18diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
19index 2d184811a00..fb2ba0069f1 100644
20--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
21+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
22@@ -20,6 +20,11 @@
23 #include "ui/events/ozone/evdev/event_dispatch_callback.h"
24 #include "ui/gfx/geometry/size.h"
25
26+#ifndef input_event_sec
27+#define input_event_sec time.tv_sec
28+#define input_event_usec time.tv_usec
29+#endif
30+
31 struct input_event;
32
33 namespace ui {
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 b8d089f7381..5d2d08b1ec6 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@@ -62,8 +62,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
39 continue;
40 std::string event_string = base::StringPrintf(
41 "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
42- te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value,
43- te->slot);
44+ te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
45 report_content += event_string;
46 }
47 file.Write(0, report_content.c_str(), report_content.length());