diff options
Diffstat (limited to 'dev-qt/qtwebengine')
| -rw-r--r-- | dev-qt/qtwebengine/Manifest | 4 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.9.2-clang-21.patch | 42 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild | 3 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.9.2-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild | 3 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 |
6 files changed, 6 insertions, 51 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 1d056cabd1ed..72f360ad45bf 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,5 +1,5 @@ -DIST qtwebengine-6.10-patchset-2.tar.xz 8472 BLAKE2B e840893e0dc0a474a8d80dcb1bd5e920567132ca595afb8e57bc9dbaa9f2c9a9dad882d4aea02903e4d4a310a25903d417c036279a5f6390bea7d99cac70bf65 SHA512 801ebe3502b335cf7b10fa21a395e3a6bf82064b1a0ef583c75246cad349283e1b230ec62c23ec1005d6e49d6516cca12811e1518b61be2f6475ef879dba3cd4 +DIST qtwebengine-6.10-patchset-3.tar.xz 8824 BLAKE2B 2a613340478db3a258f29fb182ef161d3597d041b17a42598425a68366652f9c4233a02c7d103d46ce21bebbf2cb9db3e4064301f05608c260c94aeef6bb3299 SHA512 ec2a5303031a739cc9855f80e63c45e956caaa66ba3a672568e50174aade33c47478ba2026f4bac871b1b20e79552f0a85a06a743e6936840f2182a08cbe8dec DIST qtwebengine-6.9-patchset-6.tar.xz 8388 BLAKE2B 8e25f92dedfbb5d7dd267f27c1e62dd7d06db0b329f4b0fa13fe7bae6488338e6c93425a940d88333076bba2045df26e89b4ad7a9bb8a0b32d3f7f680cb032f4 SHA512 3eddf281d316967510a498e504d649380771ed39c5042bbf6c913266745bb09acce020416d066809a660a222734e532b4dfafc5750d16ae3069c0dc737871298 -DIST qtwebengine-6.9-patchset-8.tar.xz 8504 BLAKE2B 9e32dda3572ea2b6b86decfead75e3ca8a19b7ccb63ea76c6d042d56852adadf46c1d7d4f060aa05fea61023cf09c07582787fce27488e8c770c3c97474cd632 SHA512 53d52ffbeac4f6892e3facd47b667e6e7a146f3af12e3955bef515b44fbf2950744bb4e6b8f3d05db2671ef7364f20195d06a26db41ef225b94fee68c1c1e4bf +DIST qtwebengine-6.9-patchset-9.tar.xz 9380 BLAKE2B 328af192a73e75f42628c51ade567886a5f7fb6b4000be1dd65c9e5b21e3e7d8f3d96a75e7e6808917819477a36eede61387a6ffa4d6995b3becbbb4fcf1353d SHA512 7cc8415be54518a96db29515d8572bb55fcb85a1ca5ea71cb9261546d9ef22aa768c7cd35801d62cff86504e6d8d7631d7e71e49dfb2b280872b0493d691d72e DIST qtwebengine-everywhere-src-6.9.1.tar.xz 672204388 BLAKE2B a12e0c76862eff51622c5597c9ca0ca3e3967bc88b3c5cdc03357ba4bf4de14f6122fafb97c1fc80f3f9a3c0359a597afe4940293b0fa0baa0fb6f442dfba62e SHA512 fa1c5219973570ef1644d9bd5b12728056983b15002d08acfc9d76465b9055c3ac01be1f6a4ce4112b896988a4714000cf5353804cdf1af2b803bca962416ca5 DIST qtwebengine-everywhere-src-6.9.2.tar.xz 672191852 BLAKE2B 52c1537cffdc3d0b303252bc4bf00574122f8c06e5205fa0b2569287ef38d6799039672fabda907a73aa2240e34f0000d6da094221a749ec55cb237a64b9d3be SHA512 bcb5899170051e6e7f51e95a0a175f99eae26db393d674e8d1670e895ea75d2a7adda647c3ce1ff213c02a92062d164ddff6774f7d872e0762accedc28272e27 diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.9.2-clang-21.patch b/dev-qt/qtwebengine/files/qtwebengine-6.9.2-clang-21.patch deleted file mode 100644 index 374ee195dafe..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.9.2-clang-21.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://issues.chromium.org/issues/423841920 -https://chromium-review.googlesource.com/c/chromium/src/+/6633292 - -From b0ff8c3b258a8816c05bdebf472dbba719d3c491 Mon Sep 17 00:00:00 2001 -From: Hans Wennborg <hans@chromium.org> -Date: Tue, 10 Jun 2025 09:51:47 -0700 -Subject: [PATCH] Don't return an enum from EnumSizeTraits::Count - -`Enum::kMaxValue + 1` may be outside the representable range of the -enum, which Clang will treat as an error in constexpr contexts (see -bug). - -Bug: 423841920 -Change-Id: I629402cf93bd8419a71f94ff9ed9340d4f88a706 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6633292 -Auto-Submit: Hans Wennborg <hans@chromium.org> -Commit-Queue: Nico Weber <thakis@chromium.org> -Reviewed-by: Nico Weber <thakis@chromium.org> -Commit-Queue: Hans Wennborg <hans@chromium.org> -Cr-Commit-Position: refs/heads/main@{#1471871} ---- a/src/3rdparty/chromium/base/metrics/histogram_macros_internal.h -+++ b/src/3rdparty/chromium/base/metrics/histogram_macros_internal.h -@@ -28,16 +28,16 @@ - template <typename Enum> - requires(std::is_enum_v<Enum>) - struct EnumSizeTraits { -- static constexpr Enum Count() { -+ static constexpr uintmax_t Count() { - if constexpr (requires { Enum::kMaxValue; }) { - // Since the UMA histogram macros expect a value one larger than the max - // defined enumerator value, add one. -- return static_cast<Enum>(base::to_underlying(Enum::kMaxValue) + 1); -+ return static_cast<uintmax_t>(base::to_underlying(Enum::kMaxValue) + 1); - } else { - static_assert( - sizeof(Enum) == 0, - "enumerator must define kMaxValue enumerator to use this macro!"); -- return Enum(); -+ return 0; - } - } - }; diff --git a/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild index aa965f927509..3250fad51200 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild @@ -9,7 +9,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.10-patchset-2.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.10-patchset-3.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -107,7 +107,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.9.2-clang-21.patch "${FILESDIR}"/${PN}-6.9.3-QTBUG-139424.patch ) diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.2-r1.ebuild index 8f499444bb1c..b4d2a324d578 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.2-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.2-r1.ebuild @@ -9,7 +9,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-8.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-9.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -108,7 +108,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.9.2-clang-21.patch "${FILESDIR}"/${PN}-6.9.2-QTBUG-139424.patch ) diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild index 495a147c727f..dd409ca40f31 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild @@ -9,7 +9,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-8.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-9.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -108,7 +108,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.9.2-clang-21.patch "${FILESDIR}"/${PN}-6.9.3-QTBUG-139424.patch ) diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 60f91c70cdec..8e19d8f13ca9 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -9,7 +9,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.10-patchset-2.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.10-patchset-3.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then |