From 9dcbb21e50ca99331334c22d6019b43245b1e5f7 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 17:17:10 +0100 Subject: [PATCH] automatic version update by autodist [release 6.5.3-1mamba;Mon Oct 09 2023] --- qt6-qtwebengine-6.5.3-fix-build.patch | 312 ++++++++++++++++++++++++++ qt6-qtwebengine.spec | 18 +- 2 files changed, 324 insertions(+), 6 deletions(-) create mode 100644 qt6-qtwebengine-6.5.3-fix-build.patch diff --git a/qt6-qtwebengine-6.5.3-fix-build.patch b/qt6-qtwebengine-6.5.3-fix-build.patch new file mode 100644 index 0000000..52d9d39 --- /dev/null +++ b/qt6-qtwebengine-6.5.3-fix-build.patch @@ -0,0 +1,312 @@ +diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h +index 80c73feb9..d3921a6aa 100644 +--- a/src/3rdparty/chromium/base/debug/profiler.h ++++ b/src/3rdparty/chromium/base/debug/profiler.h +@@ -5,6 +5,7 @@ + #ifndef BASE_DEBUG_PROFILER_H_ + #define BASE_DEBUG_PROFILER_H_ + ++#include + #include + #include + +diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc +index 714bd5efe..cf0bb5fa9 100644 +--- a/src/3rdparty/chromium/cc/trees/target_property.cc ++++ b/src/3rdparty/chromium/cc/trees/target_property.cc +@@ -8,6 +8,8 @@ + + #include "ui/gfx/animation/keyframe/target_property.h" + ++#include ++ + namespace cc { + + static_assert(TargetProperty::LAST_TARGET_PROPERTY < +diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc +index c62a00ee0..af54520b7 100644 +--- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc ++++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc +@@ -6,6 +6,8 @@ + + #include "base/threading/platform_thread.h" + ++#include ++ + namespace device { + + OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {} +diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h +index b1a0d56ea..019bc0743 100644 +--- a/src/3rdparty/chromium/extensions/common/constants.h ++++ b/src/3rdparty/chromium/extensions/common/constants.h +@@ -12,6 +12,8 @@ + #include "build/chromeos_buildflags.h" + #include "extensions/common/extensions_export.h" + ++#include ++ + namespace extensions { + + // Scheme we serve extension content from. +diff --git a/src/3rdparty/chromium/gpu/config/gpu_util.h b/src/3rdparty/chromium/gpu/config/gpu_util.h +index 574aca1ff..fca32671c 100644 +--- a/src/3rdparty/chromium/gpu/config/gpu_util.h ++++ b/src/3rdparty/chromium/gpu/config/gpu_util.h +@@ -5,6 +5,8 @@ + #ifndef GPU_CONFIG_GPU_UTIL_H_ + #define GPU_CONFIG_GPU_UTIL_H_ + ++#include ++ + #include "build/build_config.h" + #include "gpu/config/gpu_feature_info.h" + #include "gpu/gpu_export.h" +diff --git a/src/3rdparty/chromium/net/base/parse_number.h b/src/3rdparty/chromium/net/base/parse_number.h +index ea360d1c9..dca84fd02 100644 +--- a/src/3rdparty/chromium/net/base/parse_number.h ++++ b/src/3rdparty/chromium/net/base/parse_number.h +@@ -10,6 +10,8 @@ + #include "base/strings/string_piece.h" + #include "net/base/net_export.h" + ++#include ++ + // This file contains utility functions for parsing numbers, in the context of + // network protocols. + // +diff --git a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h +index 7c0dcdecb..97054d476 100644 +--- a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h ++++ b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h +@@ -38,6 +38,10 @@ namespace pp { + /// As a further optimization, we can add support for this later. + class ThreadSafeThreadTraits { + public: ++ ++ typedef pp::Lock Lock; ++ typedef pp::AutoLock AutoLock; ++ + class RefCount { + public: + /// Default constructor. In debug mode, this checks that the object is being +@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits { + int32_t ref_; + }; + +- typedef pp::Lock Lock; +- typedef pp::AutoLock AutoLock; + }; + + /// The non-thread-safe version of thread traits. Using this class as the +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h +index 745b7b089..1e5dec4f5 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h +@@ -291,7 +291,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode + return state_.compositor_element_id; + } + +- const blink::DocumentTransitionSharedElementId& ++ const cc::DocumentTransitionSharedElementId& + DocumentTransitionSharedElementId() const { + return state_.document_transition_shared_element_id; + } +diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h +index c7e4f2b37..e491a1f68 100644 +--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h ++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h +@@ -33,6 +33,7 @@ + #include + #include + ++#include + #include + + #include "client/linux/handler/microdump_extra_info.h" +diff --git a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h +index 6cec3b6b8..541bba5b1 100644 +--- a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h ++++ b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h +@@ -15,6 +15,7 @@ + #ifndef SRC_DAWN_NATIVE_CACHEKEY_H_ + #define SRC_DAWN_NATIVE_CACHEKEY_H_ + ++#include + #include + + #include "dawn/native/stream/ByteVectorSink.h" +diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h +index 90077421d..f303f9e8b 100644 +--- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h ++++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h +@@ -15,6 +15,7 @@ + #ifndef SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_ + #define SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_ + ++#include + #include + + #include "src/tint/ast/pipeline_stage.h" +diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h +index 7a20e8738..655f69ce3 100644 +--- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h ++++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h +@@ -15,6 +15,7 @@ + #ifndef SRC_TINT_READER_SPIRV_NAMER_H_ + #define SRC_TINT_READER_SPIRV_NAMER_H_ + ++#include + #include + #include + #include +diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h +index 8e0306b6a..0fc0cc2b0 100644 +--- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h ++++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h +@@ -15,6 +15,7 @@ + #ifndef SRC_TINT_READER_WGSL_LEXER_H_ + #define SRC_TINT_READER_WGSL_LEXER_H_ + ++#include + #include + #include + +diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h +index 4cf9aad1b..3fa13e216 100644 +--- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h ++++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h +@@ -15,6 +15,7 @@ + #ifndef SRC_TINT_READER_WGSL_TOKEN_H_ + #define SRC_TINT_READER_WGSL_TOKEN_H_ + ++#include + #include + #include + #include +diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h b/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h +index 0601ca068..ac9dde64e 100644 +--- a/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h ++++ b/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h +@@ -15,6 +15,7 @@ + #ifndef SRC_TINT_WRITER_SPIRV_OPERAND_H_ + #define SRC_TINT_WRITER_SPIRV_OPERAND_H_ + ++#include + #include + #include + #include +diff --git a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc +index a3099e15d..2e6f0eea7 100644 +--- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc ++++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h +index d047de1bf..d7fc91a59 100644 +--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h ++++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h +@@ -21,6 +21,8 @@ + #include "perfetto/trace_processor/status.h" + #include "src/trace_processor/importers/common/trace_parser.h" + ++#include ++ + namespace perfetto { + + namespace protos { +diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp +index 0101632c5..3f04a2dd2 100644 +--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp ++++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp +@@ -15,6 +15,10 @@ + #include + #include + ++#include ++#include ++#include ++ + static constexpr const char* gColorNames[] = { + "aliceblue", + "antiquewhite", +diff --git a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +index 9e073d4e1..da96f327c 100644 +--- a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h ++++ b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +@@ -105,6 +105,8 @@ Documentation of all members: vk_mem_alloc.h + - [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator) + */ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif +diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h +index b70ac4aa5..7ba555564 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h ++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h +@@ -13,6 +13,7 @@ + + #include + ++#include + #include + + namespace webrtc { +diff --git a/src/3rdparty/chromium/ui/events/gesture_event_details.h b/src/3rdparty/chromium/ui/events/gesture_event_details.h +index 41ff9906d..1864e9e21 100644 +--- a/src/3rdparty/chromium/ui/events/gesture_event_details.h ++++ b/src/3rdparty/chromium/ui/events/gesture_event_details.h +@@ -5,6 +5,7 @@ + #ifndef UI_EVENTS_GESTURE_EVENT_DETAILS_H_ + #define UI_EVENTS_GESTURE_EVENT_DETAILS_H_ + ++#include + #include + + #include "base/check_op.h" +diff --git a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h +index ab0ce5808..9a9f187bb 100644 +--- a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h ++++ b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h +@@ -5,6 +5,7 @@ + #ifndef UI_GFX_LINEAR_GRADIENT_H_ + #define UI_GFX_LINEAR_GRADIENT_H_ + ++#include + #include + #include + #include +diff --git a/src/3rdparty/chromium/v8/src/base/macros.h b/src/3rdparty/chromium/v8/src/base/macros.h +index cd5b91f74..a74c0021f 100644 +--- a/src/3rdparty/chromium/v8/src/base/macros.h ++++ b/src/3rdparty/chromium/v8/src/base/macros.h +@@ -5,6 +5,7 @@ + #ifndef V8_BASE_MACROS_H_ + #define V8_BASE_MACROS_H_ + ++#include + #include + #include + +diff --git a/src/core/browsing_data_remover_delegate_qt.h b/src/core/browsing_data_remover_delegate_qt.h +index a611a710c..67743f52b 100644 +--- a/src/core/browsing_data_remover_delegate_qt.h ++++ b/src/core/browsing_data_remover_delegate_qt.h +@@ -8,6 +8,8 @@ + + #include "content/public/browser/browsing_data_remover_delegate.h" + ++#include ++ + namespace QtWebEngineCore { + + class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate { diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 0ac826b..4898937 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -1,6 +1,6 @@ %define majver %(echo %version | cut -d. -f1-2) Name: qt6-qtwebengine -Version: 6.5.2 +Version: 6.5.3 Release: 1mamba Summary: Qt6 WebEngine component Group: System/Libraries @@ -11,6 +11,7 @@ URL: https://www.qt.io/ Source: https://download.qt.io/official_releases/qt/%{majver}/%{version}/submodules/qtwebengine-everywhere-src-%{version}.tar.xz Patch0: qt6-qtwebengine-6.2.3-ffmpeg-5.0.patch Patch1: qt6-qtwebengine-6.3.0-icu-71.1.patch +Patch2: qt6-qtwebengine-6.5.3-fix-build.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -48,7 +49,6 @@ BuildRequires: libopenjpeg-devel BuildRequires: libopus-devel BuildRequires: libpci-devel BuildRequires: libpng-devel -BuildRequires: libre2-devel BuildRequires: libsnappy-devel BuildRequires: libstdc++6-devel BuildRequires: libvpx-devel @@ -84,13 +84,13 @@ This package contains libraries and header files for developing applications tha %global __spec_rmbuild_cmd /bin/true %prep -%setup -q -n qtwebengine-everywhere-src-%{version} -#-D -T -#:<< _EOF +%setup -q -n qtwebengine-everywhere-src-%{version} -D -T +:<< _EOF #cd src/3rdparty #%patch0 -p1 -b .ffmpeg-5.0 #%patch1 -p1 -b .icu-71.1 #cd ../.. +%patch 2 -p1 -b .fix-build %build #:<< _EOF @@ -115,7 +115,10 @@ export CXXFLAGS+="%{optflags} -fPIC -fno-delete-null-pointer-checks -fno-lifetim -DQT_FEATURE_webengine_proprietary_codecs=ON \ -DQT_FEATURE_webengine_kerberos=ON \ -DQT_FEATURE_webengine_webrtc_pipewire=ON \ - -DQT_FEATURE_webengine_full_debug_info=ON + -DQT_FEATURE_webengine_full_debug_info=ON \ + -DQT_FEATURE_webengine_system_re2=OFF + +# 6.5.3: not using system_re2 due to compilation errors cmake --build . @@ -179,6 +182,9 @@ DESTDIR="%{buildroot}" cmake --install build %{_libdir}/pkgconfig/Qt6*.pc %changelog +* Mon Oct 09 2023 Automatic Build System 6.5.3-1mamba +- automatic version update by autodist + * Mon Jul 24 2023 Automatic Build System 6.5.2-1mamba - automatic version update by autodist