diff --git a/srcpkgs/qt6-pdf/patches/0100-REVERT-roll-src-third_party-ffmpeg-m102.patch b/srcpkgs/qt6-pdf/patches/0100-REVERT-roll-src-third_party-ffmpeg-m102.patch deleted file mode 100644 index aaaa3018c57..00000000000 --- a/srcpkgs/qt6-pdf/patches/0100-REVERT-roll-src-third_party-ffmpeg-m102.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc -+++ b/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc -@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testi - EXPECT_FALSE(reader_->Open()); - } - -- void RunTestFailingDecode(const char* fn, int expect_read = 0) { -+ void RunTestFailingDecode(const char* fn) { - Initialize(fn); - EXPECT_TRUE(reader_->Open()); - std::vector> decoded_audio_packets; -- EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read); -+ EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0); - } - - void RunTestPartialDecode(const char* fn) { -@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) { - } - - TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) { -- RunTestFailingDecode("midstream_config_change.mp3", 42624); -+ RunTestFailingDecode("midstream_config_change.mp3"); - } - #endif - ---- a/src/3rdparty/chromium/media/filters/audio_video_metadata_extractor.cc -+++ b/src/3rdparty/chromium/media/filters/audio_video_metadata_extractor.cc -@@ -113,15 +113,6 @@ bool AudioVideoMetadataExtractor::Extrac - if (!stream) - continue; - -- void* display_matrix = -- av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr); -- if (display_matrix) { -- rotation_ = VideoTransformation::FromFFmpegDisplayMatrix( -- static_cast(display_matrix)) -- .rotation; -- info.tags["rotate"] = base::NumberToString(rotation_); -- } -- - // Extract dictionary from streams also. Needed for containers that attach - // metadata to contained streams instead the container itself, like OGG. - ExtractDictionary(stream->metadata, &info.tags); -@@ -264,6 +255,8 @@ void AudioVideoMetadataExtractor::Extrac - if (raw_tags->find(tag->key) == raw_tags->end()) - (*raw_tags)[tag->key] = tag->value; - -+ if (ExtractInt(tag, "rotate", &rotation_)) -+ continue; - if (ExtractString(tag, "album", &album_)) - continue; - if (ExtractString(tag, "artist", &artist_)) diff --git a/srcpkgs/qt6-pdf/patches/0110-chromium-117-typename.patch b/srcpkgs/qt6-pdf/patches/0110-chromium-117-typename.patch deleted file mode 100644 index 6e4af0c0e07..00000000000 --- a/srcpkgs/qt6-pdf/patches/0110-chromium-117-typename.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- a/src/3rdparty/chromium/components/optimization_guide/core/tflite_model_executor.h -+++ b/src/3rdparty/chromium/components/optimization_guide/core/tflite_model_executor.h -@@ -240,7 +240,7 @@ class TFLiteModelExecutor : public Model - void SendForBatchExecution( - BatchExecutionCallback callback_on_complete, - base::TimeTicks start_time, -- ModelExecutor::ConstRefInputVector inputs) -+ typename ModelExecutor::ConstRefInputVector inputs) - override { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -262,7 +262,7 @@ class TFLiteModelExecutor : public Model - // Starts the synchronous execution of the model. Returns model outputs. - // Model needs to be loaded. Synchronous calls do not load or unload model. - std::vector> SendForBatchExecutionSync( -- ModelExecutor::ConstRefInputVector inputs) -+ typename ModelExecutor::ConstRefInputVector inputs) - override { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -417,7 +417,7 @@ class TFLiteModelExecutor : public Model - // executes it on the model execution thread. - void LoadModelFileAndBatchExecute( - BatchExecutionCallback callback_on_complete, -- ModelExecutor::ConstRefInputVector inputs) { -+ typename ModelExecutor::ConstRefInputVector inputs) { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - -@@ -434,7 +434,7 @@ class TFLiteModelExecutor : public Model - - // Batch executes the loaded model for inputs. - void BatchExecuteLoadedModel( -- ModelExecutor::ConstRefInputVector inputs, -+ typename ModelExecutor::ConstRefInputVector inputs, - std::vector>* outputs) { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -494,7 +494,7 @@ class TFLiteModelExecutor : public Model - // Unloads the model if needed. - void BatchExecuteLoadedModelAndRunCallback( - BatchExecutionCallback callback_on_complete, -- ModelExecutor::ConstRefInputVector inputs, -+ typename ModelExecutor::ConstRefInputVector inputs, - ExecutionStatus execution_status) { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ---- a/src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.cc -+++ b/src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.cc -@@ -399,7 +399,7 @@ class RetryingFetcherImpl final : public - RetryingFetcherImpl(const RetryingFetcherImpl&) = delete; - RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete; - -- void Start(ProtoFetcher::Callback callback) override { -+ void Start(typename ProtoFetcher::Callback callback) override { - callback_ = std::move(callback); - Retry(); - } -@@ -435,7 +435,7 @@ class RetryingFetcherImpl final : public - } - - // Client callback. -- ProtoFetcher::Callback callback_; -+ typename ProtoFetcher::Callback callback_; - - // Retry controls. - base::OneShotTimer timer_; -@@ -578,7 +578,7 @@ ParallelFetchManager: - template - void ParallelFetchManager::Fetch( - const Request& request, -- Fetcher::Callback callback) { -+ typename Fetcher::Callback callback) { - CHECK(callback) << "Use base::DoNothing() instead of empty callback."; - KeyType key = requests_in_flight_.Add(MakeFetcher(request)); - requests_in_flight_.Lookup(key)->Start( ---- a/src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.h -+++ b/src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.h -@@ -165,10 +165,10 @@ class ParallelFetchManager { - - // Starts the fetch. Underlying fetcher is stored internally, and will be - // cleaned up after finish or when this manager is destroyed. -- void Fetch(const Request& request, Fetcher::Callback callback); -+ void Fetch(const Request& request, typename Fetcher::Callback callback); - - private: -- using KeyType = base::IDMap>::KeyType; -+ using KeyType = typename base::IDMap>::KeyType; - - // Remove fetcher under key from requests_in_flight_. - void Remove(KeyType key); diff --git a/srcpkgs/qt6-pdf/patches/0112-chromium-118-missing-header-files.patch b/srcpkgs/qt6-pdf/patches/0112-chromium-118-missing-header-files.patch deleted file mode 100644 index 43861ea7321..00000000000 --- a/srcpkgs/qt6-pdf/patches/0112-chromium-118-missing-header-files.patch +++ /dev/null @@ -1,379 +0,0 @@ ---- a/src/3rdparty/chromium/base/memory/ref_counted.h -+++ b/src/3rdparty/chromium/base/memory/ref_counted.h -@@ -6,6 +6,7 @@ - #define BASE_MEMORY_REF_COUNTED_H_ - - #include -+#include - - #include - #include ---- a/src/3rdparty/chromium/base/check_op.h -+++ b/src/3rdparty/chromium/base/check_op.h -@@ -5,6 +5,7 @@ - #ifndef BASE_CHECK_OP_H_ - #define BASE_CHECK_OP_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/base/debug/profiler.h -+++ b/src/3rdparty/chromium/base/debug/profiler.h -@@ -8,6 +8,7 @@ - #include - #include - -+#include - #include - - #include "base/base_export.h" ---- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -+++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - #include - ---- a/src/3rdparty/chromium/net/base/net_export.h -+++ b/src/3rdparty/chromium/net/base/net_export.h -@@ -5,6 +5,8 @@ - #ifndef NET_BASE_NET_EXPORT_H_ - #define NET_BASE_NET_EXPORT_H_ - -+#include -+ - // Defines NET_EXPORT so that functionality implemented by the net module can - // be exported to consumers, and NET_EXPORT_PRIVATE that allows unit tests to - // access features not intended to be used directly by real consumers. ---- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -+++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -@@ -5,6 +5,7 @@ - #ifndef SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_ - #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/string_view.h -+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/string_view.h -@@ -27,6 +27,7 @@ - #ifndef ABSL_STRINGS_STRING_VIEW_H_ - #define ABSL_STRINGS_STRING_VIEW_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -+++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -@@ -10,6 +10,7 @@ - #ifndef GLSLANG_SHADERVARS_H_ - #define GLSLANG_SHADERVARS_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h -+++ b/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_LANG_SPIRV_READER_AST_PARSER_NAMER_H_ - #define SRC_TINT_LANG_SPIRV_READER_AST_PARSER_NAMER_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h -+++ b/src/3rdparty/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/swiftshader/src/System/LRUCache.hpp -+++ b/src/3rdparty/chromium/third_party/swiftshader/src/System/LRUCache.hpp -@@ -17,6 +17,7 @@ - - #include "System/Debug.hpp" - -+#include - #include - #include - #include ---- 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 ---- a/src/3rdparty/chromium/third_party/ruy/src/ruy/profiler/instrumentation.h -+++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/profiler/instrumentation.h -@@ -17,6 +17,7 @@ limitations under the License. - #define RUY_RUY_PROFILER_INSTRUMENTATION_H_ - - #ifdef RUY_PROFILER -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/base/containers/flat_map.h -+++ b/src/3rdparty/chromium/base/containers/flat_map.h -@@ -5,6 +5,7 @@ - #ifndef BASE_CONTAINERS_FLAT_MAP_H_ - #define BASE_CONTAINERS_FLAT_MAP_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/components/crash/core/app/crash_reporter_client.h -+++ b/src/3rdparty/chromium/components/crash/core/app/crash_reporter_client.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - #include "build/build_config.h" ---- a/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h -+++ b/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h -@@ -7,6 +7,8 @@ - - #include - -+#include -+ - #include "base/component_export.h" - #include "ui/gfx/geometry/matrix3_f.h" - ---- a/src/3rdparty/chromium/components/password_manager/core/browser/generation/password_generator.h -+++ b/src/3rdparty/chromium/components/password_manager/core/browser/generation/password_generator.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - ---- a/src/3rdparty/chromium/components/feature_engagement/internal/event_storage_validator.h -+++ b/src/3rdparty/chromium/components/feature_engagement/internal/event_storage_validator.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - namespace feature_engagement { ---- a/src/3rdparty/chromium/components/feature_engagement/internal/never_event_storage_validator.h -+++ b/src/3rdparty/chromium/components/feature_engagement/internal/never_event_storage_validator.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_ - #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_ - -+#include - #include - - #include "components/feature_engagement/internal/event_storage_validator.h" ---- a/src/3rdparty/chromium/components/autofill/core/browser/autofill_ablation_study.h -+++ b/src/3rdparty/chromium/components/autofill/core/browser/autofill_ablation_study.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - class GURL; ---- a/src/3rdparty/chromium/components/payments/content/utility/fingerprint_parser.h -+++ b/src/3rdparty/chromium/components/payments/content/utility/fingerprint_parser.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_ - #define COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_ - -+#include - #include - #include - ---- a/src/3rdparty/chromium/pdf/document_attachment_info.h -+++ b/src/3rdparty/chromium/pdf/document_attachment_info.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - ---- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -+++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -@@ -7,6 +7,8 @@ - - #include - -+#include -+ - namespace pdfium { - namespace annotation_flags { - ---- a/src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h -+++ b/src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h -@@ -2884,6 +2884,7 @@ static void vma_aligned_free(void* VMA_N - - // Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString. - #if VMA_STATS_STRING_ENABLED -+#include - static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num) - { - snprintf(outStr, strLen, "%u", static_cast(num)); ---- a/src/3rdparty/chromium/gin/time_clamper.h -+++ b/src/3rdparty/chromium/gin/time_clamper.h -@@ -48,7 +48,7 @@ class GIN_EXPORT TimeClamper { - const int64_t micros = now_micros % 1000; - // abs() is necessary for devices with times before unix-epoch (most likely - // configured incorrectly). -- if (abs(micros) + kResolutionMicros < 1000) { -+ if (std::abs(micros) + kResolutionMicros < 1000) { - return now_micros / 1000; - } - return ClampTimeResolution(now_micros) / 1000; ---- a/src/3rdparty/chromium/chrome/test/chromedriver/chrome/web_view_impl.cc -+++ b/src/3rdparty/chromium/chrome/test/chromedriver/chrome/web_view_impl.cc -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - - #include "base/check.h" - #include "base/files/file_path.h" ---- a/src/3rdparty/chromium/skia/ext/skcolorspace_trfn.cc -+++ b/src/3rdparty/chromium/skia/ext/skcolorspace_trfn.cc -@@ -3,6 +3,7 @@ - // found in the LICENSE file. - - #include "skia/ext/skcolorspace_trfn.h" -+#include - - #include - ---- 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 -@@ -11,6 +11,7 @@ - #ifndef COMMON_VIDEO_H264_SPS_PARSER_H_ - #define COMMON_VIDEO_H264_SPS_PARSER_H_ - -+#include - #include "absl/types/optional.h" - #include "rtc_base/bitstream_reader.h" - ---- 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 -@@ -11,6 +11,7 @@ - #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - -+#include - #include - - #include "absl/types/optional.h" ---- a/src/3rdparty/chromium/ui/gfx/linux/drm_util_linux.h -+++ b/src/3rdparty/chromium/ui/gfx/linux/drm_util_linux.h -@@ -9,6 +9,8 @@ - - #include "ui/gfx/buffer_types.h" - -+#include -+ - namespace ui { - - int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format); ---- a/src/3rdparty/chromium/third_party/webrtc/audio/utility/channel_mixer.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/audio/utility/channel_mixer.cc -@@ -8,6 +8,8 @@ - * be found in the AUTHORS file in the root of the source tree. - */ - -+#include -+ - #include "audio/utility/channel_mixer.h" - - #include "audio/utility/channel_mixing_matrix.h" ---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc -@@ -10,6 +10,7 @@ - - #include "modules/video_coding/utility/ivf_file_reader.h" - -+#include - #include - #include - ---- a/src/3rdparty/chromium/third_party/ipcz/src/ipcz/router_link.h -+++ b/src/3rdparty/chromium/third_party/ipcz/src/ipcz/router_link.h -@@ -5,6 +5,7 @@ - #ifndef IPCZ_SRC_IPCZ_ROUTER_LINK_H_ - #define IPCZ_SRC_IPCZ_ROUTER_LINK_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/material_color_utilities/src/cpp/palettes/tones.cc -+++ b/src/3rdparty/chromium/third_party/material_color_utilities/src/cpp/palettes/tones.cc -@@ -14,6 +14,7 @@ - * limitations under the License. - */ - -+#include - #include "cpp/palettes/tones.h" - - #include ---- a/src/3rdparty/chromium/services/device/public/cpp/generic_sensor/sensor_reading.h -+++ b/src/3rdparty/chromium/services/device/public/cpp/generic_sensor/sensor_reading.h -@@ -8,6 +8,9 @@ - #include - #include - -+#include -+#include -+ - #include - - namespace device { ---- a/src/3rdparty/chromium/components/gwp_asan/client/lightweight_detector.h -+++ b/src/3rdparty/chromium/components/gwp_asan/client/lightweight_detector.h -@@ -5,6 +5,8 @@ - #ifndef COMPONENTS_GWP_ASAN_CLIENT_LIGHTWEIGHT_DETECTOR_H_ - #define COMPONENTS_GWP_ASAN_CLIENT_LIGHTWEIGHT_DETECTOR_H_ - -+#include -+ - #include "base/gtest_prod_util.h" - #include "components/gwp_asan/client/export.h" - #include "components/gwp_asan/common/lightweight_detector_state.h" diff --git a/srcpkgs/qt6-pdf/patches/0113-chromium-118-no_matching_constructor.patch b/srcpkgs/qt6-pdf/patches/0113-chromium-118-no_matching_constructor.patch deleted file mode 100644 index 97926daa8ca..00000000000 --- a/srcpkgs/qt6-pdf/patches/0113-chromium-118-no_matching_constructor.patch +++ /dev/null @@ -1,410 +0,0 @@ ---- a/src/3rdparty/chromium/ui/base/wayland/color_manager_util.h -+++ b/src/3rdparty/chromium/ui/base/wayland/color_manager_util.h -@@ -52,53 +52,53 @@ constexpr auto kChromaticityMap = base:: - zcr_color_manager_v1_chromaticity_names, - PrimaryVersion>( - {{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_525_LINE, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M, -- kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_625_LINE, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT470BG, -- kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT470BG, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE170M, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M, -- kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT709, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT2020, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SRGB, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_DISPLAYP3, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_ADOBERGB, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::ADOBE_RGB, -- kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::ADOBE_RGB, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::WIDE_GAMUT_COLOR_SPIN, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::BT470M, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::SMPTE240M, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::XYZ_D50, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::SMPTEST428_1, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::SMPTEST431_2, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::FILM, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION)}}); -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION}}}); - - // A map from the zcr_color_manager_v1 eotf_names enum values - // representing well-known EOTFs, to their equivalent TransferIDs. -@@ -107,65 +107,65 @@ constexpr auto kEotfMap = base::MakeFixe - zcr_color_manager_v1_eotf_names, - TransferVersion>({ - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, -- TransferVersion(gfx::ColorSpace::TransferID::LINEAR, -- kDefaultSinceVersion)}, -+ TransferVersion{gfx::ColorSpace::TransferID::LINEAR, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB, -- TransferVersion(gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion)}, -+ TransferVersion{gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709, -- TransferVersion(gfx::ColorSpace::TransferID::BT709, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::BT709, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087, -- TransferVersion(gfx::ColorSpace::TransferID::GAMMA24, -- kDefaultSinceVersion)}, -+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA24, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB, - // This is ever so slightly inaccurate. The number ought to be - // 2.19921875f, not 2.2 -- TransferVersion(gfx::ColorSpace::TransferID::GAMMA22, -- kDefaultSinceVersion)}, -+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA22, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ, -- TransferVersion(gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion)}, -+ TransferVersion{gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG, -- TransferVersion(gfx::ColorSpace::TransferID::HLG, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::HLG, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M, -- TransferVersion(gfx::ColorSpace::TransferID::SMPTE170M, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE170M, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M, -- TransferVersion(gfx::ColorSpace::TransferID::SMPTE240M, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE240M, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1, -- TransferVersion( -+ TransferVersion{ - gfx::ColorSpace::TransferID::SMPTEST428_1, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG, -- TransferVersion(gfx::ColorSpace::TransferID::LOG, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::LOG, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT, -- TransferVersion(gfx::ColorSpace::TransferID::LOG_SQRT, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::LOG_SQRT, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4, -- TransferVersion( -+ TransferVersion{ - gfx::ColorSpace::TransferID::IEC61966_2_4, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG, -- TransferVersion(gfx::ColorSpace::TransferID::BT1361_ECG, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::BT1361_ECG, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10, -- TransferVersion(gfx::ColorSpace::TransferID::BT2020_10, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_10, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12, -- TransferVersion(gfx::ColorSpace::TransferID::BT2020_12, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_12, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS, -- TransferVersion( -+ TransferVersion{ - gfx::ColorSpace::TransferID::SCRGB_LINEAR_80_NITS, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18, -- TransferVersion(gfx::ColorSpace::TransferID::GAMMA18, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA18, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28, -- TransferVersion(gfx::ColorSpace::TransferID::GAMMA28, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA28, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION}}, - }); - - // A map from the SDR zcr_color_manager_v1 eotf_names enum values -@@ -174,18 +174,18 @@ constexpr auto kEotfMap = base::MakeFixe - constexpr auto kTransferMap = - base::MakeFixedFlatMap({ - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, -- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB, -- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709, -- TransferFnVersion( -+ TransferFnVersion{ - SkNamedTransferFnExt::kRec709, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087, -- TransferFnVersion(gamma24, kDefaultSinceVersion)}, -+ TransferFnVersion{gamma24, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB, -- TransferFnVersion(SkNamedTransferFnExt::kA98RGB, -- kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFnExt::kA98RGB, -+ kDefaultSinceVersion}}, - }); - - // A map from the HDR zcr_color_manager_v1 eotf_names enum values -@@ -194,68 +194,68 @@ constexpr auto kTransferMap = - constexpr auto kHDRTransferMap = - base::MakeFixedFlatMap( - {{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, -- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB, -- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ, -- TransferFnVersion(SkNamedTransferFn::kPQ, kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFn::kPQ, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG, -- TransferFnVersion(SkNamedTransferFn::kHLG, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)}, -+ TransferFnVersion{SkNamedTransferFn::kHLG, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10, -- TransferFnVersion( -+ TransferFnVersion{ - SkNamedTransferFnExt::kSRGBExtended1023Over510, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION)}}); -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION}}}); - - // A map from zcr_color_manager_v1 matrix_names enum values to - // gfx::ColorSpace::MatrixIDs. - constexpr auto kMatrixMap = - base::MakeFixedFlatMap( - {{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_RGB, -- MatrixVersion(gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT709, -- MatrixVersion(gfx::ColorSpace::MatrixID::BT709, -- kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::BT709, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG, -- MatrixVersion( -+ MatrixVersion{ - gfx::ColorSpace::MatrixID::BT470BG, -- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_NCL, -- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_NCL, -- kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_NCL, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_CL, -- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_CL, -- kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_CL, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_FCC, -- MatrixVersion(gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG, -- MatrixVersion(gfx::ColorSpace::MatrixID::YCOCG, -- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::YCOCG, -+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX, -- MatrixVersion(gfx::ColorSpace::MatrixID::YDZDX, -- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::YDZDX, -+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR, -- MatrixVersion(gfx::ColorSpace::MatrixID::GBR, -- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::GBR, -+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE170M, -- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE170M, -- kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE170M, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE240M, -- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE240M, -- kDefaultSinceVersion)}}); -+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE240M, -+ kDefaultSinceVersion}}}); - - // A map from zcr_color_manager_v1 range_names enum values to - // gfx::ColorSpace::RangeIDs. - constexpr auto kRangeMap = - base::MakeFixedFlatMap( - {{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_LIMITED, -- RangeVersion(gfx::ColorSpace::RangeID::LIMITED, -- kDefaultSinceVersion)}, -+ RangeVersion{gfx::ColorSpace::RangeID::LIMITED, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_RANGE_NAMES_FULL, -- RangeVersion(gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion)}, -+ RangeVersion{gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_RANGE_NAMES_DERIVED, -- RangeVersion(gfx::ColorSpace::RangeID::DERIVED, -- kDefaultSinceVersion)}}); -+ RangeVersion{gfx::ColorSpace::RangeID::DERIVED, -+ kDefaultSinceVersion}}}); - - zcr_color_manager_v1_chromaticity_names ToColorManagerChromaticity( - gfx::ColorSpace::PrimaryID primaryID, ---- a/src/3rdparty/chromium/chrome/test/chromedriver/capabilities.cc -+++ b/src/3rdparty/chromium/chrome/test/chromedriver/capabilities.cc -@@ -346,7 +346,7 @@ Status ParseMobileEmulation(const base:: - "'version' field of type string"); - } - -- brands.emplace_back(*brand, *version); -+ brands.emplace_back() = {*brand, *version}; - } - - client_hints.brands = std::move(brands); -@@ -384,7 +384,7 @@ Status ParseMobileEmulation(const base:: - "a 'version' field of type string"); - } - -- full_version_list.emplace_back(*brand, *version); -+ full_version_list.emplace_back() = {*brand, *version}; - } - - client_hints.full_version_list = std::move(full_version_list); ---- a/src/3rdparty/chromium/base/trace_event/trace_log.cc -+++ b/src/3rdparty/chromium/base/trace_event/trace_log.cc -@@ -2190,8 +2190,8 @@ void TraceLog::SetTraceBufferForTesting( - #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY) - void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) { - AutoLock lock(track_event_lock_); -- track_event_sessions_.emplace_back(args.internal_instance_index, *args.config, -- args.backend_type); -+ track_event_sessions_.emplace_back() = {args.internal_instance_index, *args.config, -+ args.backend_type}; - } - - void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) { ---- a/src/3rdparty/chromium/ui/gtk/gtk_ui.cc -+++ b/src/3rdparty/chromium/ui/gtk/gtk_ui.cc -@@ -955,11 +955,11 @@ ui::DisplayConfig GtkUi::GetDisplayConfi - GdkRectangle geometry; - gdk_monitor_get_geometry(monitor, &geometry); - int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor)); -- config.display_geometries.emplace_back( -+ config.display_geometries.emplace_back() = { - gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y, - monitor_scale * geometry.width, - monitor_scale * geometry.height), -- monitor_scale * font_scale); -+ static_cast(monitor_scale * font_scale)}; - } - return config; - } ---- a/src/3rdparty/chromium/components/autofill/core/browser/contact_info_sync_util.cc -+++ b/src/3rdparty/chromium/components/autofill/core/browser/contact_info_sync_util.cc -@@ -174,9 +174,9 @@ class ContactInfoProfileSetter { - CHECK(observations.empty()); - for (const sync_pb::ContactInfoSpecifics::Observation& proto_observation : - proto_observations) { -- observations.emplace_back(proto_observation.type(), -+ observations.emplace_back() = {static_cast(proto_observation.type()), - ProfileTokenQuality::FormSignatureHash( -- proto_observation.form_hash())); -+ proto_observation.form_hash())}; - } - } - ---- a/src/3rdparty/chromium/components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc -+++ b/src/3rdparty/chromium/components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc -@@ -553,11 +553,11 @@ ServerCvc AutofillWalletCvcStructDataFro - base::StringToInt64(wallet_credential_specifics.instrument_id(), - &instrument_id); - -- return ServerCvc( -+ return ServerCvc{ - instrument_id, base::UTF8ToUTF16(wallet_credential_specifics.cvc()), - base::Time::UnixEpoch() + - base::Milliseconds(wallet_credential_specifics -- .last_updated_time_unix_epoch_millis())); -+ .last_updated_time_unix_epoch_millis())}; - } - - VirtualCardUsageData VirtualCardUsageDataFromUsageSpecifics( ---- a/src/3rdparty/chromium/chrome/test/chromedriver/capabilities.cc -+++ b/src/3rdparty/chromium/chrome/test/chromedriver/capabilities.cc -@@ -346,7 +346,7 @@ Status ParseMobileEmulation(const base:: - "'version' field of type string"); - } - -- brands.emplace_back() = {*brand, *version}; -+ brands.emplace_back(*brand, *version); - } - - client_hints.brands = std::move(brands); -@@ -384,7 +384,7 @@ Status ParseMobileEmulation(const base:: - "a 'version' field of type string"); - } - -- full_version_list.emplace_back() = {*brand, *version}; -+ full_version_list.emplace_back(*brand, *version); - } - - client_hints.full_version_list = std::move(full_version_list); diff --git a/srcpkgs/qt6-pdf/patches/0114-chromium-118-python-3.12-deprecated.patch b/srcpkgs/qt6-pdf/patches/0114-chromium-118-python-3.12-deprecated.patch deleted file mode 100644 index 1b71a5a0ad0..00000000000 --- a/srcpkgs/qt6-pdf/patches/0114-chromium-118-python-3.12-deprecated.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- a/src/3rdparty/chromium/base/write_build_date_header.py -+++ b/src/3rdparty/chromium/base/write_build_date_header.py -@@ -17,7 +17,7 @@ def main(): - args = argument_parser.parse_args() - - date_val = int(args.timestamp) -- date = datetime.datetime.utcfromtimestamp(date_val) -+ date = datetime.datetime.fromtimestamp(date_val, datetime.timezone.utc) - output = ('// Generated by //base/write_build_date_header.py\n' - '#ifndef BASE_GENERATED_BUILD_DATE_TIMESTAMP \n' - f'#define BASE_GENERATED_BUILD_DATE_TIMESTAMP {date_val}' ---- a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -+++ b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -@@ -40,6 +40,12 @@ class GoogleProtobufModuleImporter: - return filepath - return None - -+ def load_source(name: str, path: str) -> types.ModuleType: -+ spec = importlib.util.spec_from_file_location(name, path) -+ module = importlib.util.module_from_spec(spec) -+ spec.loader.exec_module(module) -+ return module -+ - def _module_exists(self, fullname): - return self._fullname_to_filepath(fullname) is not None - ---- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py -+++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py -@@ -18,7 +18,7 @@ class HTMLGenerationController(object): - - def GetHTMLForInlineStylesheet(self, contents): - if self.current_module is None: -- if re.search('url\(.+\)', contents): -+ if re.search(r'url\(.+\)', contents): - raise Exception( - 'Default HTMLGenerationController cannot handle inline style urls') - return contents ---- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py -+++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py -@@ -4,4 +4,4 @@ - - - def EscapeJSIfNeeded(js): -- return js.replace('', '<\/script>') -+ return js.replace(r'', r'<\/script>') ---- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py -+++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py -@@ -293,6 +293,6 @@ class HTMLModuleParser(): - html = '' - else: - if html.find('< /script>') != -1: -- raise Exception('Escape script tags with <\/script>') -+ raise Exception(r'Escape script tags with <\/script>') - - return HTMLModuleParserResults(html) ---- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py -+++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py -@@ -60,7 +60,7 @@ class ParsedStyleSheet(object): - return 'url(data:image/%s;base64,%s)' % (ext[1:], data.decode('utf-8')) - - # I'm assuming we only have url()'s associated with images -- return re.sub('url\((?P"|\'|)(?P[^"\'()]*)(?P=quote)\)', -+ return re.sub(r'url\((?P"|\'|)(?P[^"\'()]*)(?P=quote)\)', - InlineUrl, self.contents) - - def AppendDirectlyDependentFilenamesTo(self, dependent_filenames): -@@ -72,7 +72,7 @@ class ParsedStyleSheet(object): - raise Exception('@imports are not supported') - - matches = re.findall( -- 'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)', -+ r'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)', - self.contents) - - def resolve_url(url): ---- a/src/3rdparty/chromium/third_party/dawn/generator/generator_lib.py -+++ b/src/3rdparty/chromium/third_party/dawn/generator/generator_lib.py -@@ -119,8 +119,8 @@ class _PreprocessingLoader(jinja2.BaseLo - source = self.preprocess(f.read()) - return source, path, lambda: mtime == os.path.getmtime(path) - -- blockstart = re.compile('{%-?\s*(if|elif|else|for|block|macro)[^}]*%}') -- blockend = re.compile('{%-?\s*(end(if|for|block|macro)|elif|else)[^}]*%}') -+ blockstart = re.compile(r'{%-?\s*(if|elif|else|for|block|macro)[^}]*%}') -+ blockend = re.compile(r'{%-?\s*(end(if|for|block|macro)|elif|else)[^}]*%}') - - def preprocess(self, source): - lines = source.split('\n') ---- a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -+++ b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -@@ -16,6 +16,7 @@ import re - import subprocess - import sys - import traceback -+import types - - - class GoogleProtobufModuleImporter: diff --git a/srcpkgs/qt6-pdf/patches/0122-fix-aarch64-musl-memory-tagging-macros.patch b/srcpkgs/qt6-pdf/patches/0122-fix-aarch64-musl-memory-tagging-macros.patch deleted file mode 100644 index f2d6541b26f..00000000000 --- a/srcpkgs/qt6-pdf/patches/0122-fix-aarch64-musl-memory-tagging-macros.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/3rdparty/chromium/base/allocator/partition_allocator/tagging.cc -+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/tagging.cc -@@ -29,13 +29,25 @@ - #endif - #endif - --#ifndef HAS_PR_MTE_MACROS -+#ifndef PR_MTE_TCF_SHIFT - #define PR_MTE_TCF_SHIFT 1 -+#endif -+#ifndef PR_MTE_TCF_NONE - #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT) -+#endif -+#ifndef PR_MTE_TCF_SYNC - #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT) -+#endif -+#ifndef PR_MTE_TCF_ASYNC - #define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT) -+#endif -+#ifndef PR_MTE_TCF_MASK - #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT) -+#endif -+#ifndef PR_MTE_TAG_SHIFT - #define PR_MTE_TAG_SHIFT 3 -+#endif -+#ifndef PR_MTE_TAG_MASK - #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT) - #define HWCAP2_MTE (1 << 18) - #endif diff --git a/srcpkgs/qt6-pdf/patches/0132-libc_malloc.patch b/srcpkgs/qt6-pdf/patches/0132-libc_malloc.patch index 0352361083d..74f398d542a 100644 --- a/srcpkgs/qt6-pdf/patches/0132-libc_malloc.patch +++ b/srcpkgs/qt6-pdf/patches/0132-libc_malloc.patch @@ -1,19 +1,5 @@ --- a/src/3rdparty/chromium/base/process/memory_linux.cc +++ b/src/3rdparty/chromium/base/process/memory_linux.cc -@@ -18,6 +18,13 @@ - #include "base/threading/thread_restrictions.h" - #include "build/build_config.h" - -+#if defined(LIBC_GLIBC) -+extern "C" { -+extern void *__libc_malloc(size_t size); -+extern void *__libc_free(void *ptr); -+} -+#endif -+ - namespace base { - - namespace { @@ -111,7 +118,7 @@ bool UncheckedMalloc(size_t size, void** #elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || !defined(LIBC_GLIBC) || defined(TOOLKIT_QT) *result = malloc(size); diff --git a/srcpkgs/qt6-pdf/patches/0133-musl-no-execinfo.patch b/srcpkgs/qt6-pdf/patches/0133-musl-no-execinfo.patch index 3fa2dab93da..b6460ee330c 100644 --- a/srcpkgs/qt6-pdf/patches/0133-musl-no-execinfo.patch +++ b/srcpkgs/qt6-pdf/patches/0133-musl-no-execinfo.patch @@ -6,19 +6,19 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 -- --- a/src/3rdparty/chromium/v8/src/codegen/external-reference-table.cc +++ b/src/3rdparty/chromium/v8/src/codegen/external-reference-table.cc -@@ -12,7 +12,9 @@ - +@@ -11,7 +11,9 @@ + #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) #define SYMBOLIZE_FUNCTION +#if defined(__GLIBC__) #include +#endif - + #include - -@@ -118,7 +120,7 @@ void ExternalReferenceTable::Init(Isolat + +@@ -96,7 +98,7 @@ } - + const char* ExternalReferenceTable::ResolveSymbol(void* address) { -#ifdef SYMBOLIZE_FUNCTION +#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__) @@ -27,7 +27,7 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 // The array of names is malloc'ed. However, each name string is static --- a/src/3rdparty/chromium/base/debug/stack_trace.cc +++ b/src/3rdparty/chromium/base/debug/stack_trace.cc -@@ -273,7 +273,9 @@ void StackTrace::Print() const { +@@ -251,7 +253,9 @@ } void StackTrace::OutputToStream(std::ostream* os) const { @@ -37,7 +37,7 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 } std::string StackTrace::ToString() const { -@@ -281,7 +283,7 @@ std::string StackTrace::ToString() const +@@ -281,7 +281,7 @@ } std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { std::stringstream stream; @@ -48,7 +48,7 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 return stream.str(); --- a/src/3rdparty/chromium/base/debug/stack_trace_unittest.cc +++ b/src/3rdparty/chromium/base/debug/stack_trace_unittest.cc -@@ -33,7 +33,7 @@ typedef MultiProcessTest StackTraceTest; +@@ -33,7 +33,7 @@ typedef testing::Test StackTraceTest; #endif @@ -57,12 +57,3 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. // See https://crbug.com/706728 -@@ -156,7 +156,7 @@ TEST_F(StackTraceTest, DebugOutputToStre - - #endif // !defined(__UCLIBC__) && !defined(_AIX) - --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) -+#if (BUILDFLAG(IS_POSIX) && defined(__GLIBC__)) && !BUILDFLAG(IS_ANDROID) - #if !BUILDFLAG(IS_IOS) - static char* newArray() { - // Clang warns about the mismatched new[]/delete if they occur in the same diff --git a/srcpkgs/qt6-pdf/patches/0134-musl-no-mallinfo.patch b/srcpkgs/qt6-pdf/patches/0134-musl-no-mallinfo.patch index 3ec083a830f..c96d850172f 100644 --- a/srcpkgs/qt6-pdf/patches/0134-musl-no-mallinfo.patch +++ b/srcpkgs/qt6-pdf/patches/0134-musl-no-mallinfo.patch @@ -4,7 +4,7 @@ musl does not implement mallinfo()/mallinfo2() -- --- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc +++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc -@@ -199,7 +199,6 @@ void ReportMallinfoStats(ProcessMemoryDu +@@ -185,7 +185,6 @@ #define MALLINFO2_FOUND_IN_LIBC struct mallinfo2 info = mallinfo2(); #endif @@ -12,15 +12,15 @@ musl does not implement mallinfo()/mallinfo2() #if !defined(MALLINFO2_FOUND_IN_LIBC) struct mallinfo info = mallinfo(); #endif -@@ -221,6 +220,7 @@ void ReportMallinfoStats(ProcessMemoryDu - MemoryAllocatorDump::kUnitsBytes, - total_allocated_size); +@@ -205,6 +204,7 @@ + sys_alloc_dump->AddScalar(MemoryAllocatorDump::kNameSize, + MemoryAllocatorDump::kUnitsBytes, info.uordblks); } +#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ) } #endif -@@ -359,7 +359,7 @@ bool MallocDumpProvider::OnMemoryDump(co +@@ -339,7 +340,7 @@ &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. @@ -31,7 +31,7 @@ musl does not implement mallinfo()/mallinfo2() #endif --- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc +++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc -@@ -106,7 +106,7 @@ void IncreaseFdLimitTo(unsigned int max_ +@@ -105,7 +105,7 @@ #endif // !BUILDFLAG(IS_FUCHSIA) @@ -40,7 +40,7 @@ musl does not implement mallinfo()/mallinfo2() namespace { size_t GetMallocUsageMallinfo() { -@@ -124,7 +124,7 @@ size_t GetMallocUsageMallinfo() { +@@ -123,7 +123,7 @@ } } // namespace @@ -49,7 +49,7 @@ musl does not implement mallinfo()/mallinfo2() // BUILDFLAG(IS_ANDROID) size_t ProcessMetrics::GetMallocUsage() { -@@ -132,9 +132,9 @@ size_t ProcessMetrics::GetMallocUsage() +@@ -131,9 +131,9 @@ malloc_statistics_t stats = {0}; malloc_zone_statistics(nullptr, &stats); return stats.size_in_use; @@ -61,25 +61,26 @@ musl does not implement mallinfo()/mallinfo2() // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. return 0; #endif ---- a/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc -+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc -@@ -736,7 +736,7 @@ SHIM_ALWAYS_EXPORT int mallopt(int cmd, + #define HAVE_MALLOC_H 1 +--- a/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc ++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc +@@ -717,7 +717,7 @@ #endif // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if 0 SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW { - partition_alloc::SimplePartitionStatsDumper allocator_dumper; + base::SimplePartitionStatsDumper allocator_dumper; Allocator()->DumpStats("malloc", true, &allocator_dumper); ---- a/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc -+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc -@@ -24,7 +24,7 @@ namespace allocator_shim::internal { +--- a/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc ++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc +@@ -24,7 +24,7 @@ #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) // Platforms on which we override weak libc symbols. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) - PA_NOINLINE void FreeForTest(void* data) { + NOINLINE void FreeForTest(void* data) { free(data); diff --git a/srcpkgs/qt6-pdf/patches/0135-musl-partition-atfork.patch b/srcpkgs/qt6-pdf/patches/0135-musl-partition-atfork.patch index 1d838142146..b41ebf850a9 100644 --- a/srcpkgs/qt6-pdf/patches/0135-musl-partition-atfork.patch +++ b/srcpkgs/qt6-pdf/patches/0135-musl-partition-atfork.patch @@ -1,8 +1,8 @@ ---- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc -+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc -@@ -281,7 +281,7 @@ void PartitionAllocMallocInitOnce() { +--- a/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc ++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc +@@ -239,7 +239,7 @@ + if (!g_global_init_called.compare_exchange_strong(expected, true)) return; - } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) diff --git a/srcpkgs/qt6-pdf/patches/0138-no-mte.patch b/srcpkgs/qt6-pdf/patches/0138-no-mte.patch deleted file mode 100644 index 074a518d6cf..00000000000 --- a/srcpkgs/qt6-pdf/patches/0138-no-mte.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h -+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h -@@ -153,7 +153,7 @@ static_assert(sizeof(void*) != 8, ""); - defined(ARCH_CPU_LITTLE_ENDIAN)) - - #define PA_CONFIG_HAS_MEMORY_TAGGING() \ -- (defined(ARCH_CPU_ARM64) && defined(__clang__) && \ -+ (0 && defined(ARCH_CPU_ARM64) && defined(__clang__) && \ - !defined(ADDRESS_SANITIZER) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID))) - diff --git a/srcpkgs/qt6-pdf/patches/1000-cstdint.patch b/srcpkgs/qt6-pdf/patches/1000-cstdint.patch new file mode 100644 index 00000000000..baedcfced59 --- /dev/null +++ b/srcpkgs/qt6-pdf/patches/1000-cstdint.patch @@ -0,0 +1,10 @@ +--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc 2024-10-02 17:40:01.000000000 +0200 ++++ - 2024-11-17 01:58:53.289344135 +0100 +@@ -11,6 +11,7 @@ + #include "modules/audio_coding/neteq/reorder_optimizer.h" + + #include ++#include + #include + #include + diff --git a/srcpkgs/qt6-pdf/template b/srcpkgs/qt6-pdf/template index bb29283ebea..0caba75e9f0 100644 --- a/srcpkgs/qt6-pdf/template +++ b/srcpkgs/qt6-pdf/template @@ -1,7 +1,7 @@ # Template file for 'qt6-pdf' pkgname=qt6-pdf -version=6.7.2 -revision=2 +version=6.8.1 +revision=1 build_style=cmake configure_args="-DQT_FEATURE_qtpdf_build=ON -DQT_FEATURE_qtpdf_widgets_build=ON @@ -22,7 +22,7 @@ maintainer="John " license="GPL-3.0-only, GPL-2.0-only, LGPL-3.0-only, BSD-3-Clause" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebengine-everywhere-src-${version}.tar.xz" -checksum=c7755875594d8be382b07bf3634d44fd77012805794d8b588891709a6405ffd1 +checksum=1ba8e03ac8edcf50ce830e49b63db983de22e96757452975c1d3e6d120ae91bc if [ "$XBPS_LIBC" = "musl" ]; then hostmakedepends+=" musl-legacy-compat"