diff options
| author | Ionen Wolkens <ionen@gentoo.org> | 2025-01-03 18:23:03 -0500 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2025-01-03 23:05:07 -0500 |
| commit | 8f8d34811c97d4029755419de65e7688923f0150 (patch) | |
| tree | 347074fd88050d86c9c97f3638b0bd3cd6ecc670 /dev-qt/qtwebengine | |
| parent | b9e4c3827f75753a37c270813b58f794001d3269 (diff) | |
| download | gentoo-8f8d34811c97d4029755419de65e7688923f0150.tar.gz gentoo-8f8d34811c97d4029755419de65e7688923f0150.tar.bz2 gentoo-8f8d34811c97d4029755419de65e7688923f0150.zip | |
dev-qt/qtwebengine: fix >=6.8 build with gcc+musl
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtwebengine')
4 files changed, 30 insertions, 1 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch new file mode 100644 index 000000000000..10f410856032 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch @@ -0,0 +1,26 @@ +Patch status: fixed in >=chromium-133.0.6892.0 + +IWYU issue, only manifests with gcc+musl (clang+musl or gcc+glibc are fine). +Backport of [1] (>=chromium-133.0.6892.0) and [2] (>=chromium-128.0.6571.0) + +Note have not tested USE=-jumbo-build which may expose more of these issues. + +TODO: merge in patchset's cstdint.patch and keep a note to review for 128/133 +given a lot of commits been adding cstdint/stdint.h and all hunks may not +necessarily fail to apply when fixed given headers being added differently + +[1] https://chromium.googlesource.com/external/webrtc/+/000f04375b67e6139a1dc88d832d2da65c7acb29 +[2] https://crrev.com/0d3d5062f7d5ff83f38685bf864c71dd5bd9d460 +--- a/src/3rdparty/chromium/content/public/browser/mhtml_generation_result.h ++++ b/src/3rdparty/chromium/content/public/browser/mhtml_generation_result.h +@@ -7,2 +7,3 @@ + ++#include <cstdint> + #include <optional> +--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc ++++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc +@@ -12,2 +12,4 @@ + ++#include <stdint.h> ++ + #include <algorithm> diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild index 0ae70e897de7..39e9490aeb43 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild @@ -110,6 +110,7 @@ PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.8.1-QTBUG-131156.patch "${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch + "${FILESDIR}"/${PN}-6.8.1-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index aabbe2abf000..0988f8bb29d5 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -109,6 +109,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch + "${FILESDIR}"/${PN}-6.8.1-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild index af3631213753..605f0c62a61f 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -105,6 +105,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.8.1-cstdint.patch ) python_check_deps() { |