commit: f0b3fbf765c8b98cffe91574d8a9f03d5326563d Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Oct 5 14:28:20 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Oct 5 19:38:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b3fbf7
dev-qt/qtwebengine: fix build with gcc13+musl Primarily been testing musl on a llvm-musl profile, so overlooked this. Does not manifest as an issue if use any of gcc12, clang, or glibc. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../files/qtwebengine-6.5.2-cstdint.patch | 27 ++++++++++++++++++++++ .../files/qtwebengine-6.6.0-cstdint.patch | 16 +++++++++++++ dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 1 + 6 files changed, 47 insertions(+) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch new file mode 100644 index 000000000000..cf8e55c556c6 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch @@ -0,0 +1,27 @@ +Patch status: limbo, partially needs upstreaming + +Only manifests as an issue with gcc-13+musl which does not transitively +include cstdint / stdint.h for the int32/64_t usage. + +Partially fixed by [1] (>=chromium-110.0.5434.0) given it removes the +int64_t usage altogether in seed_response.h. + +[1] https://crrev.com/01e21a077a0354d85e8359195613c2781f67a3a2 +--- a/src/3rdparty/chromium/components/variations/seed_response.h ++++ b/src/3rdparty/chromium/components/variations/seed_response.h +@@ -7,2 +7,3 @@ + ++#include <cstdint> + #include <string> +--- a/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h ++++ b/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h +@@ -7,2 +7,3 @@ + ++#include <cstdint> + #include <vector> +--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h ++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h +@@ -16,2 +16,3 @@ + ++#include <cstdint> + #include <string> diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch new file mode 100644 index 000000000000..d59d327af7c5 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch @@ -0,0 +1,16 @@ +Patch status: limbo, needs upstreaming + +Only manifests as an issue with gcc-13+musl which does not transitively +include cstdint / stdint.h for the int32/64_t usage. +--- a/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h ++++ b/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h +@@ -7,2 +7,3 @@ + ++#include <cstdint> + #include <vector> +--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h ++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h +@@ -16,2 +16,3 @@ + ++#include <cstdint> + #include <string> diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild index 01b5cf6327c3..0d9285e3a57c 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild @@ -102,6 +102,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch + "${FILESDIR}"/${PN}-6.5.2-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild index 26cc25ef040a..cf093a70d1af 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild @@ -103,6 +103,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch + "${FILESDIR}"/${PN}-6.5.2-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild index 876a6ad25d54..768571ff7ca4 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild @@ -112,6 +112,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.6.0-cstdint.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild index 876a6ad25d54..768571ff7ca4 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild @@ -112,6 +112,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.6.0-cstdint.patch ) python_check_deps() {
