Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16218 from Rmys/master

Browse Source 
qt5-webengine ver. bump
This commit is contained in:
Rmys
2025-02-24 18:55:44 +03:00
committed by GitHub
parent 6f989cb1ab 9ebef31ba6
commit c6a4daeb05
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-webengine/files/qt5-webengine-icu-75.patch
+24 -24
View File
@@ -1,7 +1,7 @@
diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
index b511a58c5a8..abd78a74ead 100644 index b511a58c5a8..abd78a74ead 100644
--- a/chromium/build/config/compiler/BUILD.gn --- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn +++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
@@ -566,7 +566,7 @@ config("compiler") { @@ -566,7 +566,7 @@ config("compiler") {
# Override Chromium's default for projects that wish to stay on C++11. # Override Chromium's default for projects that wish to stay on C++11.
cflags_cc += [ "-std=${standard_prefix}++11" ] cflags_cc += [ "-std=${standard_prefix}++11" ]
@@ -11,10 +11,10 @@ index b511a58c5a8..abd78a74ead 100644
} }
} else if (!is_win && !is_nacl) { } else if (!is_win && !is_nacl) {
if (target_os == "android") { if (target_os == "android") {
diff --git a/chromium/base/allocator/partition_allocator/partition_alloc_constants.h b/chromium/base/allocator/partition_allocator/partition_alloc_constants.h diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
index f03ba1e4ab4..b1495f7ae74 100644 index f03ba1e4ab4..b1495f7ae74 100644
--- a/chromium/base/allocator/partition_allocator/partition_alloc_constants.h --- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
+++ b/chromium/base/allocator/partition_allocator/partition_alloc_constants.h +++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
@@ -195,7 +195,7 @@ NumPartitionPagesPerSuperPage() { @@ -195,7 +195,7 @@ NumPartitionPagesPerSuperPage() {
// //
// __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all // __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all
@@ -24,10 +24,10 @@ index f03ba1e4ab4..b1495f7ae74 100644
static constexpr size_t kAlignment = static constexpr size_t kAlignment =
std::max(alignof(std::max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__); std::max(alignof(std::max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__);
#else #else
diff --git a/chromium/third_party/webrtc/common_video/h264/sps_parser.h b/chromium/third_party/webrtc/common_video/h264/sps_parser.h diff --git a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
index 76e627d27a3..942435f44a0 100644 index 76e627d27a3..942435f44a0 100644
--- a/chromium/third_party/webrtc/common_video/h264/sps_parser.h --- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
+++ b/chromium/third_party/webrtc/common_video/h264/sps_parser.h +++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
#define COMMON_VIDEO_H264_SPS_PARSER_H_ #define COMMON_VIDEO_H264_SPS_PARSER_H_
@@ -36,10 +36,10 @@ index 76e627d27a3..942435f44a0 100644
namespace rtc { namespace rtc {
class BitBuffer; class BitBuffer;
diff --git a/chromium/third_party/webrtc/common_video/h264/pps_parser.h b/chromium/third_party/webrtc/common_video/h264/pps_parser.h diff --git a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
index d6c31b06887..d8852dfd186 100644 index d6c31b06887..d8852dfd186 100644
--- a/chromium/third_party/webrtc/common_video/h264/pps_parser.h --- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
+++ b/chromium/third_party/webrtc/common_video/h264/pps_parser.h +++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
#define COMMON_VIDEO_H264_PPS_PARSER_H_ #define COMMON_VIDEO_H264_PPS_PARSER_H_
@@ -48,10 +48,10 @@ index d6c31b06887..d8852dfd186 100644
namespace rtc { namespace rtc {
class BitBuffer; class BitBuffer;
diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
index 3b9971abae1..d4458038527 100644 index 3b9971abae1..d4458038527 100644
--- a/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h --- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
+++ b/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h +++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
#include <array> #include <array>
@@ -60,10 +60,10 @@ index 3b9971abae1..d4458038527 100644
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/array_view.h" #include "api/array_view.h"
diff --git a/chromium/third_party/webrtc/modules/include/module_common_types_public.h b/chromium/third_party/webrtc/modules/include/module_common_types_public.h diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
index 345e45ce127..e686e5d691a 100644 index 345e45ce127..e686e5d691a 100644
--- a/chromium/third_party/webrtc/modules/include/module_common_types_public.h --- a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
+++ b/chromium/third_party/webrtc/modules/include/module_common_types_public.h +++ b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
#define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
@@ -72,10 +72,10 @@ index 345e45ce127..e686e5d691a 100644
#include "absl/types/optional.h" #include "absl/types/optional.h"
diff --git a/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc b/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
index 8fcc799b795..bc69ddcf18c 100644 index 8fcc799b795..bc69ddcf18c 100644
--- a/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc --- a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
+++ b/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc +++ b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
#include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics.h" #include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics.h"
#include "third_party/blink/renderer/core/page/scrolling/text_fragment_finder.h" #include "third_party/blink/renderer/core/page/scrolling/text_fragment_finder.h"
@@ -84,10 +84,10 @@ index 8fcc799b795..bc69ddcf18c 100644
namespace blink { namespace blink {
diff --git a/chromium/third_party/abseil-cpp/absl/base/options.h b/chromium/third_party/abseil-cpp/absl/base/options.h diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
index df506f0fae6..1de105fed4a 100644 index df506f0fae6..1de105fed4a 100644
--- a/chromium/third_party/abseil-cpp/absl/base/options.h --- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
+++ b/chromium/third_party/abseil-cpp/absl/base/options.h +++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
@@ -180,7 +180,7 @@ @@ -180,7 +180,7 @@
// absl::variant is a typedef of std::variant, use the feature macro // absl::variant is a typedef of std::variant, use the feature macro
// ABSL_USES_STD_VARIANT. // ABSL_USES_STD_VARIANT.
desktop/toolkit/qt5/qt5-webengine/pspec.xml
+1 -1
View File
@@ -89,7 +89,7 @@
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">007-gcc12-includes.patch</Patch> <Patch level="1">007-gcc12-includes.patch</Patch>
<!-- <Patch level="1">qt5-webengine-icu-75.patch</Patch> --> <Patch level="1">qt5-webengine-icu-75.patch</Patch>
</Patches> </Patches>
</Source> </Source>