diff options
Diffstat (limited to 'dev-qt/qtwebengine/files')
13 files changed, 171 insertions, 491 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch new file mode 100644 index 000000000000..2da3dc27fab2 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch @@ -0,0 +1,23 @@ +Quoting the description from qtwebengine-6.7.0-ninja1.12.patch: +""" +Patch status: pending being looked at upstream + +Issue[1][2][3] also exist in chromium itself[4], and unclear +why this started happening only with ninja-1.12.0 at the moment. + +Just a quickfix, likely not fully correct and seems there may +be further unresolved race issues. + +[1] https://bugs.gentoo.org/930107 +[2] https://bugreports.qt.io/browse/QTBUG-124375 +[3] https://github.com/ninja-build/ninja/issues/2417 +[4] https://bugs.gentoo.org/930112 +""" + +This has a hunk removed but is otherwise the same. +--- a/src/3rdparty/chromium/content/browser/BUILD.gn ++++ b/src/3rdparty/chromium/content/browser/BUILD.gn +@@ -198,2 +198,3 @@ + "//components/services/storage/public/mojom", ++ "//components/spellcheck:buildflags", + "//components/sqlite_proto", diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch deleted file mode 100644 index b0f5f3d30e0b..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri -index cf990c79..910a88ca 100644 ---- a/src/buildtools/config/common.pri -+++ b/src/buildtools/config/common.pri -@@ -26,6 +26,7 @@ gn_args += \ - skia_use_dawn=false \ - toolkit_views=false \ - treat_warnings_as_errors=false \ -+ fatal_linker_warnings=false \ - use_allocator_shim=false \ - use_allocator=\"none\" \ - use_custom_libcxx=false \ diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch deleted file mode 100644 index 4fb19ccdd2e5..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 463f1234c57a36e78ff666bd55094a9d4e68f296 Mon Sep 17 00:00:00 2001 -From: q66 <daniel@octaforge.org> -Date: Sat, 18 Jan 2020 23:52:55 +0100 -Subject: [PATCH 1/3] Enable ppc64 builds - ---- - configure.pri | 1 + - mkspecs/features/functions.prf | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure.pri b/configure.pri -index 3a144e3f8..cabe8b24a 100644 ---- a/configure.pri 2021-02-24 10:45:58.000000000 +0100 -+++ - 2021-03-07 21:18:43.124754796 +0100 -@@ -144,6 +144,7 @@ - contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true) - contains(QT_ARCH, "mips"): return(true) - contains(QT_ARCH, "mips64"): return(true) -+ contains(QT_ARCH, "power64"): return(true) - qtLog("Architecture not supported.") - return(false) - } -diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf -index 512e2523b..e31123654 100644 ---- a/mkspecs/features/functions.prf 2021-02-24 10:45:58.000000000 +0100 -+++ - 2021-03-07 21:19:21.345036293 +0100 -@@ -107,6 +107,7 @@ - contains(qtArch, "mips"): return(mipsel) - contains(qtArch, "mips64"): return(mips64el) - contains(qtArch, "mips64el"): return(mips64el) -+ contains(qtArch, "power64"): return(ppc64) - return(unknown) - } - --- -2.26.0 - diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch deleted file mode 100644 index 0488122ce92f..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro -index 3d6fda80e..3d0bc86fe 100644 ---- a/src/core/gn_run.pro -+++ b/src/core/gn_run.pro -@@ -38,5 +38,6 @@ build_pass|!debug_and_release { - } - -+ gn_args += $$(EXTRA_GN) - gn_args = $$system_quote($$gn_args) - gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir())) - gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir())) - gn_python = "--script-executable=$$pythonPathForSystem()" diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch deleted file mode 100644 index a6856975a663..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch +++ /dev/null @@ -1,192 +0,0 @@ -From b0a7f5691113534c2cf771f2dd3cece5e93bc7d4 Mon Sep 17 00:00:00 2001 -From: Frank Tang <ftang@chromium.org> -Date: Tue, 03 Nov 2020 23:20:37 -0800 -Subject: [PATCH] Update to ICU68-1 - -ICU68-1 change the output skeleton format. So we need to change -resolvedOptions code for 68 migration. - -Chromium roll -https://chromium-review.googlesource.com/c/chromium/src/+/2474093 - -Bug: v8:10945 -Change-Id: I3b2c7fbe8abb22df8fa51287c498ca3245b8c55b -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477431 -Commit-Queue: Frank Tang <ftang@chromium.org> -Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> -Reviewed-by: Shu-yu Guo <syg@chromium.org> -Cr-Commit-Position: refs/heads/master@{#70972} - -(ported to work with <ICU-68.1 and rebased chromium) ---- - -diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -index 45b0eab..d18b133 100644 ---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -@@ -389,17 +389,20 @@ Handle<String> CurrencySignString(Isolate* isolate, - Handle<String> UnitDisplayString(Isolate* isolate, - const icu::UnicodeString& skeleton) { - // Ex: skeleton as -- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name" -+ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name". -+ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-full-name" - if (skeleton.indexOf("unit-width-full-name") >= 0) { - return ReadOnlyRoots(isolate).long_string_handle(); - } - // Ex: skeleton as -- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow". -+ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow". -+ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-narrow". - if (skeleton.indexOf("unit-width-narrow") >= 0) { - return ReadOnlyRoots(isolate).narrow_string_handle(); - } - // Ex: skeleton as -- // "measure-unit/length-foot .### rounding-mode-half-up" -+ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up" -+ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up" - return ReadOnlyRoots(isolate).short_string_handle(); - } - -@@ -422,7 +425,8 @@ Notation NotationFromSkeleton(const icu::UnicodeString& skeleton) { - return Notation::COMPACT; - } - // Ex: skeleton as -- // "measure-unit/length-foot .### rounding-mode-half-up" -+ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up" -+ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up" - return Notation::STANDARD; - } - -@@ -562,14 +566,23 @@ namespace { - - // Ex: percent .### rounding-mode-half-up - // Special case for "percent" --// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .### --// rounding-mode-half-up" should return "kilometer-per-unit". --// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return --// "year". -+// <ICU-68.1: -+// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .### -+// rounding-mode-half-up" should return "kilometer-per-unit". -+// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return -+// >=ICU-68.1: -+// Ex: "unit/milliliter-per-acre .### rounding-mode-half-up" -+// should return "milliliter-per-acre". -+// Ex: "unit/year .### rounding-mode-half-up" should return -+// "year". - std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { - std::string str; - str = skeleton.toUTF8String<std::string>(str); -+#if U_ICU_VERSION_MAJOR_NUM < 68 - std::string search("measure-unit/"); -+#else -+ std::string search("unit/"); -+#endif - size_t begin = str.find(search); - if (begin == str.npos) { - // Special case for "percent". -@@ -578,20 +591,41 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { - } - return ""; - } -+#if U_ICU_VERSION_MAJOR_NUM < 68 - // Skip the type (ex: "length"). - // "measure-unit/length-kilometer per-measure-unit/duration-hour" - // b - begin = str.find("-", begin + search.size()); -+#else -+ // Ex: -+ // "unit/acre .### rounding-mode-half-up" -+ // b -+ // Ex: -+ // "unit/milliliter-per-acre .### rounding-mode-half-up" -+ // b -+ begin += search.size(); -+#endif - if (begin == str.npos) { - return ""; - } -+#if U_ICU_VERSION_MAJOR_NUM < 68 - begin++; // Skip the '-'. -+#endif - // Find the end of the subtype. - size_t end = str.find(" ", begin); -- // "measure-unit/length-kilometer per-measure-unit/duration-hour" -- // b e -+ // <ICU-68.1: -+ // "measure-unit/length-kilometer per-measure-unit/duration-hour" -+ // b e -+ // >=ICU-68.1: -+ // Ex: -+ // "unit/acre .### rounding-mode-half-up" -+ // b e -+ // Ex: -+ // "unit/milliliter-per-acre .### rounding-mode-half-up" -+ // b e - if (end == str.npos) { - end = str.size(); -+#if U_ICU_VERSION_MAJOR_NUM < 68 - return str.substr(begin, end - begin); - } - // "measure-unit/length-kilometer per-measure-unit/duration-hour" -@@ -625,17 +659,36 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) { - // "measure-unit/length-kilometer per-measure-unit/duration-hour" - // [result ] b e - return result + "-per-" + str.substr(begin, end - begin); -+#else -+ } -+ return str.substr(begin, end - begin); -+#endif - } - - Style StyleFromSkeleton(const icu::UnicodeString& skeleton) { - if (skeleton.indexOf("currency/") >= 0) { - return Style::CURRENCY; - } -+#if U_ICU_VERSION_MAJOR_NUM < 68 - if (skeleton.indexOf("measure-unit/") >= 0) { - if (skeleton.indexOf("scale/100") >= 0 && - skeleton.indexOf("measure-unit/concentr-percent") >= 0) { -+#else -+ if (skeleton.indexOf("percent") >= 0) { -+ // percent precision-integer rounding-mode-half-up scale/100 -+ if (skeleton.indexOf("scale/100") >= 0) { -+#endif - return Style::PERCENT; -+#if U_ICU_VERSION_MAJOR_NUM >= 68 -+ } else { -+ return Style::UNIT; -+#endif - } -+#if U_ICU_VERSION_MAJOR_NUM >= 68 -+ } -+ // Before ICU68: "measure-unit/", since ICU68 "unit/" -+ if (skeleton.indexOf("unit/") >= 0) { -+#endif - return Style::UNIT; - } - return Style::DECIMAL; -diff --git a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc -index 267343aaae..64d56a1c12 100644 ---- a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc -+++ b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc -@@ -195,9 +195,18 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New( - } - } - -+#if U_ICU_VERSION_MAJOR_NUM < 68 - icu::DecimalFormat* decimal_format = - static_cast<icu::DecimalFormat*>(number_format); - decimal_format->setMinimumGroupingDigits(-2); -+#else -+ if (number_format->getDynamicClassID() == -+ icu::DecimalFormat::getStaticClassID()) { -+ icu::DecimalFormat* decimal_format = -+ static_cast<icu::DecimalFormat*>(number_format); -+ decimal_format->setMinimumGroupingDigits(-2); -+ } -+#endif - - // Change UDISPCTX_CAPITALIZATION_NONE to other values if - // ECMA402 later include option to change capitalization. diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch deleted file mode 100644 index c31e8970eaef..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch +++ /dev/null @@ -1,15 +0,0 @@ -generate_gni.sh: update_readme() runs git at the end of process, prevent it. - -Thanks-to: Georgy Yakovlev <gyakovlev@gentoo.org> - ---- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-07 12:51:49.438514897 +0100 -+++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-21 16:23:38.375724515 +0100 -@@ -519,8 +519,3 @@ - - gn format --in-place $BASE_DIR/BUILD.gn - gn format --in-place $BASE_DIR/libvpx_srcs.gni -- --cd $BASE_DIR/$LIBVPX_SRC_DIR --update_readme -- --cd $BASE_DIR diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch new file mode 100644 index 000000000000..fdcc787971ca --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch @@ -0,0 +1,10 @@ +--- a/src/buildtools/gn.pro ++++ b/src/buildtools/gn.pro +@@ -25,6 +25,7 @@ + msvc:!clang_cl: gn_gen_args += --use-lto + + gn_configure = $$system_quote($$gn_bootstrap) $$gn_gen_args ++ gn_configure += --no-static-libstdc++ + macos { + gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" + } diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch deleted file mode 100644 index dfaa634bdb1f..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-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/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc -+++ b/src/3rdparty/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/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch deleted file mode 100644 index b91c239ac2b3..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-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/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -+++ b/src/3rdparty/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/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch deleted file mode 100644 index b3c2ffb315a5..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch +++ /dev/null @@ -1,79 +0,0 @@ -Description: Use system lcms2 -Author: Sandro Knauß <hefee@debian.org> -Origin: Debian -Forwarded: https://bugreports.qt.io/browse/QTBUG-61746 -Reviewed-by: Sandro Knauß <hefee@debian.org> -Last-Update: 2021-03-08 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn -+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn -@@ -239,58 +239,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths - } - } - --config("fx_lcms2_warnings") { -- visibility = [ ":*" ] -- if (is_clang) { -- cflags = [ -- # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this -- # library doesn't appear to have this problem. -- "-Wno-missing-braces", -- ] -- } -+import("//build/shim_headers.gni") -+ -+shim_headers("lcms2_shim") { -+ root_path = "lcms/include" -+ headers = [ -+ "lcms2.h", -+ "lcms2_plugin.h", -+ ] - } - - source_set("fx_lcms2") { -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- "//build/config/sanitizers:cfi_icall_generalize_pointers", -- ":pdfium_third_party_config", -- -- # Must be after no_chromium_code for warning flags to be ordered correctly. -- ":fx_lcms2_warnings", -- ] -- sources = [ -- "lcms/include/lcms2.h", -- "lcms/include/lcms2_plugin.h", -- "lcms/src/cmsalpha.c", -- "lcms/src/cmscam02.c", -- "lcms/src/cmscgats.c", -- "lcms/src/cmscnvrt.c", -- "lcms/src/cmserr.c", -- "lcms/src/cmsgamma.c", -- "lcms/src/cmsgmt.c", -- "lcms/src/cmshalf.c", -- "lcms/src/cmsintrp.c", -- "lcms/src/cmsio0.c", -- "lcms/src/cmsio1.c", -- "lcms/src/cmslut.c", -- "lcms/src/cmsmd5.c", -- "lcms/src/cmsmtrx.c", -- "lcms/src/cmsnamed.c", -- "lcms/src/cmsopt.c", -- "lcms/src/cmspack.c", -- "lcms/src/cmspcs.c", -- "lcms/src/cmsplugin.c", -- "lcms/src/cmsps2.c", -- "lcms/src/cmssamp.c", -- "lcms/src/cmssm.c", -- "lcms/src/cmstypes.c", -- "lcms/src/cmsvirt.c", -- "lcms/src/cmswtpnt.c", -- "lcms/src/cmsxform.c", -- ] -- deps = [ "../core/fxcrt" ] -+ deps = [ ":lcms2_shim" ] -+ libs = ["lcms2"] - } - - if (!build_with_chromium) { diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch new file mode 100644 index 000000000000..c5ae8cc17c5a --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch @@ -0,0 +1,96 @@ +Patch status: fixed in >=chromium-122.0.6200.0 + +https://bugs.gentoo.org/925486 +https://webrtc-review.googlesource.com/c/src/+/332240 +https://webrtc.googlesource.com/src/+/267f9bdd5 +From: Tommi <tommi@webrtc.org> +Date: Thu, 21 Dec 2023 14:08:26 +0100 +Subject: [PATCH] Update LegacyStatsCollector to conform with Wc++11-narrowing +--- a/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc ++++ b/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc +@@ -189,7 +189,8 @@ + {StatsReport::kStatsValueNamePreemptiveExpandRate, + info.preemptive_expand_rate}, +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, ++ static_cast<float>(info.total_output_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_output_duration}}; ++ static_cast<float>(info.total_output_duration)}}; + + const IntForAdd ints[] = { +@@ -245,7 +246,8 @@ + + const FloatForAdd floats[] = { +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, ++ static_cast<float>(info.total_input_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_input_duration}}; ++ static_cast<float>(info.total_input_duration)}}; + + RTC_DCHECK_GE(info.audio_level, 0); +@@ -341,5 +343,6 @@ + {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, + {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, +- {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, ++ {StatsReport::kStatsValueNameFramesDecoded, ++ static_cast<int>(info.frames_decoded)}, + }; + +@@ -385,13 +388,17 @@ + {StatsReport::kStatsValueNameFirsReceived, info.firs_received}, + {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height}, +- {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)}, ++ {StatsReport::kStatsValueNameFrameRateInput, ++ static_cast<int>(round(info.framerate_input))}, + {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent}, + {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width}, +- {StatsReport::kStatsValueNameNacksReceived, info.nacks_received}, ++ {StatsReport::kStatsValueNameNacksReceived, ++ static_cast<int>(info.nacks_received)}, + {StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, + {StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, + {StatsReport::kStatsValueNamePlisReceived, info.plis_received}, +- {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded}, +- {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent}, ++ {StatsReport::kStatsValueNameFramesEncoded, ++ static_cast<int>(info.frames_encoded)}, ++ {StatsReport::kStatsValueNameHugeFramesSent, ++ static_cast<int>(info.huge_frames_sent)}, + }; + +@@ -781,17 +788,23 @@ + + const Int64ForAdd int64s[] = { +- {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes}, +- {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes}, +- {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets}, +- {StatsReport::kStatsValueNameRtt, info.rtt}, ++ {StatsReport::kStatsValueNameBytesReceived, ++ static_cast<int64_t>(info.recv_total_bytes)}, ++ {StatsReport::kStatsValueNameBytesSent, ++ static_cast<int64_t>(info.sent_total_bytes)}, ++ {StatsReport::kStatsValueNamePacketsSent, ++ static_cast<int64_t>(info.sent_total_packets)}, ++ {StatsReport::kStatsValueNameRtt, static_cast<int64_t>(info.rtt)}, + {StatsReport::kStatsValueNameSendPacketsDiscarded, +- info.sent_discarded_packets}, ++ static_cast<int64_t>(info.sent_discarded_packets)}, + {StatsReport::kStatsValueNameSentPingRequestsTotal, +- info.sent_ping_requests_total}, ++ static_cast<int64_t>(info.sent_ping_requests_total)}, + {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse, +- info.sent_ping_requests_before_first_response}, +- {StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses}, +- {StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests}, +- {StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses}, ++ static_cast<int64_t>(info.sent_ping_requests_before_first_response)}, ++ {StatsReport::kStatsValueNameSentPingResponses, ++ static_cast<int64_t>(info.sent_ping_responses)}, ++ {StatsReport::kStatsValueNameRecvPingRequests, ++ static_cast<int64_t>(info.recv_ping_requests)}, ++ {StatsReport::kStatsValueNameRecvPingResponses, ++ static_cast<int64_t>(info.recv_ping_responses)}, + }; + for (const auto& i : int64s) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch new file mode 100644 index 000000000000..84dce821f80f --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch @@ -0,0 +1,12 @@ +TODO: merge with glx-headers patch in patchset, similar +issues that seem to stem from Qt's GLX restoration. + +https://bugs.gentoo.org/930107#c8 +--- a/src/3rdparty/chromium/ui/gl/gl_display.h ++++ b/src/3rdparty/chromium/ui/gl/gl_display.h +@@ -12,4 +12,5 @@ + + #include "ui/gl/gl_export.h" ++#include "ui/gl/gpu_preference.h" + + #if defined(USE_EGL) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch new file mode 100644 index 000000000000..2d12daccd224 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch @@ -0,0 +1,30 @@ +Patch status: pending being looked at upstream + +Issue[1][2][3] also exist in chromium itself[4], and unclear +why this started happening only with ninja-1.12.0 at the moment. + +Just a quickfix, likely not fully correct and seems there may +be further unresolved race issues. + +[1] https://bugs.gentoo.org/930107 +[2] https://bugreports.qt.io/browse/QTBUG-124375 +[3] https://github.com/ninja-build/ninja/issues/2417 +[4] https://bugs.gentoo.org/930112 +--- a/src/3rdparty/chromium/content/browser/BUILD.gn ++++ b/src/3rdparty/chromium/content/browser/BUILD.gn +@@ -198,2 +198,3 @@ + "//components/services/storage/public/mojom", ++ "//components/spellcheck:buildflags", + "//components/sqlite_proto", +--- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn ++++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn +@@ -22,2 +22,3 @@ + "//content/public/browser", ++ "//components/web_cache/public/mojom", + "//extensions/common", +--- a/src/core/configure/BUILD.root.gn.in ++++ b/src/core/configure/BUILD.root.gn.in +@@ -235,2 +235,3 @@ + deps = [ ++ "//chrome/app:generated_resources", + "//components/zoom", |