From 59b334d37d0f7ca8a9a0d5875352ab1f316b7304 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 26 Jan 2023 10:26:28 +0100 Subject: [PATCH 1/9] Rebuild for Qt 6.4.2 update --- qt6-qtwebengine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index b70f094..1e489ca 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -50,7 +50,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine Version: 6.4.2 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -614,5 +614,8 @@ done %changelog +* Thu Jan 26 2023 Jan Grulich - 6.4.2-2 +- Rebuild for Qt 6.4.2 update + * Mon Jan 16 2023 Jan Grulich - 6.4.2 - Initial package From 5cad61b2fba7fa30ba3b03c4c1367b5b0c1a0b7b Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Sun, 26 Feb 2023 22:01:59 +0100 Subject: [PATCH 2/9] Rebuild for freetype-2.13.0 --- qt6-qtwebengine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 8e44381..dc7ff2f 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -44,7 +44,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine Version: 6.4.2 -Release: 2%{?dist} +Release: 3%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -598,6 +598,9 @@ done %changelog +* Sun Feb 26 2023 Marek Kasik - 6.4.2-3 +- Rebuild for freetype-2.13.0 + * Wed Feb 15 2023 Tom Callaway - 6.4.2-2 - rebuild for libvpx From 1ecc43b03e8c6af66acc9548970a6c6707c53f71 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 12 Mar 2023 13:35:33 -0400 Subject: [PATCH 3/9] Rebuild for ffmpeg 6.0 --- qt6-qtwebengine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index dc7ff2f..71f7339 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -44,7 +44,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine Version: 6.4.2 -Release: 3%{?dist} +Release: 4%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -598,6 +598,9 @@ done %changelog +* Sun Mar 12 2023 Neal Gompa - 6.4.2-4 +- Rebuild for ffmpeg 6.0 + * Sun Feb 26 2023 Marek Kasik - 6.4.2-3 - Rebuild for freetype-2.13.0 From 94878c13b725d063b3056591e0604c812bcc3be4 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 27 Mar 2023 14:21:19 +0200 Subject: [PATCH 4/9] Fix bad merge --- qt6-qtwebengine.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index f9194e9..abaee2e 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -43,13 +43,8 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine -<<<<<<< HEAD -Version: 6.4.2 -Release: 4%{?dist} -======= Version: 6.4.3 Release: 1%{?dist} ->>>>>>> rawhide # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html From 0a649da59a3507b5ed30406c7292f9ff14afe6e8 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 27 Mar 2023 14:55:25 +0200 Subject: [PATCH 5/9] Fix changelog --- qt6-qtwebengine.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index abaee2e..5186a59 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -599,9 +599,6 @@ done %changelog -* Sun Mar 12 2023 Neal Gompa - 6.4.2-4 -- Rebuild for ffmpeg 6.0 - * Fri Mar 24 2023 Jan Grulich - 6.4.3-1 - 6.4.3 From eb5f15735fbd61ff19be6d360ac63cdff1480e95 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 5 Apr 2023 07:27:51 +0200 Subject: [PATCH 6/9] 6.5.0 --- .gitignore | 1 + clean_qtwebengine.sh | 2 +- qt6-qtwebengine.spec | 21 ++-- qtwebengine-fix-build.patch | 154 ++++++++++++--------------- qtwebengine-webrtc-dlopen-h264.patch | 76 ++++++------- sources | 3 +- 6 files changed, 121 insertions(+), 136 deletions(-) diff --git a/.gitignore b/.gitignore index a03cc4e..f143edd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qtwebengine-everywhere-src-6.4.2-clean.tar.xz /pulseaudio-12.2-headers.tar.gz /qtwebengine-everywhere-src-6.4.3-clean.tar.xz +/qtwebengine-everywhere-src-6.5.0-clean.tar.xz diff --git a/clean_qtwebengine.sh b/clean_qtwebengine.sh index f2e5a7f..be31c24 100755 --- a/clean_qtwebengine.sh +++ b/clean_qtwebengine.sh @@ -21,7 +21,7 @@ if [ -z "$1" ] ; then echo "usage: ./clean_qtwebengine.sh VERSION" - echo "e.g.: ./clean_qtwebengine.sh 6.4.3" + echo "e.g.: ./clean_qtwebengine.sh 6.5.0" exit 1 fi diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 288478d..893a862 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -43,7 +43,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine -Version: 6.4.3 +Version: 6.5.0 Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details @@ -360,12 +360,12 @@ cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium # consider doing this as part of the tarball creation step instead? rdieter # fix/workaround # fatal error: QtWebEngineCore/qtwebenginecoreglobal.h: No such file or directory -if [ ! -f "./include/QtWebEngineCore/qtwebenginecoreglobal.h" ]; then -%_qt6_bindir/syncqt.pl -version %{version} -fi - -# abort if this doesn't get created by syncqt.pl -test -f "./include/QtWebEngineCore/qtwebenginecoreglobal.h" +# if [ ! -f "./include/QtWebEngineCore/qtwebenginecoreglobal.h" ]; then +# {_qt6_libexecdir}/syncqt -version {version} +# fi +# +# # abort if this doesn't get created by syncqt.pl +# test -f "./include/QtWebEngineCore/qtwebenginecoreglobal.h" %build @@ -527,7 +527,6 @@ done %files devel %{_rpmmacrodir}/macros.qt6-qtwebengine -%{_qt6_datadir}/modules/*.json %dir %{_qt6_headerdir}/QtPdf %{_qt6_headerdir}/QtPdf/* %dir %{_qt6_headerdir}/QtPdfQuick @@ -540,7 +539,8 @@ done %{_qt6_headerdir}/QtWebEngineQuick/* %dir %{_qt6_headerdir}/QtWebEngineWidgets %{_qt6_headerdir}/QtWebEngineWidgets/* -%{_qt6_libdir}/metatypes/*.json +%{_qt6_libdir}/qt6/metatypes/*.json +%{_qt6_libdir}/qt6/modules/*.json %{_qt6_libdir}/libQt6Pdf.so %{_qt6_libdir}/libQt6PdfQuick.so %{_qt6_libdir}/libQt6PdfWidgets.so @@ -599,6 +599,9 @@ done %changelog +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + * Fri Mar 24 2023 Jan Grulich - 6.4.3-1 - 6.4.3 diff --git a/qtwebengine-fix-build.patch b/qtwebengine-fix-build.patch index 80a4f2f..4ce1d03 100644 --- a/qtwebengine-fix-build.patch +++ b/qtwebengine-fix-build.patch @@ -1,5 +1,5 @@ diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h -index 1229e0623..c7ed55e70 100644 +index 5f0deadd5..803de8f2b 100644 --- a/src/3rdparty/chromium/base/debug/profiler.h +++ b/src/3rdparty/chromium/base/debug/profiler.h @@ -5,6 +5,7 @@ @@ -11,7 +11,7 @@ index 1229e0623..c7ed55e70 100644 #include diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc -index 96f8c3bd7..c3f087b1a 100644 +index f6e873a01..5f952c5ed 100644 --- a/src/3rdparty/chromium/cc/trees/target_property.cc +++ b/src/3rdparty/chromium/cc/trees/target_property.cc @@ -6,6 +6,8 @@ @@ -24,7 +24,7 @@ index 96f8c3bd7..c3f087b1a 100644 static_assert(TargetProperty::LAST_TARGET_PROPERTY < diff --git a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h -index 2aba73ebc..2e028fddc 100644 +index b39a2d3dc..ca3d8aeda 100644 --- a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h +++ b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h @@ -5,6 +5,7 @@ @@ -36,7 +36,7 @@ index 2aba73ebc..2e028fddc 100644 #include diff --git a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h -index 3069c858d..f4614b73c 100644 +index ee75332f0..c0168281e 100644 --- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h +++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h @@ -5,6 +5,7 @@ @@ -48,7 +48,7 @@ index 3069c858d..f4614b73c 100644 #include #include "base/callback_forward.h" 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 80fd26f4f..dc67a7598 100644 +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 @@ @@ -60,8 +60,20 @@ index 80fd26f4f..dc67a7598 100644 namespace device { OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {} +diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h +index 528b6683c..e37a16b81 100644 +--- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h ++++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h +@@ -6,6 +6,7 @@ + #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_ + + #include ++#include + #include + + #include "base/atomicops.h" diff --git a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h -index 3cf2914e1..4b0552440 100644 +index 816d3405e..15c4004c0 100644 --- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h +++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h @@ -5,6 +5,7 @@ @@ -73,7 +85,7 @@ index 3cf2914e1..4b0552440 100644 #include #include diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h -index 9ac68e2be..ef2761020 100644 +index bf6bac2b4..51c534509 100644 --- a/src/3rdparty/chromium/extensions/common/constants.h +++ b/src/3rdparty/chromium/extensions/common/constants.h @@ -10,6 +10,8 @@ @@ -86,7 +98,7 @@ index 9ac68e2be..ef2761020 100644 // Scheme we serve extension content from. diff --git a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -index 027f1a5af..70759b2ae 100644 +index 1a7028e47..b9e951c0a 100644 --- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h +++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h @@ -5,6 +5,7 @@ @@ -98,7 +110,7 @@ index 027f1a5af..70759b2ae 100644 #include diff --git a/src/3rdparty/chromium/gpu/config/gpu_util.h b/src/3rdparty/chromium/gpu/config/gpu_util.h -index f72970c67..d7f0b7d49 100644 +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 @@ @@ -111,7 +123,7 @@ index f72970c67..d7f0b7d49 100644 #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 4e49ab711..328045be6 100644 +index d6adf388e..560e692aa 100644 --- a/src/3rdparty/chromium/net/base/parse_number.h +++ b/src/3rdparty/chromium/net/base/parse_number.h @@ -8,6 +8,8 @@ @@ -124,7 +136,7 @@ index 4e49ab711..328045be6 100644 // network protocols. // diff --git a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h -index 2e9c319a3..4d723d18f 100644 +index 5f289ddcd..44f2f9eb1 100644 --- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h +++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h @@ -6,6 +6,7 @@ @@ -160,7 +172,7 @@ index 52f150172..db4d31084 100644 #include diff --git a/src/3rdparty/chromium/pdf/document_attachment_info.h b/src/3rdparty/chromium/pdf/document_attachment_info.h -index 138ca2efe..08f06e7b8 100644 +index e0fffc2ca..095463fcb 100644 --- a/src/3rdparty/chromium/pdf/document_attachment_info.h +++ b/src/3rdparty/chromium/pdf/document_attachment_info.h @@ -5,6 +5,7 @@ @@ -172,7 +184,7 @@ index 138ca2efe..08f06e7b8 100644 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 b4fdb9a6d..375d3ef32 100644 +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 { @@ -196,7 +208,7 @@ index b4fdb9a6d..375d3ef32 100644 /// The non-thread-safe version of thread traits. Using this class as the diff --git a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -index 0aad3ac78..3571b8a0f 100644 +index b167ffb09..2347d5461 100644 --- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h +++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h @@ -6,6 +6,7 @@ @@ -207,20 +219,8 @@ index 0aad3ac78..3571b8a0f 100644 #include #include "sandbox/sandbox_export.h" -diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h -index c47536d63..55e8ac882 100644 ---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h -+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h -@@ -19,6 +19,7 @@ - #include - - #include -+#include - #include - #include - diff --git a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -index 18175e15c..9edfd8f6a 100644 +index 4b76d33af..4db1902d1 100644 --- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h +++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h @@ -12,6 +12,7 @@ @@ -231,11 +231,23 @@ index 18175e15c..9edfd8f6a 100644 #include #include +diff --git a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h +index c1b5f59f5..246200991 100644 +--- a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h ++++ b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h +@@ -6,6 +6,7 @@ + #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_ + + #include ++#include + + namespace blink { + 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 80b3150b6..637719623 100644 +index e40a76207..bf5ef7f13 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 -@@ -116,7 +116,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode +@@ -122,7 +122,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode // An identifier for a document transition shared element. `id.valid()` // returns true if this has been set, and false otherwise. @@ -244,7 +256,7 @@ index 80b3150b6..637719623 100644 // An identifier to tag shared element resources generated and cached in the // Viz process. This generated resource can be used as content for other -@@ -285,7 +285,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode +@@ -291,7 +291,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode return state_.compositor_element_id; } @@ -266,19 +278,19 @@ index c7e4f2b37..e491a1f68 100644 #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 2d58d76cb..a0e021691 100644 +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 -@@ -19,6 +19,7 @@ - #include "dawn/common/ityp_array.h" +@@ -15,6 +15,7 @@ + #ifndef SRC_DAWN_NATIVE_CACHEKEY_H_ + #define SRC_DAWN_NATIVE_CACHEKEY_H_ - #include +#include - #include - #include - #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 374bd8302..0884eb2a1 100644 +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 @@ @@ -287,10 +299,10 @@ index 374bd8302..0884eb2a1 100644 +#include #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 fa5fc3a7e..6cec93467 100644 +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 @@ @@ -302,7 +314,7 @@ index fa5fc3a7e..6cec93467 100644 #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 f378d5781..98d1336f9 100644 +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 @@ @@ -311,10 +323,10 @@ index f378d5781..98d1336f9 100644 +#include #include + #include - #include "src/tint/reader/wgsl/token.h" 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 7b5b6754e..62b1ca7e3 100644 +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 @@ @@ -324,9 +336,9 @@ index 7b5b6754e..62b1ca7e3 100644 +#include #include #include - #include // NOLINT: cpplint doesn't recognise this + #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 46a5deb55..4c3080ff2 100644 +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 @@ @@ -334,9 +346,9 @@ index 46a5deb55..4c3080ff2 100644 #define SRC_TINT_WRITER_SPIRV_OPERAND_H_ +#include + #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 @@ -375,12 +387,12 @@ index 1b4c53815..472042fab 100644 #include "perfetto/ext/base/optional.h" 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 c56f0344f..cd7824929 100644 +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 -@@ -20,6 +20,8 @@ - #include "perfetto/ext/base/optional.h" +@@ -21,6 +21,8 @@ #include "perfetto/trace_processor/status.h" + #include "src/trace_processor/importers/common/trace_parser.h" +#include + @@ -388,12 +400,12 @@ index c56f0344f..cd7824929 100644 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 316465072..512a26943 100644 +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 -@@ -10,6 +10,10 @@ - - #include // std::lower_bound +@@ -15,6 +15,10 @@ + #include + #include +#include +#include @@ -428,7 +440,7 @@ index b70ac4aa5..7ba555564 100644 namespace webrtc { diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h -index ca249541d..534214dbf 100644 +index 4190a79dc..5a9285f00 100644 --- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h +++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h @@ -12,6 +12,7 @@ @@ -440,7 +452,7 @@ index ca249541d..534214dbf 100644 #include diff --git a/src/3rdparty/chromium/ui/events/gesture_event_details.h b/src/3rdparty/chromium/ui/events/gesture_event_details.h -index d97a696fd..68b18d80c 100644 +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 @@ @@ -452,7 +464,7 @@ index d97a696fd..68b18d80c 100644 #include "base/check_op.h" diff --git a/src/3rdparty/chromium/ui/events/types/scroll_types.h b/src/3rdparty/chromium/ui/events/types/scroll_types.h -index 7ff15f0fc..136cebc09 100644 +index be6b2779f..dbe2e5cf7 100644 --- a/src/3rdparty/chromium/ui/events/types/scroll_types.h +++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h @@ -5,6 +5,8 @@ @@ -465,7 +477,7 @@ index 7ff15f0fc..136cebc09 100644 enum class ScrollGranularity : uint8_t { diff --git a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -index 1ad025fec..adadf9619 100644 +index 65cd4cb07..210c4318e 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 @@ @@ -476,20 +488,8 @@ index 1ad025fec..adadf9619 100644 #include #include -diff --git a/src/3rdparty/chromium/v8/src/base/logging.h b/src/3rdparty/chromium/v8/src/base/logging.h -index fdac44e31..a752dba6a 100644 ---- a/src/3rdparty/chromium/v8/src/base/logging.h -+++ b/src/3rdparty/chromium/v8/src/base/logging.h -@@ -5,6 +5,7 @@ - #ifndef V8_BASE_LOGGING_H_ - #define V8_BASE_LOGGING_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 61644ffe0..6fbc03743 100644 +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 @@ @@ -500,18 +500,6 @@ index 61644ffe0..6fbc03743 100644 #include #include -diff --git a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h -index c1d69c18f..eb33c6816 100644 ---- a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h -+++ b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h -@@ -5,6 +5,7 @@ - #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - -+#include - #include - - // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may diff --git a/src/core/browsing_data_remover_delegate_qt.h b/src/core/browsing_data_remover_delegate_qt.h index 4e690ffb1..dfa884cd6 100644 --- a/src/core/browsing_data_remover_delegate_qt.h diff --git a/qtwebengine-webrtc-dlopen-h264.patch b/qtwebengine-webrtc-dlopen-h264.patch index c365045..3575b28 100644 --- a/qtwebengine-webrtc-dlopen-h264.patch +++ b/qtwebengine-webrtc-dlopen-h264.patch @@ -1,11 +1,5 @@ -From 4c84adf2f52d64c32f7d86eca9d8f4988e990292 Mon Sep 17 00:00:00 2001 -From: Jan Grulich -Date: Mon, 23 Jan 2023 09:30:48 +0100 -Subject: [WebRTC] Video encoding: allow to dlopen h264 - - diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn -index 77f2daf3e..b1b4945b9 100644 +index 640d6626d..3d1f62190 100644 --- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn +++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn @@ -7,6 +7,7 @@ @@ -16,7 +10,7 @@ index 77f2daf3e..b1b4945b9 100644 import("../../webrtc.gni") rtc_library("encoded_frame") { -@@ -554,6 +555,21 @@ rtc_library("video_coding_utility") { +@@ -499,6 +500,21 @@ rtc_library("video_coding_utility") { ] } @@ -38,7 +32,7 @@ index 77f2daf3e..b1b4945b9 100644 rtc_library("webrtc_h264") { visibility = [ "*" ] sources = [ -@@ -592,10 +608,15 @@ rtc_library("webrtc_h264") { +@@ -542,10 +558,15 @@ rtc_library("webrtc_h264") { ] if (rtc_use_h264) { @@ -59,10 +53,10 @@ index 77f2daf3e..b1b4945b9 100644 deps += [ "../../media:rtc_media_base" ] } diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc -index 13dcba84d..cc17c25b5 100644 +index fc3fd195f..48eedcefd 100644 --- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc +++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc -@@ -35,10 +35,22 @@ +@@ -36,10 +36,22 @@ #include "third_party/openh264/src/codec/api/svc/codec_def.h" #include "third_party/openh264/src/codec/api/svc/codec_ver.h" @@ -85,7 +79,7 @@ index 13dcba84d..cc17c25b5 100644 const bool kOpenH264EncoderDetailedLogging = false; // QP scaling thresholds. -@@ -166,6 +178,15 @@ H264EncoderImpl::~H264EncoderImpl() { +@@ -167,6 +179,15 @@ H264EncoderImpl::~H264EncoderImpl() { int32_t H264EncoderImpl::InitEncode(const VideoCodec* inst, const VideoEncoder::Settings& settings) { @@ -101,6 +95,35 @@ index 13dcba84d..cc17c25b5 100644 ReportInit(); if (!inst || inst->codecType != kVideoCodecH264) { ReportError(); +diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni +index df42a48d4..cb5de2fda 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni ++++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni +@@ -181,6 +181,10 @@ declare_args() { + rtc_use_h264 = + proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang) + ++ # Allow to use OpenH264 on systems where OpenH264 cannot be installed by ++ # default due to licensing, but can be installed later from other sources. ++ rtc_dlopen_openh264 = false ++ + # Enable this flag to make webrtc::Mutex be implemented by absl::Mutex. + rtc_use_absl_mutex = false + +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index e1e551a3e..1a5f839a0 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -401,6 +401,9 @@ foreach(arch ${archs}) + use_bluez=false + use_vaapi=false + use_udev=true ++ media_use_openh264=false ++ rtc_use_h264=true ++ rtc_dlopen_openh264=true + enable_session_service=false + is_cfi=false + use_ozone=true diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/openh264.sigs b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/openh264.sigs new file mode 100644 index 000000000..4924f8e9a @@ -138,32 +161,3 @@ index 000000000..9bc0a7cbe +#include "third_party/openh264/src/codec/api/svc/codec_ver.h" + +} -diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni -index a5da76c6f..6da346fd4 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni -+++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni -@@ -177,6 +177,10 @@ declare_args() { - rtc_use_h264 = - proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang) - -+ # Allow to use OpenH264 on systems where OpenH264 cannot be installed by -+ # default due to licensing, but can be installed later from other sources. -+ rtc_dlopen_openh264 = false -+ - # Enable this flag to make webrtc::Mutex be implemented by absl::Mutex. - rtc_use_absl_mutex = false - -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 61bf707c9..e1f8fe3f9 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -384,6 +384,9 @@ foreach(arch ${archs}) - use_glib=false - use_bluez=false - use_vaapi=false -+ media_use_openh264=false -+ rtc_use_h264=true -+ rtc_dlopen_openh264=true - ) - set(systemLibs libjpeg libpng freetype harfbuzz libevent libwebp libxml - opus snappy libvpx icu ffmpeg re2 lcms2 diff --git a/sources b/sources index 416fea1..585bb3d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (qtwebengine-everywhere-src-6.4.3-clean.tar.xz) = 05627f7fb8401537227a10ec773dd4acb97d64f9d9c545bae33cf264a314b7d2c6c96741e3c38d1bcdfe1b1d8f088480183ee33e99adc548cc3e0874f056ab75 -SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be +SHA512 (qtwebengine-everywhere-src-6.5.0-clean.tar.xz) = b367ecaa1265ba90612f92e24f3921aa8306443923e4d1686267badc1b49e11b754ddab1b73fb5ef315ad0211c8faeec99ddde4c5d17536d75fa186ae7c7bb92 From 0ec8fd46cf729c73cae045150cce47485e8c98d4 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 5 Apr 2023 07:35:18 +0200 Subject: [PATCH 7/9] Add missing sources --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 585bb3d..380f621 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (qtwebengine-everywhere-src-6.5.0-clean.tar.xz) = b367ecaa1265ba90612f92e24f3921aa8306443923e4d1686267badc1b49e11b754ddab1b73fb5ef315ad0211c8faeec99ddde4c5d17536d75fa186ae7c7bb92 +SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be From fc6fc4270691709a0fe1a83873ce280ae9d11dba Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 25 May 2023 18:20:57 +0200 Subject: [PATCH 8/9] 6.5.1 --- .gitignore | 1 + qt6-qtwebengine.spec | 5 +- qtwebengine-fix-build.patch | 315 +++++++----------------------------- sources | 3 +- 4 files changed, 62 insertions(+), 262 deletions(-) diff --git a/.gitignore b/.gitignore index f143edd..2ef8b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pulseaudio-12.2-headers.tar.gz /qtwebengine-everywhere-src-6.4.3-clean.tar.xz /qtwebengine-everywhere-src-6.5.0-clean.tar.xz +/qtwebengine-everywhere-src-6.5.1-clean.tar.xz diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 893a862..cbbbee1 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -43,7 +43,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine -Version: 6.5.0 +Version: 6.5.1 Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details @@ -599,6 +599,9 @@ done %changelog +* Thu May 25 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + * Tue Apr 04 2023 Jan Grulich - 6.5.0-1 - 6.5.0 diff --git a/qtwebengine-fix-build.patch b/qtwebengine-fix-build.patch index 4ce1d03..52d9d39 100644 --- a/qtwebengine-fix-build.patch +++ b/qtwebengine-fix-build.patch @@ -1,114 +1,54 @@ diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h -index 5f0deadd5..803de8f2b 100644 +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 + #include + diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc -index f6e873a01..5f952c5ed 100644 +index 714bd5efe..cf0bb5fa9 100644 --- a/src/3rdparty/chromium/cc/trees/target_property.cc +++ b/src/3rdparty/chromium/cc/trees/target_property.cc -@@ -6,6 +6,8 @@ - +@@ -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/components/viz/common/shared_element_resource_id.h b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h -index b39a2d3dc..ca3d8aeda 100644 ---- a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h -+++ b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_ - #define COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_ - -+#include - #include - #include - -diff --git a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h -index ee75332f0..c0168281e 100644 ---- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h -+++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h -@@ -5,6 +5,7 @@ - #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ - #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ - -+#include - #include - #include - #include "base/callback_forward.h" 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/device/base/synchronization/one_writer_seqlock.h b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h -index 528b6683c..e37a16b81 100644 ---- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h -+++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h -@@ -6,6 +6,7 @@ - #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_ - - #include -+#include - #include - - #include "base/atomicops.h" -diff --git a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h -index 816d3405e..15c4004c0 100644 ---- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h -+++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h -@@ -5,6 +5,7 @@ - #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ - #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ - -+#include - #include - #include - #include diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h -index bf6bac2b4..51c534509 100644 +index b1a0d56ea..019bc0743 100644 --- a/src/3rdparty/chromium/extensions/common/constants.h +++ b/src/3rdparty/chromium/extensions/common/constants.h -@@ -10,6 +10,8 @@ +@@ -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_feature_info.h b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -index 1a7028e47..b9e951c0a 100644 ---- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -+++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -@@ -5,6 +5,7 @@ - #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_ - #define GPU_CONFIG_GPU_FEATURE_INFO_H_ - -+#include - #include - #include - 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 @@ -116,73 +56,25 @@ index 574aca1ff..fca32671c 100644 @@ -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 d6adf388e..560e692aa 100644 +index ea360d1c9..dca84fd02 100644 --- a/src/3rdparty/chromium/net/base/parse_number.h +++ b/src/3rdparty/chromium/net/base/parse_number.h -@@ -8,6 +8,8 @@ +@@ -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/net/cookies/cookie_inclusion_status.h b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h -index 5f289ddcd..44f2f9eb1 100644 ---- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h -+++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h -@@ -6,6 +6,7 @@ - #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ - - #include -+#include - #include - #include - #include -diff --git a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h -index 6a300ed0c..3e30f1cb0 100644 ---- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h -+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h -@@ -5,6 +5,7 @@ - #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_ - #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_ - -+#include - #include - - #include "absl/strings/string_view.h" -diff --git a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h -index 52f150172..db4d31084 100644 ---- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h -+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h -@@ -5,6 +5,7 @@ - #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_ - #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_ - -+#include - #include - #include - -diff --git a/src/3rdparty/chromium/pdf/document_attachment_info.h b/src/3rdparty/chromium/pdf/document_attachment_info.h -index e0fffc2ca..095463fcb 100644 ---- a/src/3rdparty/chromium/pdf/document_attachment_info.h -+++ b/src/3rdparty/chromium/pdf/document_attachment_info.h -@@ -5,6 +5,7 @@ - #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_ - #define PDF_DOCUMENT_ATTACHMENT_INFO_H_ - -+#include - #include - - 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 @@ -201,65 +93,20 @@ index 7c0dcdecb..97054d476 100644 @@ -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/sandbox/linux/syscall_broker/broker_file_permission.h b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -index b167ffb09..2347d5461 100644 ---- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -+++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -@@ -6,6 +6,7 @@ - #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_ - - #include -+#include - #include - - #include "sandbox/sandbox_export.h" -diff --git a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -index 4b76d33af..4db1902d1 100644 ---- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -+++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -@@ -12,6 +12,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h -index c1b5f59f5..246200991 100644 ---- a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h -+++ b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h -@@ -6,6 +6,7 @@ - #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_ - - #include -+#include - - namespace blink { - 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 e40a76207..bf5ef7f13 100644 +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 -@@ -122,7 +122,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode - - // An identifier for a document transition shared element. `id.valid()` - // returns true if this has been set, and false otherwise. -- DocumentTransitionSharedElementId document_transition_shared_element_id; -+ cc::DocumentTransitionSharedElementId document_transition_shared_element_id; - - // An identifier to tag shared element resources generated and cached in the - // Viz process. This generated resource can be used as content for other @@ -291,7 +291,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode return state_.compositor_element_id; } - + - const blink::DocumentTransitionSharedElementId& + const cc::DocumentTransitionSharedElementId& DocumentTransitionSharedElementId() const { @@ -272,10 +119,10 @@ index c7e4f2b37..e491a1f68 100644 @@ -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 @@ -284,10 +131,10 @@ index 6cec3b6b8..541bba5b1 100644 @@ -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 @@ -296,10 +143,10 @@ index 90077421d..f303f9e8b 100644 @@ -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 @@ -308,7 +155,7 @@ index 7a20e8738..655f69ce3 100644 @@ -15,6 +15,7 @@ #ifndef SRC_TINT_READER_SPIRV_NAMER_H_ #define SRC_TINT_READER_SPIRV_NAMER_H_ - + +#include #include #include @@ -320,11 +167,11 @@ index 8e0306b6a..0fc0cc2b0 100644 @@ -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 @@ -332,7 +179,7 @@ index 4cf9aad1b..3fa13e216 100644 @@ -15,6 +15,7 @@ #ifndef SRC_TINT_READER_WGSL_TOKEN_H_ #define SRC_TINT_READER_WGSL_TOKEN_H_ - + +#include #include #include @@ -344,7 +191,7 @@ index 0601ca068..ac9dde64e 100644 @@ -15,6 +15,7 @@ #ifndef SRC_TINT_WRITER_SPIRV_OPERAND_H_ #define SRC_TINT_WRITER_SPIRV_OPERAND_H_ - + +#include #include #include @@ -360,32 +207,7 @@ index a3099e15d..2e6f0eea7 100644 +#include #include #include - -diff --git a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -index d2731dac7..46bc87ef9 100644 ---- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -+++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -@@ -5,6 +5,8 @@ - #ifndef CONSTANTS_ANNOTATION_FLAGS_H_ - #define CONSTANTS_ANNOTATION_FLAGS_H_ - -+#include -+ - namespace pdfium { - namespace annotation_flags { - -diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h -index 1b4c53815..472042fab 100644 ---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h -+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h -@@ -18,6 +18,7 @@ - #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ - - #include -+#include - #include - - #include "perfetto/ext/base/optional.h" + 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 @@ -393,11 +215,11 @@ index d047de1bf..d7fc91a59 100644 @@ -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 @@ -406,7 +228,7 @@ index 0101632c5..3f04a2dd2 100644 @@ -15,6 +15,10 @@ #include #include - + +#include +#include +#include @@ -415,13 +237,13 @@ index 0101632c5..3f04a2dd2 100644 "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 b7c586b80..d950214c3 100644 +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 @@ -432,25 +254,13 @@ 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/third_party/webrtc/rtc_base/third_party/base64/base64.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h -index 4190a79dc..5a9285f00 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h -+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h -@@ -12,6 +12,7 @@ - #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - -+#include - #include - #include - 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 @@ -458,36 +268,23 @@ index 41ff9906d..1864e9e21 100644 @@ -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/events/types/scroll_types.h b/src/3rdparty/chromium/ui/events/types/scroll_types.h -index be6b2779f..dbe2e5cf7 100644 ---- a/src/3rdparty/chromium/ui/events/types/scroll_types.h -+++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h -@@ -5,6 +5,8 @@ - #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_ - #define UI_EVENTS_TYPES_SCROLL_TYPES_H_ - -+#include -+ - namespace ui { - - enum class ScrollGranularity : uint8_t { diff --git a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -index 65cd4cb07..210c4318e 100644 +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 @@ -495,21 +292,21 @@ index cd5b91f74..a74c0021f 100644 @@ -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 4e690ffb1..dfa884cd6 100644 +index a611a710c..67743f52b 100644 --- a/src/core/browsing_data_remover_delegate_qt.h +++ b/src/core/browsing_data_remover_delegate_qt.h -@@ -6,6 +6,8 @@ - +@@ -8,6 +8,8 @@ + #include "content/public/browser/browsing_data_remover_delegate.h" - + +#include + namespace QtWebEngineCore { - + class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate { diff --git a/sources b/sources index 380f621..5472260 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (qtwebengine-everywhere-src-6.5.0-clean.tar.xz) = b367ecaa1265ba90612f92e24f3921aa8306443923e4d1686267badc1b49e11b754ddab1b73fb5ef315ad0211c8faeec99ddde4c5d17536d75fa186ae7c7bb92 -SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be +SHA512 (qtwebengine-everywhere-src-6.5.1-clean.tar.xz) = 58425d510e2623c7241673b300a9a30106ee237f24da4278d2b3c6c0f2167a7bf385e8045cd9b23dbacc29be6b97a06692f8eb0c43bc3bd3dec67328e24cb2cb From d554a30d1522737ca93aba4a2e626c6cd08e6b88 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 25 May 2023 20:16:31 +0200 Subject: [PATCH 9/9] Re-add accidentally removed pulseaudio sources --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 5472260..e56e8f6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be SHA512 (qtwebengine-everywhere-src-6.5.1-clean.tar.xz) = 58425d510e2623c7241673b300a9a30106ee237f24da4278d2b3c6c0f2167a7bf385e8045cd9b23dbacc29be6b97a06692f8eb0c43bc3bd3dec67328e24cb2cb