diff --git a/.gitattributes b/.gitattributes index d87f5613ec4234f82f8eaeebc563711f587fdf88..7b9c435250b6944e546d4acd48a5fd0ae2f686eb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -*.xz filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/pulseaudio-12.2-headers.tar.gz b/pulseaudio-12.2-headers.tar.gz index 251e70e17ed15010f523ab92b0a997fecd389900..4f9a12be3997febe2923143cf1a465189e240305 100644 Binary files a/pulseaudio-12.2-headers.tar.gz and b/pulseaudio-12.2-headers.tar.gz differ diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index aa195bc6a6776d59e96954b579c4b71bb99c7deb..641ccdc00744c0012e749c3a3e640b57c1eb788b 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -37,7 +37,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine -Version: 6.9.2 +Version: 6.10.0 Release: 1 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details @@ -64,10 +64,6 @@ Patch2: qtwebengine-link-pipewire.patch # Fix/workaround FTBFS on aarch64 with newer glibc Patch3: qtwebengine-aarch64-new-stat.patch -# FTBS warning: elaborated-type-specifier for a scoped enum must not -# use the 'class' keyword -Patch50: qtwebengine-fix-build.patch - ## Upstream patches: # https://bugreports.qt.io/browse/QTBUG-129985 Patch80: qtwebengine-fix-arm-build.patch @@ -91,11 +87,13 @@ BuildRequires: qt6-qtbase-private-devel # TODO: check of = is really needed or if >= would be good enough -- rex %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel >= %{qtbase_version} +BuildRequires: qt6-qthttpserver-devel >= %{qtbase_version} BuildRequires: qt6-qtlocation-devel >= %{qtbase_version} BuildRequires: qt6-qtsensors-devel >= %{qtbase_version} BuildRequires: qt6-qtsvg-devel >= %{qtbase_version} BuildRequires: qt6-qttools-static >= %{qtbase_version} BuildRequires: qt6-qtwebchannel-devel >= %{qtbase_version} +BuildRequires: qt6-qtwebsockets-devel >= %{qtbase_version} # for examples? BuildRequires: ninja-build BuildRequires: cmake @@ -191,7 +189,7 @@ Requires: qt6-qtpdf%{?_isa} = %{version}-%{release} # Of course, Chromium itself is bundled. It cannot be unbundled because it is # not a library, but forked (modified) application code. -Provides: bundled(chromium) = 130.0.6723.192 +Provides: bundled(chromium) = 134.0.6998.208 # Bundled in src/3rdparty/chromium/third_party: # Check src/3rdparty/chromium/third_party/*/README.chromium for version numbers, @@ -274,8 +272,8 @@ Provides: bundled(nsURLParsers) # Bundled outside of third_party, apparently not considered as such by Chromium: Provides: bundled(mojo) -# see src/3rdparty/chromium/v8/include/v8_version.h for the version number -Provides: bundled(v8) = 13.0.245.25 +# see src/3rdparty/chromium/v8/include/v8-version.h for the version number +Provides: bundled(v8) = 13.4.114.21 # bundled by v8 (src/3rdparty/chromium/v8/src/base/ieee754.cc) # The version number is 5.3, the last version that upstream released, years ago: # http://www.netlib.org/fdlibm/readme @@ -376,7 +374,7 @@ cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium %build export STRIP=strip -export NINJAFLAGS="%{__ninja_common_opts}" +export NINJAFLAGS="%{__ninja_common_opts} %{limit_build -m 2048}" export NINJA_PATH=%{__ninja} export LDFLAGS="%{build_ldflags} -Wl,--no-keep-memory" %define _lto_cflags %{nil} @@ -440,7 +438,7 @@ export LDFLAGS="%{build_ldflags} -Wl,--no-keep-memory" -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} -%cmake_build +%cmake_build %{limit_build -m 2048} %if %{with doc} %cmake_build --target docs @@ -665,6 +663,9 @@ done %changelog +* Wed Oct 08 2025 Funda Wang - 6.10.0-1 +- update to 6.10.0 + * Tue Aug 26 2025 Funda Wang - 6.9.2-1 - update to 6.9.2 diff --git a/qtwebengine-everywhere-src-6.9.2.tar.xz b/qtwebengine-everywhere-src-6.10.0.tar.xz similarity index 32% rename from qtwebengine-everywhere-src-6.9.2.tar.xz rename to qtwebengine-everywhere-src-6.10.0.tar.xz index c59d8f7f7509116a9ccc108c79f6e7bf700bd17b..d553d09256397ac080e80080d9510318fa534f8b 100644 --- a/qtwebengine-everywhere-src-6.9.2.tar.xz +++ b/qtwebengine-everywhere-src-6.10.0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99cb0792abc2e39b299d73d8e2aa076b9ebcd55c3f4a4b5fd514eef5a62d03ab -size 672191852 +oid sha256:c44c77b11c30f9d11b423d0a38debe272cdec5883b5e54703eb1f7e96651c51c +size 881130500 diff --git a/qtwebengine-fix-build.patch b/qtwebengine-fix-build.patch deleted file mode 100644 index 192a202b2f6a5b6b7e2ec177d18ba4c2dab7df76..0000000000000000000000000000000000000000 --- a/qtwebengine-fix-build.patch +++ /dev/null @@ -1,227 +0,0 @@ -diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h -index 035affc7c..d8e1a5346 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 7d73467a9..be4febd9a 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 63af22b65..916d45a36 100644 ---- a/src/3rdparty/chromium/extensions/common/constants.h -+++ b/src/3rdparty/chromium/extensions/common/constants.h -@@ -13,6 +13,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 64d531be0..cc370a4bf 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 f70619a75..5c4eee7f6 100644 ---- a/src/3rdparty/chromium/net/base/parse_number.h -+++ b/src/3rdparty/chromium/net/base/parse_number.h -@@ -10,6 +10,8 @@ - - #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/dawn/src/dawn/native/CacheKey.h b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h -index a65ea9a2a..ba967c018 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 -@@ -28,6 +28,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/libgav1/src/src/utils/threadpool.cc b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc -index 6fa2e8864..6b942abdf 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 -@@ -31,6 +31,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 c8375dc69..8f290c302 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 -@@ -27,6 +27,8 @@ - #include "src/trace_processor/importers/common/trace_parser.h" - #include "src/trace_processor/importers/proto/packet_sequence_state_generation.h" - -+#include -+ - namespace perfetto { - - namespace protos::pbzero { -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 ae6a412fd..5fe0370ec 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 0bbfeedb1..91f19f83e 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 -@@ -122,6 +122,8 @@ See documentation chapter: \ref statistics. - */ - - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif -diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h b/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h -index ab52508c2..050229a2f 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/portal/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 b4f797bca..95b144fd1 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 7239ed516..975b88c51 100644 ---- a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -+++ b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -@@ -7,6 +7,7 @@ - - #include - -+#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 488729dd5..d497f123d 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 d33af4acb..ce864b6bd 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 {