diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
27 files changed, 80 insertions, 285 deletions
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 ee1d7fdb..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 b0251611be6c04c9157589d155ff6a1c1469685f 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 ff448ab9..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 b3e90f55b7174973b432344995b5da749b250ddf 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 e15b2f7b..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 4ad5b8e7645190fb4202df2b538690c8650fd6b2 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 ccc19f91..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 19bfaced4a770f85e187a8228496c793abfba6d9 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-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch deleted file mode 100644 index 6cfbdcae..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3af74da07ef771948f4229706e088562fd419534 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> -Date: Thu, 8 Mar 2018 15:39:55 +0100 -Subject: [PATCH] chromium: aarch64 skia build fix - -Upstream-Status: Inappropriate - -GCC (tested rocko's 7.3.0) cannot find these intrinsics and the build fails: - -../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::F neon::from_half(neon::U16)': -../../third_party/skia/src/opts/SkRasterPipeline_opts.h:657:26: error: cannot convert 'neon::U16 {aka short unsigned int}' to 'float16x4_ t {aka __vector(4) __ fp16}' for argument '1' to ' -float32x4_t vcvt_f32_f16(float16x4_t)' - return vcvt_f32_f16(h); - ^ -../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::U16 neon::to_half(neon::F)': -../../third_party/skia/src/opts/SkRasterPipeline_opts.h:677:26: error: cannot convert 'neon::F {aka float}' to 'float32x4_t {aka __vector (4) float}' for argum ent '1' to 'float16x4_t vcvt -_f16_f32(float32x4_t)' - return vcvt_f16_f32(f); - ^ - -Upstream seems to have had similar issues according to -https://skia-review.googlesource.com/c/skia/+/84222, but there is no fix at the -moment. - -Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> ---- - chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -index 659794d1b50..d5b609ba93d 100644 ---- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -@@ -984,7 +984,7 @@ SI F from_half(U16 h) { - memcpy(&fp16, &h, sizeof(U16)); - return float(fp16); - --#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) -+#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) || defined(JUMPER_IS_AVX512) - return _mm256_cvtph_ps(h); - - #else -@@ -1008,7 +1008,7 @@ SI U16 to_half(F f) { - memcpy(&u16, &fp16, sizeof(U16)); - return u16; - --#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) -+#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) || defined(JUMPER_IS_AVX512) - return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION); - - #else diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-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 a50af5f8..fb7b13a3 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-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 d65ae3fe949ca238e7e3479ca4852dde959303b1 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/0007-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 5d02fbab..4965d532 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-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 936bf9b5e16978062919c64c6efffb4de772978a 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/0008-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch index 4ad12736..d1342673 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-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 4f4291c43c52c2503f9603cbcddd777ccd585368 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/0009-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 9f75cf24..676e0346 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-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 1a89703d1be0fc11c1d417cefdae587d9cb06e62 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 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch index 78882af1..0e8aba8e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-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 6d44d2699f3da33fb9afa8a169fc062bbbffd92c 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/0011-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch index 54be2991..789dfce5 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-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 e1acc223a1bd8e1b619d45847daed05d99729820 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/0012-chromium-Add-missing-include-for-C-strncpy.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Add-missing-include-for-C-strncpy.patch index 81159aa9..81159aa9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Add-missing-include-for-C-strncpy.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Add-missing-include-for-C-strncpy.patch diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-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 2b2a71f5..b267917d 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-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 0720824a9ddd8dd5733323f98c20da8e20a3f00e 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 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch deleted file mode 100644 index b0b012b5..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-abseil-cpp-mojo-perfetto-fix-build-with-gcc.patch +++ /dev/null @@ -1,72 +0,0 @@ -From e9a3312ef31c38e50f70e2963d0565f50e627895 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> ---- - .../abseil-cpp/absl/synchronization/internal/graphcycles.cc | 1 + - .../perfetto/src/trace_processor/containers/string_pool.h | 1 + - 2 files changed, 2 insertions(+) - -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 27fec21681d..f7b632457ab 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 <limits> - #include "absl/base/internal/hide_ptr.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 6b76b74c91b..1655d35f6ac 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 -@@ -21,6 +21,7 @@ - #include <stddef.h> - #include <stdint.h> - -+#include <limits> - #include <unordered_map> - #include <vector> - diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-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 20ab5d96..e3ab73f9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-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 e1fa81138385b061c4ad6f0b8c70621e459cdc83 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 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-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 233e71a3..89d15727 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0018-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 321d061c2416748744abec84ddb00ae36d779ae0 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/0015-chromium-breakpad-fix-build-with-glibc-2.34.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-breakpad-fix-build-with-glibc-2.34.patch deleted file mode 100644 index da0da045..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-breakpad-fix-build-with-glibc-2.34.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 1dd597a93496fda0a732a333903de19998a31d9d 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 5cdabcf64c1..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(16384U, (unsigned)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/0019-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 b195fea5..b79f599e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-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 f46206ac042ca33313e385c348ed5ecb8bc3d2f0 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 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-linux-glibc-make-the-distinction.patch index 48c6ec3f..b43f2d0f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0020-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 8de6b6bb628f94b461de6d178207e381373881b6 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/0021-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 b506214d..ba76d553 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-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 fd57ca553714b8c2a13d9ead8b2b62b1882edb2f 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 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-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 d84f3436..3663ba3f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0022-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 c212e32e8453e6130de1c6f9325b048802bf59d4 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/0023-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Adjust-default-pthread-stack-size.patch index 2fb48e3b..6c4921a5 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0023-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 e4d62b7ec685d00f9690ffac20580637a3b07b4a 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/0025-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 847b4726..e6bfcc76 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0025-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 130dd0978ca18d2108935bf4558de17cce06813c 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 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-pread-pwrite.patch index 245e19fc..67d391d2 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-pread-pwrite.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-pread-pwrite.patch @@ -1,4 +1,4 @@ -From cc286866d3449a4b3f13a9134acd2bd037591e68 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/0027-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 7ea1263b..65c858fc 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0027-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 60bd7d460f814d232a597d9177ec8400b13af793 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 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-remove-true-to-prep-landing-of-icu68.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-remove-true-to-prep-landing-of-icu68.patch new file mode 100644 index 00000000..c2eefe4d --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-remove-true-to-prep-landing-of-icu68.patch @@ -0,0 +1,59 @@ +From e8aa87fa88f55e76ce08794690665ce30caa3183 Mon Sep 17 00:00:00 2001 +From: Frank Tang <ftang@chromium.org> +Date: Tue, 20 Oct 2020 01:09:43 +0000 +Subject: [PATCH] Remove TRUE to prep landing of icu68 + +ICU 68, to work with C++20, remove the #define of TRUE +since the usage in libxml is as an int, use 1 instead. + +Upstream-Status: Backport [https://github.com/chromium/chromium/commit/e8aa87fa88f55e76ce08794690665ce30caa3183] +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> +--- + chromium/third_party/libxml/README.chromium | 2 ++ + chromium/third_party/libxml/src/encoding.c | 6 ++-- + 3 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/chromium/third_party/libxml/README.chromium b/chromium/third_party/libxml/README.chromium +index f84cc64e1f922..8da443a392c3d 100644 +--- a/chromium/third_party/libxml/README.chromium ++++ b/chromium/third_party/libxml/README.chromium +@@ -24,6 +24,8 @@ Modifications: + non-recursive broke a few web platform tests. + - add-fuzz-target.patch: Prevents autoreconf from failing on mac due to a + missing makefile for fuzz. ++- chromium-issue-1138555.patch: Change TRUE to 1 for ICU68 which remove the ++ #define of TRUE. + - Add helper classes in the chromium/ subdirectory. + - Delete various unused files, see chromium/roll.py + +diff --git a/chromium/third_party/libxml/src/encoding.c b/chromium/third_party/libxml/src/encoding.c +index c34aca44663c0..47be560ede472 100644 +--- a/chromium/third_party/libxml/src/encoding.c ++++ b/chromium/third_party/libxml/src/encoding.c +@@ -1858,7 +1858,7 @@ xmlIconvWrapper(iconv_t cd, unsigned char *out, int *outlen, + * @outlen: the length of @out + * @in: a pointer to an array of input bytes + * @inlen: the length of @in +- * @flush: if true, indicates end of input ++ * @flush: if 1, indicates end of input + * + * Returns 0 if success, or + * -1 by lack of space, or +@@ -1898,7 +1898,7 @@ xmlUconvWrapper(uconv_t *cd, int toUnicode, unsigned char *out, int *outlen, + *inlen = ucv_in - (const char*) in; + *outlen = ucv_out - (char *) out; + if (U_SUCCESS(err)) { +- /* reset pivot buf if this is the last call for input (flush==TRUE) */ ++ /* reset pivot buf if this is the last call for input (flush==1) */ + if (flush) + cd->pivot_source = cd->pivot_target = cd->pivot_buf; + return 0; +@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, + #ifdef LIBXML_ICU_ENABLED + else if (handler->uconv_out != NULL) { + ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, +- TRUE); ++ 1); + } + #endif /* LIBXML_ICU_ENABLED */ + else { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch deleted file mode 100644 index 49fbb1ec..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 19eb2ff78ff3217648da47fc15a44b987ff14b81 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 25 Sep 2018 12:35:07 -0700 -Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate - on linux - -glibc defines both. musl libc only the former. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - .../client/linux/dump_writer_common/ucontext_reader.cc | 8 ++++---- - .../src/client/linux/dump_writer_common/ucontext_reader.h | 4 ++-- - .../src/client/linux/minidump_writer/minidump_writer.h | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -index 6eec1be2465..57d91943e83 100644 ---- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -48,8 +48,8 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_EIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc, -- const fpstate_t* fp) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, -+ const struct _fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - - out->context_flags = MD_CONTEXT_X86_FULL | -@@ -96,8 +96,8 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc, -- const fpstate_t* fpregs) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, -+ const struct _fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - - out->context_flags = MD_CONTEXT_AMD64_FULL; -diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -index 7d41008815f..6cacabe4369 100644 ---- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -50,8 +50,8 @@ struct UContextReader { - // out: the minidump structure - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) -- static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc, -- const fpstate_t* fp); -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, -+ const struct _fpstate* fp); - #elif defined(__aarch64__) - static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc, - const struct fpsimd_context* fpregs); -diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -index e3b0b16daea..5d144dcd27c 100644 ---- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -@@ -49,7 +49,7 @@ class ExceptionHandler; - #if defined(__aarch64__) - typedef struct fpsimd_context fpstate_t; - #elif !defined(__ARM_EABI__) && !defined(__mips__) --typedef std::remove_pointer<fpregset_t>::type fpstate_t; -+typedef struct _fpstate fpstate_t; - #endif - - // These entries store a list of memory regions that the client wants included |