summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-04-14 10:42:58 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-04-15 08:19:56 +0300
commit7de0cbd5dc9f80972ce559c9e340afbff0b9403d (patch)
treea7011b9b55ba590406919a1873d01c20aea5d0ea /recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
parent374abadf749bbf8f3d84e2e895c2139722447a01 (diff)
parent02930760c8be7c9d850919cda89469e9c0120d6c (diff)
downloadmeta-qt5-7de0cbd5dc9f80972ce559c9e340afbff0b9403d.tar.gz
Merge remote-tracking branch 'qt/upstream/master' into 5.15
* Diff in SRCREVs are due checkout from commit vs. checkout from corresponding tag in modules. The content is the same. * metatypes inclusion was a bit different in upstream, synced with upstream * update module_config.yaml * upstream/master: 02930760 qtmultimedia: create /usr/lib/plugins/videoeglvideonode referenced by Qt5MultimediaConfig.cmake b8bcf8cb qt5: upgrade to 5.15 beta3 eac416fe qtdeclarative: bump SRCREV 6558d2b5 nativesdk-qtbase: fix unpackaged files 6b2323f3 qtwebengine: update patches for beta2 20ae10f0 qt5: upgrade to 5.15 beta2 a01de873 qtwebengine: fix QT_MODULE_BRANCH_CHROMIUM b88c292a qtquick3d: Fix branch for fetching assimp submodule df67d5a7 qt3d: update patch to apply a38953a6 qt5: upgrade to latest revisions in 5.15 branch 9a645b02 qtwebengine: update patches for latest 5.15 revision 6cce9817 qtwebengine: update patches for 5.15 50e35581 qtbase: update patches for latest 5.15 revision 9f024a55 qtdeclarative: add dependency on qtdeclarative-native 76125ba8 qt5.inc: package metatypes files f3379951 qtbase: drop xkb, xcb-xinput PACKAGECONFIGs 44405373 qt5: upgrade to latest revisions in 5.15 branch 5e189731 layer: Mark dunfell as the only compatible release 3e759d82 qtwebengine: Fix build with ninja >= 1.10.0 f712bf9f python-pyqt5: remove PyQt_qreal_double from DISABLED_FEATURES 79b0f3a6 python-pyqtchart: remove PyQt_qreal_double from DISABLED_FEATURES 34ae49f8 qtmultimedia: Enable gstreamer support 108b5664 gstreamer1.0-plugins-good: Turn on qt5 packageconfig 4b6ce100 qt5-creator: Inherit mime-xdg 89de99e7 python-{pyqt5,pyqtchart}: fold .inc file into .bb 5d790449 python-pyqt5: drop python 2 recipe b2a958a4 python-pyqt5: disable whole PyQt_OpenGL and QtWidgets, QtQuickWidgets, QtQuick modules without opengl in DISTRO_FEATURES Conflicts: conf/layer.conf recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebview_git.bb Change-Id: I61a651fd16d475ac0d8bbe119a3e3a8038692726
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch4
1 files changed, 2 insertions, 2 deletions
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
index 32dde335..fa382f9d 100644
--- 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
@@ -1,4 +1,4 @@
1From c2ca4923d5e534789b205968eb01779a90ec1299 Mon Sep 17 00:00:00 2001 1From 905c5b699f97105029a498096b3b6b3c8736cfeb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Jan 2020 16:53:46 -0800 3Date: Wed, 15 Jan 2020 16:53:46 -0800
4Subject: [PATCH] chromium: Include <cstddef> and <cstdint> 4Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 3 files changed, 3 insertions(+) 13 3 files changed, 3 insertions(+)
14 14
15diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h 15diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
16index 3f220da8c71..c54e3bb7d30 100644 16index dbe59ba5ea7..5216cfe3ee9 100644
17--- a/chromium/media/cdm/supported_cdm_versions.h 17--- a/chromium/media/cdm/supported_cdm_versions.h
18+++ b/chromium/media/cdm/supported_cdm_versions.h 18+++ b/chromium/media/cdm/supported_cdm_versions.h
19@@ -6,6 +6,7 @@ 19@@ -6,6 +6,7 @@