commit 67b8367c15bfa519c31f3b3a5c75237bb90d1df6
Author: Jan Palus <at...@pld-linux.org>
Date: Sat Jan 18 22:57:19 2025 +0100
add patch to fix build with icu >= 75 (from arch)
icu75.patch | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++
qt5-qtwebengine.spec | 20 ++++++-----
2 files changed, 110 insertions(+), 9 deletions(-)
---
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index b555d0d..f92f503 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -30,6 +30,7 @@ Patch5: chromium-107-proprietary-codecs.patch
Patch6: chromium-112-ffmpeg-first_dts.patch
Patch7: ninja-1.12.patch
Patch8: system-ffmpeg-check.patch
+Patch9: icu75.patch
URL: https://www.qt.io/
BuildRequires: Qt5Core-devel >= %{qtbase_ver}
BuildRequires: Qt5Designer-devel >= %{qttools_ver}
@@ -67,7 +68,7 @@ BuildRequires: libevent-devel
BuildRequires: libicu-devel >= 65
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel >= 2:1.6.0
-BuildRequires: libstdc++-devel >= 6:5
+BuildRequires: libstdc++-devel >= 6:8
%{?with_system_libvpx:BuildRequires: libvpx-devel >= 1.8.0}
BuildRequires: libwebp-devel
BuildRequires: libxcb-devel
@@ -286,17 +287,18 @@ Przykłady do biblioteki Qt5 WebEngine.
%prep
%setup -q -n qtwebengine
%ifarch x32
-%patch0 -p1
+%patch -P0 -p1
%endif
-%patch1 -p1
-%patch4 -p1 -d src/3rdparty
-%patch5 -p1 -d src/3rdparty/chromium
+%patch -P1 -p1
+%patch -P4 -p1 -d src/3rdparty
+%patch -P5 -p1 -d src/3rdparty/chromium
%if %{_ver_ge %ffmpeg_ver 5}
-%patch3 -p1 -d src/3rdparty
-%patch6 -p1 -d src/3rdparty/chromium
-%patch8 -p1 -R
+%patch -P3 -p1 -d src/3rdparty
+%patch -P6 -p1 -d src/3rdparty/chromium
+%patch -P8 -p1 -R
%endif
-%patch7 -p1 -d src/3rdparty
+%patch -P7 -p1 -d src/3rdparty
+%patch -P9 -p1 -d src/3rdparty
%if %{without system_re2}
# avoid finding system re2
diff --git a/icu75.patch b/icu75.patch
new file mode 100644
index 0000000..6178a2c
--- /dev/null
+++ b/icu75.patch
@@ -0,0 +1,99 @@
+diff --git a/chromium/build/config/compiler/BUILD.gn
b/chromium/build/config/compiler/BUILD.gn
+index b511a58c5a8..abd78a74ead 100644
+--- a/chromium/build/config/compiler/BUILD.gn
++++ b/chromium/build/config/compiler/BUILD.gn
+@@ -566,7 +566,7 @@ config("compiler") {
+ # Override Chromium's default for projects that wish to stay on C++11.
+ cflags_cc += [ "-std=${standard_prefix}++11" ]
+ } else {
+- cflags_cc += [ "-std=${standard_prefix}++14" ]
++ cflags_cc += [ "-std=${standard_prefix}++17" ]
+ }
+ } else if (!is_win && !is_nacl) {
+ 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
+index f03ba1e4ab4..b1495f7ae74 100644
+--- a/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
++++ b/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
+@@ -195,7 +195,7 @@ NumPartitionPagesPerSuperPage() {
+ //
+ // __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on
all
+ // platforms, as Chrome's requirement is C++14 as of 2020.
+-#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
++#if 0
+ static constexpr size_t kAlignment =
+ std::max(alignof(std::max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__);
+ #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
+index 76e627d27a3..942435f44a0 100644
+--- a/chromium/third_party/webrtc/common_video/h264/sps_parser.h
++++ b/chromium/third_party/webrtc/common_video/h264/sps_parser.h
+@@ -12,6 +12,7 @@
+ #define COMMON_VIDEO_H264_SPS_PARSER_H_
+
+ #include "absl/types/optional.h"
++#include <cstdint>
+
+ namespace rtc {
+ 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
+index d6c31b06887..d8852dfd186 100644
+--- a/chromium/third_party/webrtc/common_video/h264/pps_parser.h
++++ b/chromium/third_party/webrtc/common_video/h264/pps_parser.h
+@@ -12,6 +12,7 @@
+ #define COMMON_VIDEO_H264_PPS_PARSER_H_
+
+ #include "absl/types/optional.h"
++#include <cstdint>
+
+ namespace rtc {
+ 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
+index 3b9971abae1..d4458038527 100644
+---
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
+@@ -13,6 +13,7 @@
+
+ #include <array>
+ #include <vector>
++#include <memory>
+
+ #include "absl/types/optional.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
+index 345e45ce127..e686e5d691a 100644
+--- a/chromium/third_party/webrtc/modules/include/module_common_types_public.h
++++ b/chromium/third_party/webrtc/modules/include/module_common_types_public.h
+@@ -12,6 +12,7 @@
+ #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
+
+ #include <limits>
++#include <cstdint>
+
+ #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
+index 8fcc799b795..bc69ddcf18c 100644
+---
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
+@@ -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_finder.h"
+ #include "third_party/blink/renderer/platform/text/text_boundaries.h"
++#include "absl/base/attributes.h"
+
+ namespace blink {
+
+diff --git a/chromium/third_party/abseil-cpp/absl/base/options.h
b/chromium/third_party/abseil-cpp/absl/base/options.h
+index df506f0fae6..1de105fed4a 100644
+--- a/chromium/third_party/abseil-cpp/absl/base/options.h
++++ b/chromium/third_party/abseil-cpp/absl/base/options.h
+@@ -180,7 +180,7 @@
+ // absl::variant is a typedef of std::variant, use the feature macro
+ // ABSL_USES_STD_VARIANT.
+
+-#define ABSL_OPTION_USE_STD_VARIANT 2
++#define ABSL_OPTION_USE_STD_VARIANT 0
+
+
+ // ABSL_OPTION_USE_INLINE_NAMESPACE
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/67b8367c15bfa519c31f3b3a5c75237bb90d1df6
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
