summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-05-07 10:47:27 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-05-11 08:20:43 +0300
commit999a301f64894a12dc0f0caeb8af240c73c8a332 (patch)
treeb6a8749f0dad9026c2bda88cba2532e203132b7b /recipes-qt/qt5/qtwebengine/chromium
parent0ad7806ca33a715bfdc95555229428ed2be68b1f (diff)
downloadmeta-qt5-999a301f64894a12dc0f0caeb8af240c73c8a332.tar.gz
qt5: update submodulesv5.15.0-rc2
Update to Qt 5.15.0 RC2 Task-number: QTBUG-80823 Change-Id: I5541f9f2ee80ddd667ad809fd034762d9b990800 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch17
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch50
2 files changed, 2 insertions, 65 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
index e494e061..28e672bd 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
1From e8f23ce32baf1e0d9c2249e50c949c9cd86095e0 Mon Sep 17 00:00:00 2001 1From 40368b5ef391a2d47d3d83f33d97ac7a7dcf3ff7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 25 Dec 2019 15:41:16 -0800 3Date: Wed, 25 Dec 2019 15:41:16 -0800
4Subject: [PATCH] chromium: Include cstddef for size_t definition 4Subject: [PATCH] chromium: Include cstddef for size_t definition
@@ -18,22 +18,9 @@ ccc
18 18
19Signed-off-by: Khem Raj <raj.khem@gmail.com> 19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20--- 20---
21 .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h | 1 +
22 .../third_party/webrtc/modules/video_coding/decoding_state.h | 1 + 21 .../third_party/webrtc/modules/video_coding/decoding_state.h | 1 +
23 2 files changed, 2 insertions(+) 22 1 file changed, 1 insertion(+)
24 23
25diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
26index 22528c94892..69e624e8b19 100644
27--- a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
28+++ b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
29@@ -12,6 +12,7 @@
30 #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
31
32 #include <array>
33+#include <cstddef>
34
35 namespace webrtc {
36
37diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 24diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
38index b87fb2d0345..b3faffcfc79 100644 25index b87fb2d0345..b3faffcfc79 100644
39--- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 26--- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
deleted file mode 100644
index d97e9bd7..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 75d5b91b202dc2f5ff380cc36fdb9ac50f6c80ca Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Jan 2020 16:53:46 -0800
4Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
5
6These headers are needed for uintXX_t and size_t definitions
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 chromium/media/cdm/supported_cdm_versions.h | 1 +
11 .../third_party/perfetto/include/perfetto/base/task_runner.h | 1 +
12 chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 +
13 3 files changed, 3 insertions(+)
14
15diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
16index dbe59ba5ea7..5216cfe3ee9 100644
17--- a/chromium/media/cdm/supported_cdm_versions.h
18+++ b/chromium/media/cdm/supported_cdm_versions.h
19@@ -6,6 +6,7 @@
20 #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
21
22 #include <array>
23+#include <cstddef>
24
25 #include "media/base/media_export.h"
26 #include "media/cdm/api/content_decryption_module.h"
27diff --git a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
28index cf60401238f..02658e7139b 100644
29--- a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
30+++ b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
31@@ -18,6 +18,7 @@
32 #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
33
34 #include <functional>
35+#include <cstdint>
36
37 #include "perfetto/base/export.h"
38
39diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h
40index 8ffa4400a9c..a389fc2a574 100644
41--- a/chromium/third_party/webrtc/call/rtx_receive_stream.h
42+++ b/chromium/third_party/webrtc/call/rtx_receive_stream.h
43@@ -11,6 +11,7 @@
44 #ifndef CALL_RTX_RECEIVE_STREAM_H_
45 #define CALL_RTX_RECEIVE_STREAM_H_
46
47+#include <cstdint>
48 #include <map>
49
50 #include "call/rtp_packet_sink_interface.h"