diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2022-02-11 19:43:41 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2022-02-12 17:47:54 +0100 |
commit | d38470c2632d6626c0a6c0f91a519589f9f1ae55 (patch) | |
tree | ba96227f2c976c7a2b6f92fc5f440e226a086051 | |
parent | 642c0e2e45b2803e48d6a05aa88fa4ec342a50d0 (diff) |
qtwebengine: upgrade to v5.15.8 and use the same SRCREVs as qtpdf
* fixes for glibc-2.34 were merged upstream
* qtwebengine:
git log --oneline be49f438d66f120646237c3f13d9e8f9166b95a6..73e76f9e86b3fded45be6b232bdebe75e7136e4a
73e76f9e8 Use IsSameDocument() rather than IsLoadingToDifferentDocument()
cd2b9fa57 Update module-split for installer
4b5504d4d Fix printing PDF files
34b5b4b19 Do not override signal handlers
c3fce9352 Update Chromium
763db8ce9 Avoid using xkbcommon in non-X11 builds
5018a477c Bump version from 5.15.8 to 5.15.9
0361b2cce Update Chromium
3387ca53e Don't unconditionally log that Apple Silicon is not supported
1c9785bf7 Skip QtWebEngine and QtPdf if building for Apple Silicon
5e30e3a7c Update documentation
6369c52ce Update Chromium
cf53bf7fa Handle qtpdf compilation with static runtime
a49e0b2ca Add bitcode support for qtpdf on ios
56ba5c978 Update Chromium
402f5a4a7 Do not access accessibility from qt post routines
ab1d00253 Blacklist javascriptClipboard test on ubuntu 20.04
8cbd59dd3 Re-enable network-service-in-process
e510ef5ae Bump version from 5.15.7 to 5.15.8
604f42c37 Update Chromium
f817c9198 Update patch level
03b3df668 Fix pinch gesture
5f6a292bc Fix leak of properties after XkbRF_GetNamesProp
603ad5cc9 Fix leak on getDefaultScreeenId
9e63ed675 Blacklist certificate test until certicates have been renewed
4340b9579 Block CORS from local URLs when remote access is not enabled
b99b6ed65 Do not wait on weak_pointer for termination errors
e85939ac7 Update Chromium
19e6e9e29 Update Chromium
0997f6e32 Support MSVC_VER 16.8
d0576dda4 Fix wrong save file filter for Markdown Editor example
ddf97c119 Add Chromium version source documentation
e27ac3610 Bump version from 5.15.6 to 5.15.7
7f4a6ff45 Fix crash when clicking on a link in PDF
c68457239 Update Chromium
6ce0de1a9 Update Chromium
7b9e9c922 Update Chromium
46d3c2349 Bump version from 5.15.5 to 5.15.6
eafc7b603 Always send phased wheel events beginning with Began
09bf7d7a9 Update Chromium
626830a78 Generate mojo bindings before compiling extension API registration
99c2125de Fix not working certificates on mac > 10.14
2240a3f8e Update Chromium
f69c1859b Bump version from 5.15.4 to 5.15.5
4d13a3ef2 Blacklist handleError on macos until we merge the fix
8f7e7cfb7 Load signals test: use focusProxy for link clicking test
8b8cc47aa Set enumaration root directory for File.webkitRelativePath API
ade5679e6 Fix FilePickerController's path validation for windows and corresponding tests
33e08cdfd Add support for Keyboard.getLayoutMap()
e7d56d6c0 Remove ResourceTypeSubFrame check after website update
349db5edc Follow InProcessGpuThread::Init() on thread priority
5d41d39b8 Avoid unknownFunc messages in qmltests
7e5e92c32 Blacklist CertificateError::test_error for macOS
06228ca3c Adapt to new Connections syntax
9f0f9981d Remove tracking of frame which load error page
4d4fc9cd1 Fix inconsistent number of load signals and their order
88c9dc680 Doc: Add a note about navigation within a page to a fragment
ba57bbb0f Unblacklist and fix load signals test for file download
aa3b04de3 Add more tests to tst_loadsignals
c3a81005a Remove obsolete loadSignals test secondLoadForError_WhenErrorPageEnabled
a7d3b4cb0 Allow leaving OCSP off
119c9ae0a Blacklist NewViewRequest::test_loadNewViewRequest on macOS
70927466b Update Chromium
* chromium:
git log --oneline 6c7b4ffb3fe19e7c6a2db60ce2d05c3b50c16ffc..48a205f9e054b5cc3e67df2e25382da9460c0015
48a205f9e05 Do not overwrite signal handlers in the browser process.
d505a379d3b [Backport] Copy 'name_' member during StyleRuleProperty::Copy
0ad28143707 [Backport] CVE-2021-4102: Use after free in V8
e5d497a3247 [Backport] CVE-2021-4101: Heap buffer overflow in Swiftshader.
571b49605f5 [Backport] CVE-2021-4099: Use after free in Swiftshader
3e477e28f22 [Backport] CVE-2021-4098: Insufficient data validation in Mojo
7ff159da128 Try to fix build on Apple Monterey
2918e073086 [Backport] Handle long SIGSTKSZ in glibc > 2.33
d3396fb6fcf [Backport] abseil-cpp: Fixes build with latest glibc
b77d64307a4 Bump V8_PATCH_LEVEL
764c8558b0f [Backport] CVE-2021-4078: Type confusion in V8
371dfe28a34 [Backport] CVE-2021-4079: Out of bounds write in WebRTC
16d0d63ede4 [Backport] Security bug 1259899
e0abe24fe7b [Backport] CVE-2021-4062: Heap buffer overflow in BFCache
ef54f3d63fd [Backport] CVE-2021-4059: Insufficient data validation in loader
5aeb41626e3 [Backport] CVE-2021-4058: Heap buffer overflow in ANGLE (2/2)
c76e04186ad [Backport] CVE-2021-4058: Heap buffer overflow in ANGLE (1/2)
50e9ebbfc3c [Backport] CVE-2021-4057: Use after free in file API
1df82e89295 Use wglSetPixelFormat directly only if in software mode
b3ec1114d8f Compile with GCC 11 -std=c++20
bfc2de04055 [Backport] CVE-2021-37996 : Insufficient validation of untrusted input in Downloads
460be974cd0 [Backport] CVE-2021-38001 : Type Confusion in V8
825745fdbd0 [Backport] Security bug 1252858
df07ad645cf [Backport] CVE-2021-37989 : Inappropriate implementation in Blink
4797e6e848b [Backport] Dependency for CVE-2021-37989
d1d8974783c [Backport] CVE-2021-38022: Inappropriate implementation in WebAuthentication
c4f05eef5e4 [Backport] CVE-2021-38012: Type Confusion in V8
77eb03c0ff1 [Backport] CVE-2021-38010: Inappropriate implementation in service workers
c7d8826a6d6 [Backport] CVE-2021-38021: Inappropriate implementation in referrer
a81a024f3a5 [Backport] CVE-2021-38005: Use after free in loader (3/3)
e1bdb5dff96 [Backport] CVE-2021-38005: Use after free in loader (2/3)
51c9803f8ac [Backport] CVE-2021-38005: Use after free in loader (1/3)
c3635c792e4 [Backport] CVE-2021-38019: Insufficient policy enforcement in CORS
f1d999742b7 [Backport] CVE-2021-38007: Type Confusion in V8
61f0637953b [Backport] CVE-2021-38017: Insufficient policy enforcement in iframe sandbox
695cc63e436 [Backport] CVE-2021-38009: Inappropriate implementation in cache
7382407581b [Backport] Dependency for CVE-2021-38009
3fce22f9ce9 [Backport] CVE-2021-38015: Inappropriate implementation in input
814d594ab39 [Backport] CVE-2021-38018: Inappropriate implementation in navigation
0b15e3a1283 Revert "Stop orphan child processes from staying alive on Windows"
961f13c6876 Fix stack overflow on gpu channel recreate with an error
f878faa317d [Backport] Security bug 1245870
060cd95a1f3 [Backport] CVE-2021-37993 : Use after free in PDF Accessibility
a1153aa778d [Backport] CVE-2021-37984 : Heap buffer overflow in PDFium
5814c143eb5 [Backport] CVE-2021-37992 : Out of bounds read in WebAudio
f33d6723535 [Backport] CVE-2021-37987 : Use after free in Network APIs
b497b6ac860 [Backport] CVE-2021-38003 : Inappropriate implementation in V8
d63517a0ebc [Backport] CVE-2021-3541 libxml2: Exponential entity expansion attack bypasses all existing protection mechanisms
ce0357a3a86 [Backport] CVE-2021-3517: libxml2: Heap-based buffer overflow in xmlEncodeEntitiesInternal() in entities.c
8c0a9b4459f Revert "[Backport] Security bug 1239116"
b3c5d18a071 [Backport] Linux sandbox: update syscalls numbers on 32-bit platforms
7f07b1c3d90 [Backport] sandbox: linux: allow clock_nanosleep & gettime64
549b2ecfd28 [Backport] Linux sandbox: update syscall numbers for all platforms.
d33026ed7c5 Revert "[Backport] CVE-2021-37976 : Information leak in core"
29c41fac33d [Backport] Ease HarfBuzz API change with feature detection
e1b1c8fbfdc Bump V8_PATCH_LEVEL
bb7d5f412de CVE-2021-37972 : Out of bounds read in libjpeg-turbo
f56401ddcec Add switch for static and dynamic crt
2577bccb3d5 [Backport] Security bug 1248665
231761dbed7 [Backport] CVE-2021-37975 : Use after free in V8
3301102062f [Backport] CVE-2021-37980 : Inappropriate implementation in Sandbox
10bdc1bcce9 [Backport] CVE-2021-37979 : Heap buffer overflow in WebRTC (2/2)
41bf49c17a6 [Backport] CVE-2021-37979 : Heap buffer overflow in WebRTC (1/2)
316ff0b2e0e [Backport] CVE-2021-37978 : Heap buffer overflow in Blink
c9eee8926c9 [Backport] CVE-2021-37976 : Information leak in core
b0d03b2f484 [Backport] CVE-2021-30616: Use after free in Media.
75e6c138ad9 [Backport] Dependency for CVE-2021-30616
be58035b0bf [Backport] CVE-2021-37962 : Use after free in Performance Manager (2/2)
842b1fe73c3 [Backport] CVE-2021-37962 : Use after free in Performance Manager (1/2)
a12aac1d65a [Backport] CVE-2021-37973 : Use after free in Portals
31327570494 [Backport] CVE-2021-37971 : Incorrect security UI in Web Browser UI.
e1c9ef661cc [Backport] CVE-2021-37968 : Inappropriate implementation in Background Fetch API
8170b884540 [Backport] CVE-2021-37967 : Inappropriate implementation in Background Fetch API
39c2ae1a9ea [Backport] Linux sandbox: return ENOSYS for clone3
be0320febb6 [Backport] Linux sandbox: fix fstatat() crash
0ef198c9ee2 [Backport] Reland "Reland "Linux sandbox syscall broker: use struct kernel_stat""
1950f23d465 [Backport] Security bug 1238178 (2/2)
45133cbadf5 [Backport] Security bug 1238178 (1/2)
6643e7a877c [Backport] CVE-2021-30633: Use after free in Indexed DB API (2/2)
af07badd6ff [Backport] CVE-2021-30633: Use after free in Indexed DB API (1/2)
19808bff72b [Backport] CVE-2021-30630: Inappropriate implementation in Blink
3b2c685c26a [Backport] CVE-2021-30629: Use after free in Permissions
b84f1aa1c79 [Backport] CVE-2021-30628: Stack buffer overflow in ANGLE
f1f2f28fb4e [Backport] CVE-2021-30627: Type Confusion in Blink layout
4b12199073d [Backport] CVE-2021-30626: Out of bounds memory access in ANGLE
df0ac531326 [Backport] CVE-2021-30625: Use after free in Selection API
adcb7c9d94a [Backport] Security bug 1239116
f0834350e21 [Backport] Security bug 1206289
ca1eed2838b [Backport] CVE-2021-30613: Use after free in Base internals
68f44b4acae [Backport] Security bug 1227228
d59527ce172 [Backport] CVE-2021-30618: Inappropriate implementation in DevTools
9f71911e38c [Backport] CVE-2021-30560: Use after free in Blink XSLT
c8087cb6809 [Backport] CVE-2021-30566: Stack buffer overflow in Printing
7a8e3587227 [Backport] CVE-2021-30585: Use after free in sensor handling
80ed2154da5 Bump V8_PATCH_LEVEL
1c68d71eabf [Backport] Security bug 1228036
d2c0e58eab2 [Backport] CVE-2021-30604: Use after free in ANGLE
fabc9bb01c0 [Backport] CVE-2021-30603: Race in WebAudio
36f3419335f [Backport] CVE-2021-30602: Use after free in WebRTC
6f4b9a24c6e [Backport] CVE-2021-30599: Type Confusion in V8
e9fe457edfc [Backport] CVE-2021-30598: Type Confusion in V8
d07208fe7ea [Backport] Security bug 1227933
6ed7e70372b [Backport] Security bug 1205059
2327f834a33 [Backport] Security bug 1184294
6d3335345c0 [Backport] Security bug 1198385
45ec486f694 [Backport] CVE-2021-30588: Type Confusion in V8
4c129f0da7f [Backport] CVE-2021-30587: Inappropriate implementation in Compositing on Windows
4c5ea7104ef [Backport] CVE-2021-30573: Use after free in GPU
df0ce074884 [Backport] CVE-2021-30569, security bugs 1198216 and 1204814
362ebc273c3 [Backport] CVE-2021-30568: Heap buffer overflow in WebGL
d2679dfe289 [Backport] CVE-2021-30541: Use after free in V8
c49a1b46977 [Backport] Security bugs 1197786 and 1194330
24fe4f7088e [Backport] Security bug 1194689
d20a32ba7b3 [Backport] CVE-2021-30563: Type Confusion in V8
82dbe6ec610 [Backport] Security bug 1211215
63aa70704eb [Backport] Security bug 1209558
5ddd26eb1c1 [Backport] CVE-2021-30553: Use after free in Network service
ce44e18e5ea [Backport] CVE-2021-30548: Use after free in Loader
dccd70ff668 [Backport] CVE-2021-30547: Out of bounds write in ANGLE
99850871829 [Backport] CVE-2021-30556: Use after free in WebAudio
dcd69a31bd0 [Backport] CVE-2021-30559: Out of bounds write in ANGLE
09404bcb076 [Backport] CVE-2021-30533: Insufficient policy enforcement in PopupBlocker
9995d429475 [Backport] Security bug 1202534
8b6c2cc8db1 [Backport] CVE-2021-30536: Out of bounds read in V8
5db4492a5ee [Backport] CVE-2021-30522: Use after free in WebAudio
0b959ee26c9 [Backport] CVE-2021-30554 Use after free in WebGL
8a287eeecee [Backport] CVE-2021-30551: Type Confusion in V8
9e6ebb137db [Backport] CVE-2021-30544: Use after free in BFCache
00d148cb209 [Backport] CVE-2021-30535: Double free in ICU
e11e1e26681 [Backport] CVE-2021-30534: Insufficient policy enforcement in iFrameSandbox
260e76054ff [Backport] CVE-2021-30530: Out of bounds memory access in WebAudio
559f74945e1 [Backport] CVE-2021-30523: Use after free in WebRTC
7948becb538 Generate mojo bindings before compiling extension API registration
eaffb82d5ee [Backport] Security bug 1201938
951cdb36065 [Backport] Security bug 1201340
9827f0c6df6 [Backport] Security bug 1195331
96953e10399 [Backport] Security bug 1204071
5353de15a14 [Backport] CVE-2021-30518: Heap buffer overflow in Reader Mode
4646e31fd96 [Backport] CVE-2021-30516: Heap buffer overflow in History.
01441068d6d [Backport] CVE-2021-30515: Use after free in File API
59c82b51677 [Backport] CVE-2021-30513: Type Confusion in V8
a7025feb1be [Backport] CVE-2021-30512: Use after free in Notifications
b1620340b6b [Backport] CVE-2021-30510: Race in Aura
f5056d02494 [Backport] CVE-2021-30508: Heap buffer overflow in Media Feeds
5b2293cf1f2 Workaround revoked certificate check on Linux
dc35950b9ee FIXUP: third_party perfetto: add missing include for clang, asan and no_pch
12ecfd11e32 Bump V8_PATCH_LEVEL
b498f4ce3f5 Fix build with GCC 11
1d3b13e9634 Make clang to inline load/store atomic calls for YieldSortKey struct
f6730fe81a0 Enable XkbKeyboardLayoutEngine::SetCurrentLayoutByName for Qt
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
31 files changed, 69 insertions, 294 deletions
diff --git a/recipes-qt/qt5/qtpdf_git.bb b/recipes-qt/qt5/qtpdf_git.bb index 2f28cecf..46d27aa6 100644 --- a/recipes-qt/qt5/qtpdf_git.bb +++ b/recipes-qt/qt5/qtpdf_git.bb @@ -85,8 +85,6 @@ CONFLICT_DISTRO_FEATURES = "qt5-static" def gettext_oeconf(d): return "" -QT_MODULE = "qtwebengine" - require qt5.inc require qt5-git.inc @@ -130,16 +128,23 @@ RDEPENDS:${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "87-based" -# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc -# 5.15-glibc.meta-qt5.12 +QT_MODULE_BRANCH = "5.15" +PV = "5.15.8+git${SRCPV}" + +# Uses the same repository and couple patches as qtwebengine, but qtwebengine +# still depends on python2 +QT_MODULE = "qtwebengine" FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtwebengine:" + +# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc +# 5.15-glibc.meta-qt5.13 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ + file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch \ " - # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 -# 5.15.meta-qt5.12 +# 5.15.meta-qt5.13 SRC_URI:append:libc-musl = "\ file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ file://0004-musl-link-against-libexecinfo.patch \ @@ -149,6 +154,7 @@ SRC_URI:append:libc-musl = "\ SRCREV_qtwebengine = "73e76f9e86b3fded45be6b232bdebe75e7136e4a" SRCREV_chromium = "48a205f9e054b5cc3e67df2e25382da9460c0015" SRCREV = "${SRCREV_qtwebengine}" + SRCREV_FORMAT = "qtwebengine_chromium" # WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel] @@ -173,7 +179,7 @@ PACKAGECONFIG[qtpdf] = "-feature-build-qtpdf,-no-feature-build-qtpdf,python3-nat PACKAGECONFIG[webengine-pdf] = "-feature-webengine-python2,-no-feature-webengine-python2,python3-native" # The flags below enable just the PDF widget -PACKAGECONFIG="no-core qtpdf" +PACKAGECONFIG = "no-core qtpdf" # Work around gn's dependency on python (2). # To build qtpdf it works just as well with python3. diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 67ea08b2..556148d9 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From 4f5aa37cb8c785f227eb3a55595dd055d5f3e2c5 Mon Sep 17 00:00:00 2001 +From 7a41b9ef89f18b26abf6355f5193d90a38147955 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri -index 7507d51e..1e078cbf 100644 +index 7507d51ef..1e078cbfe 100644 --- a/src/buildtools/config/linux.pri +++ b/src/buildtools/config/linux.pri @@ -118,7 +118,7 @@ contains(QT_ARCH, "mips") { @@ -32,7 +32,7 @@ index 7507d51e..1e078cbf 100644 # Don't bother trying to use system libraries in this case gn_args += use_glib=false diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index dd0d3e32..6312c867 100644 +index dd0d3e327..6312c8678 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,7 +4,7 @@ TEMPLATE = aux @@ -71,7 +71,7 @@ index dd0d3e32..6312c867 100644 " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro -index 033202e6..a8ca6567 100644 +index 033202e6e..a8ca6567b 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -19,8 +19,8 @@ build_pass|!debug_and_release { diff --git a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch index ce327f69..9ddebc2b 100644 --- a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch +++ b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch @@ -1,4 +1,4 @@ -From 1dd91e504648f94a41509cde9f04b0ec2b2ad6cf Mon Sep 17 00:00:00 2001 +From a5b9a5016d985cba60fdcb99bff498b0a2573f2d Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 12 Mar 2021 15:47:50 +0100 Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.2 @@ -23,12 +23,12 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf -index d5e64505..8de72145 100644 +index 1d0279c42..8de72145c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD) load(qt_build_config) CONFIG += warning_clean --MODULE_VERSION = 5.15.4 +-MODULE_VERSION = 5.15.9 +MODULE_VERSION = 5.15.2 diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index 6bd3e641..11a2ab50 100644 --- a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -1,4 +1,4 @@ -From 5047c9dfe57c29f9b39829ba6404bd23df669571 Mon Sep 17 00:00:00 2001 +From 3a29b3cfd7592518227d72a5b165a4652292a202 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Tue, 12 Dec 2017 16:06:14 +0200 Subject: [PATCH] musl: don't use pvalloc as it's not available on musl @@ -10,7 +10,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 1 file changed, 8 deletions(-) diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp -index 002a1af2..8fd2da36 100644 +index 002a1af22..8fd2da36b 100644 --- a/src/core/api/qtbug-61521.cpp +++ b/src/core/api/qtbug-61521.cpp @@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch index 74899024..61c6ebf3 100644 --- a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch @@ -1,4 +1,4 @@ -From e8ca5b9f0dde416a726e94b000b2a775fcd58ad5 Mon Sep 17 00:00:00 2001 +From 8acd353be20f852e869cdbf8ee58622d31e2040a Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 14 Dec 2017 11:28:10 +0200 Subject: [PATCH] musl: link against libexecinfo @@ -10,7 +10,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index 520b452f..d2b29b29 100644 +index 520b452f7..d2b29b298 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -5,7 +5,7 @@ include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri) diff --git a/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch index 9e0050dc..0a566ad7 100644 --- a/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch @@ -1,4 +1,4 @@ -From addc1b0951db494fa42b141cf7e1c0f5d462e49a Mon Sep 17 00:00:00 2001 +From 5c95e9d289bdc069ed289a59ed3ac0c0b4f667f8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 12 Nov 2019 19:53:59 -0800 Subject: [PATCH] mkspecs: Allow builds with libc != glibc @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri -index e7f869a1..f9c9c24b 100644 +index 7a07b1b5b..ba6e8e3c9 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri -@@ -191,10 +191,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { +@@ -195,10 +195,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { defineTest(qtwebengine_checkForGlibc) { module = $$1 @@ -25,10 +25,10 @@ index e7f869a1..f9c9c24b 100644 } diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json -index 812a91f9..a7c3d972 100644 +index 88d1790c1..9eb5e8e33 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json -@@ -373,7 +373,6 @@ +@@ -379,7 +379,6 @@ && (!config.sanitizer || features.webengine-sanitizer) && (!config.linux || features.pkg-config) && (!config.linux || features.webengine-host-pkg-config) @@ -36,7 +36,7 @@ index 812a91f9..a7c3d972 100644 && (!config.linux || features.webengine-system-khr) && (!config.linux || features.webengine-system-nss) && (!config.linux || features.webengine-system-dbus) -@@ -770,8 +769,7 @@ +@@ -782,8 +781,7 @@ "webengine-system-fontconfig", "webengine-system-dbus", "webengine-system-nss", diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch index 230acecc..d4ccf8f0 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch @@ -1,4 +1,4 @@ -From 900b6302bdb5f55e5c65443d57c1b9889ce8b1ac Mon Sep 17 00:00:00 2001 +From 4d04aeec1a8520d5c4bcd5f49f064ea93705d7c4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 30 Mar 2017 11:37:24 +0300 Subject: [PATCH] chromium: workaround for too long .rps file name diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch index 513a2ad1..d8b7624e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From e7c5bbcb94ac020d801eb86d7e93d69cfbb024a6 Mon Sep 17 00:00:00 2001 +From dec7becd72c1b035a98a86b5915578ca1ff919b4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 2 Feb 2019 19:28:59 -0800 Subject: [PATCH] chromium: fix build with clang diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch index 24fdbbfa..250ae1ec 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -1,4 +1,4 @@ -From 92ab3e8a7160d633d58e4a082dec6971aa7ecaa8 Mon Sep 17 00:00:00 2001 +From 790063a65e3aa8a043409b2e32b7b46daf4a29f4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 5 Feb 2019 14:32:20 -0800 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch index 36855b40..78c4645a 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch @@ -1,4 +1,4 @@ -From 50fec34283ce34caeb7b554a6c241218234746b3 Mon Sep 17 00:00:00 2001 +From 5daeac1b655e9baa6d3dfe9d9b7af8acfa7b9b88 Mon Sep 17 00:00:00 2001 From: Johannes Pointner <johannes.pointner@br-automation.com> Date: Fri, 3 May 2019 09:12:38 +0200 Subject: [PATCH] chromium: Do not try to set the guessed values for diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch index 2924f382..fb7b13a3 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch @@ -1,4 +1,4 @@ -From 9864bef1a01b419d66072b72b39ae0cd7d67b110 Mon Sep 17 00:00:00 2001 +From ddaec018169ec178a37082e929fba63fc8990810 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jslaby@suse.cz> Date: Thu, 11 Jul 2019 09:35:13 +0200 Subject: [PATCH] chromium: fix build after y2038 changes in glibc diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 41730a8e..4965d532 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -1,4 +1,4 @@ -From d0b000b79a7c5da37d87881cca465847f768b8fc Mon Sep 17 00:00:00 2001 +From f7b5d40dcde77aad8c21ec20ee5bbce374b683d2 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 30 Nov 2019 10:07:43 -0800 Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch index 2417d854..d1342673 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch @@ -1,4 +1,4 @@ -From 0f4e4ee09874e819a0dfdb2753efd47ebe862dab Mon Sep 17 00:00:00 2001 +From a15d2e00b6e86ddf976449b60e2305dbe4519221 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 25 Dec 2019 15:41:16 -0800 Subject: [PATCH] chromium: Include cstddef for size_t definition diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch index 143a5b70..b3dbf3a4 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch @@ -1,4 +1,4 @@ -From 3bc78b6d3e3e197b2dfa77ff4963561166492a49 Mon Sep 17 00:00:00 2001 +From 8a83d56821d3672d3fe2aef03f2c0b7e25bf9318 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 2 Jan 2020 17:13:55 -0800 Subject: [PATCH] chromium: Move CharAllocator definition to a header file diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch index c7a1323f..0e8aba8e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch @@ -1,4 +1,4 @@ -From 8c54d047047f4345a7f0316d33a718c632bf5807 Mon Sep 17 00:00:00 2001 +From f7b71dc55c9a1d8d2b955a9c614d201e489e299f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 1 Feb 2020 12:17:23 -0800 Subject: [PATCH] chromium: Link v8 with libatomic on x86 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch index bac67267..789dfce5 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch @@ -1,4 +1,4 @@ -From 3ebde6b1a9be5476cda2ace2c103ffc2a3004a4c Mon Sep 17 00:00:00 2001 +From 33aa004f686e3d0e6d9d646b911cf4eee68769d4 Mon Sep 17 00:00:00 2001 From: Andrej Valek <andrej.valek@siemens.com> Date: Fri, 17 Apr 2020 09:43:32 +0200 Subject: [PATCH] chromium: icu: use system library only targets diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch deleted file mode 100644 index 27b3d7d2..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch +++ /dev/null @@ -1,84 +0,0 @@ -From c6ff2c26ae6a1c7cde6685a697d8dafc6e2d2694 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 29 Apr 2021 11:11:51 +0200 -Subject: [PATCH] chromium: abseil-cpp, mojo, perfetto: fix build with gcc-11 - -* fixes abseil-cpp: -FAILED: obj/third_party/abseil-cpp/absl/synchronization/graphcycles_internal/graphcycles.o -/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.3+gitAUTOINC+0930b350d7_687d322fae-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.3+gitAUTOINC+0930b350d7_687d322fae-r0/recipe-sysroot -MMD -MF obj/third_party/abseil-cpp/absl/synchronization/graphcycles_internal/graphcycles.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DABSL_ALLOCATOR_NOTHROW=1 -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/abseil-cpp -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc -o obj/third_party/abseil-cpp/absl/synchronization/graphcycles_internal/graphcycles.o -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc: In member function 'void absl::synchronization_internal::GraphCycles::RemoveNode(void*)': -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc:451:26: error: 'numeric_limits' is not a member of 'std' - 451 | if (x->version == std::numeric_limits<uint32_t>::max()) { - | ^~~~~~~~~~~~~~ -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc:451:49: error: expected primary-expression before '>' token - 451 | if (x->version == std::numeric_limits<uint32_t>::max()) { - | ^ -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc:451:52: error: '::max' has not been declared; did you mean 'std::max'? - 451 | if (x->version == std::numeric_limits<uint32_t>::max()) { - | ^~~ - | std::max - -* mojo: -| FAILED: obj/mojo/public/cpp/platform/platform/named_platform_channel_posix.o -| /OE/build/oe-core/tmp-musl/work/core2-64-oe-linux-musl/qtwebengine/5.15.4+gitAUTOINC+be49f438d6_6c7b4ffb3f-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux-musl/x86_64-oe-linux-musl-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 --sysroot=/OE/build/oe-core/tmp-musl/work/core2-64-oe-linux-musl/qtwebengine/5.15.4+gitAUTOINC+be49f438d6_6c7b4ffb3f-r0/recipe-sysroot -MMD -MF obj/mojo/public/cpp/platform/platform/named_platform_channel_posix.o.d -DIS_MOJO_CPP_PLATFORM_IMPL -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/perfetto/include -Igen/third_party/perfetto/build_config -Igen/third_party/perfetto -Igen -I../../../../git/src/3rdparty/chromium/third_party/abseil-cpp -I../../../../git/src/3rdparty/chromium/third_party/boringssl/src/include -I../../../../git/src/3rdparty/chromium/third_party/protobuf/src -Igen/protoc_out -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -c ../../../../git/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc -o obj/mojo/public/cpp/platform/platform/named_platform_channel_posix.o -| ../../../../git/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc: In function 'bool mojo::{anonymous}::MakeUnixAddr(const ServerName&, sockaddr_un*, size_t*)': -| ../../../../git/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc:53:3: error: 'strncpy' was not declared in this scope -| 53 | strncpy(unix_addr->sun_path, server_name.c_str(), kMaxSocketNameLength); -| | ^~~~~~~ -| ../../../../git/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc:18:1: note: 'strncpy' is defined in header '<cstring>'; did you forget to '#include <cstring>'? -| 17 | #include "base/strings/string_number_conversions.h" -| +++ |+#include <cstring> -| 18 | - -* and perfetto: -../../../../git/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h:256:34: error: no member named 'numeric_limits' in namespace 'std' - PERFETTO_DCHECK(value < std::numeric_limits<uint32_t>::max()); - -This is because its missing right header which perhaps is included -implicitly in older compilers - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - .../mojo/public/cpp/platform/named_platform_channel_posix.cc | 1 + - .../abseil-cpp/absl/synchronization/internal/graphcycles.cc | 1 + - .../perfetto/src/trace_processor/containers/string_pool.h | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc b/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc -index 9082ac4da59..d039ff83a35 100644 ---- a/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc -+++ b/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc -@@ -8,6 +8,7 @@ - #include <sys/socket.h> - #include <sys/un.h> - #include <unistd.h> -+#include <string.h> - - #include "base/files/file_util.h" - #include "base/files/scoped_file.h" -diff --git a/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc b/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc -index 19f9aab5b1a..ab9d7f80bc7 100644 ---- a/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc -+++ b/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc -@@ -36,6 +36,7 @@ - #include "absl/synchronization/internal/graphcycles.h" - - #include <algorithm> -+#include <limits> - #include <array> - #include "absl/base/internal/hide_ptr.h" - #include "absl/base/internal/raw_logging.h" -diff --git a/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h b/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h -index 11ae91cfeca..558ff00e8fe 100644 ---- a/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h -+++ b/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h -@@ -20,6 +20,7 @@ - #include <stddef.h> - #include <stdint.h> - -+#include <limits> - #include <unordered_map> - #include <vector> - diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-abseil-cpp-fix-build-with-glibc-2.34.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-abseil-cpp-fix-build-with-glibc-2.34.patch deleted file mode 100644 index a19be4f0..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-abseil-cpp-fix-build-with-glibc-2.34.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 78b1bcff4d9b977313e9ea15068168e1b11f5ba1 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Wed, 4 Aug 2021 19:08:03 +0200 -Subject: [PATCH] chromium: abseil-cpp: fix build with glibc-2.34 - -* backport a fix from upstream abseil-cpp: - https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9 - - to fix: - -[97/24505] CXX obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o -FAILED: obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o -/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DABSL_ALLOCATOR_NOTHROW=1 -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/abseil-cpp -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc -o obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc: In function 'bool absl::SetupAlternateStackOnce()': -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: error: no matching function for call to 'max(long int, int)' - 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61, - from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)' - 254 | max(const _Tp& __a, const _Tp& __b) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: deduced conflicting types for parameter 'const _Tp' ('long int' and 'int') - 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61, - from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' - 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: deduced conflicting types for parameter 'const _Tp' ('long int' and 'int') - 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, - from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)' - 3461 | max(initializer_list<_Tp> __l) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: mismatched types 'std::initializer_list<_Tp>' and 'long int' - 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, - from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' - 3467 | max(initializer_list<_Tp> __l, _Compare __comp) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: mismatched types 'std::initializer_list<_Tp>' and 'long int' - 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; - | ~~~~~~~~^~~~~~~~~~~~~~~~~ - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - .../abseil-cpp/absl/debugging/failure_signal_handler.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc b/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc -index 5d13bdbbbd1..150a43f2660 100644 ---- a/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc -+++ b/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc -@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() { - #else - const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; - #endif -- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; -+ size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask; - #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ - defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) - // Account for sanitizer instrumentation requiring additional stack space. diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index bc7e30bf..a35e841d 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -1,4 +1,4 @@ -From 00ad5230c6467c633d67b579baf543fff4a24012 Mon Sep 17 00:00:00 2001 +From bb176f52d47467f5d3e5247e79bd99c1f3242f21 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:01:12 -0700 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch deleted file mode 100644 index 8e3b844d..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch +++ /dev/null @@ -1,72 +0,0 @@ -From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Wed, 4 Aug 2021 19:11:06 +0200 -Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 - -* fixes: -[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o -FAILED: obj/third_party/breakpad/client/exception_handler.o -/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, - from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)' - 254 | max(const _Tp& __a, const _Tp& __b) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, - from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' - 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)' - 3461 | max(initializer_list<_Tp> __l) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' - 3467 | max(initializer_list<_Tp> __l, _Compare __comp) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - | ~~~~~~~~^~~~~~~~~~~~~~~~~ - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -index ca353c40997..2e43ba6fc04 100644 ---- a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index d8fd1573..5b67280e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -1,4 +1,4 @@ -From a7523f006993f0c430cdb3d3530e61d87e9ab931 Mon Sep 17 00:00:00 2001 +From b34653c14b3f108881d640c483e0b09cc799ffbc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:09:06 -0700 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-fcntl.h-for-loff_t.patch index 2dd1aa7c..89d15727 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -1,4 +1,4 @@ -From 0c96c6426495030da4a8059d73e83c7a62cd63bf Mon Sep 17 00:00:00 2001 +From 2bf695a8a6d7ba3fe6132ee3b80acbc97da1951f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:37:49 -0700 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index 5d97cca9..cbbdec2e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -1,4 +1,4 @@ -From e3e38034ba58645f381d27b577b876e49c0a2a2c Mon Sep 17 00:00:00 2001 +From b1b03941337119a63199b8c8164d31ab2eedd7a7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:38:37 -0700 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-linux-glibc-make-the-distinction.patch index 18c36b1c..b43f2d0f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-linux-glibc-make-the-distinction.patch @@ -1,4 +1,4 @@ -From 9bae3b2fc8a771d17ec91627dff37b6df40bd107 Mon Sep 17 00:00:00 2001 +From 81f1dcacea816fe05704cc15a24e0e78e44ffe04 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:54:38 -0700 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index be74bcf7..35cf7c15 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -1,4 +1,4 @@ -From 28bdd37b1103437da3002ac5f2c329d899caea76 Mon Sep 17 00:00:00 2001 +From 6a34d97837bab8c907e589e50781c0aeb93ad895 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:27:50 -0700 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Do-not-define-__sbrk-on-musl.patch index da25b723..3663ba3f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From 48ae420276e0e5356b700494b1da5fd4bc358844 Mon Sep 17 00:00:00 2001 +From c20698af89a03d797bff202d077339d8d5d588ec Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:39:57 -0700 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Adjust-default-pthread-stack-size.patch index b5d58d05..6c4921a5 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,4 +1,4 @@ -From ad847b58068d0727d279658ffb9577893b6a57b5 Mon Sep 17 00:00:00 2001 +From 222e0373c65389ec3f8afa3fd1da45afa4672fca Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 16:41:23 -0700 Subject: [PATCH] chromium: musl: Adjust default pthread stack size diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch index 5e9503ea..43c28f28 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch @@ -1,4 +1,4 @@ -From 12013eed158bd6d61526921bf77766e696a41571 Mon Sep 17 00:00:00 2001 +From a253d0a3f1776b6e2cf1e75e1a4ccf14775f8d17 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 25 Sep 2018 12:59:05 -0700 Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-pread-pwrite.patch index f9fd76f4..67d391d2 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-pread-pwrite.patch @@ -1,4 +1,4 @@ -From c4178e519cebec88088ff24bb7daa13a21049d85 Mon Sep 17 00:00:00 2001 +From c0c1c1d4de0dd9b734116967b60a658e328bbab3 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 23 Dec 2018 16:58:04 -0800 Subject: [PATCH] chromium: musl: pread pwrite diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch index 01fe94f5..85afe41b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch @@ -1,4 +1,4 @@ -From 73f270ff373f5719ea74cdb590ca1f535fbe0cd9 Mon Sep 17 00:00:00 2001 +From d9e2ebea235d1df86d8db78c949481ca89340e42 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 10 May 2020 08:16:01 -0700 Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 35ed78c3..ffdfeaca 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -149,17 +149,17 @@ RDEPENDS:${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "87-based" QT_MODULE_BRANCH = "5.15" -PV = "5.15.4+git${SRCPV}" +PV = "5.15.8+git${SRCPV}" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc -# 5.15-glibc.meta-qt5.12 +# 5.15-glibc.meta-qt5.13 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 -# 5.15.meta-qt5.12 +# 5.15.meta-qt5.13 SRC_URI:append:libc-musl = "\ file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ file://0004-musl-link-against-libexecinfo.patch \ @@ -167,7 +167,7 @@ SRC_URI:append:libc-musl = "\ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc -# 87-based-glibc.meta-qt5.4 +# 87-based-glibc.meta-qt5.6 SRC_URI += " \ file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ @@ -179,29 +179,26 @@ SRC_URI += " \ file://chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ file://chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ file://chromium/0010-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ - file://chromium/0011-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch;patchdir=src/3rdparty \ - file://chromium/0012-chromium-abseil-cpp-fix-build-with-glibc-2.34.patch;patchdir=src/3rdparty \ - file://chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch;patchdir=src/3rdparty \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based -# 87-based.meta-qt5.5 +# 87-based.meta-qt5.6 SRC_URI:append:libc-musl = "\ - file://chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ - file://chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ - file://chromium/0016-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ - file://chromium/0017-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ - file://chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ - file://chromium/0019-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ - file://chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ - file://chromium/0021-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ - file://chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ - file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ - file://chromium/0024-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ + file://chromium/0012-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ + file://chromium/0013-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ + file://chromium/0014-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ + file://chromium/0015-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ + file://chromium/0016-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ + file://chromium/0017-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ + file://chromium/0018-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ + file://chromium/0019-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ + file://chromium/0020-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ + file://chromium/0021-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ + file://chromium/0022-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "be49f438d66f120646237c3f13d9e8f9166b95a6" -SRCREV_chromium = "6c7b4ffb3fe19e7c6a2db60ce2d05c3b50c16ffc" +SRCREV_qtwebengine = "73e76f9e86b3fded45be6b232bdebe75e7136e4a" +SRCREV_chromium = "48a205f9e054b5cc3e67df2e25382da9460c0015" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" |