From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 88D771582EF for ; Tue, 04 Mar 2025 15:47:22 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 73B093430B3 for ; Tue, 04 Mar 2025 15:47:22 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 6A4601102D0; Tue, 04 Mar 2025 15:47:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 5EBD81102D0 for ; Tue, 04 Mar 2025 15:47:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0AEC83430B3 for ; Tue, 04 Mar 2025 15:47:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43EB01C65 for ; Tue, 04 Mar 2025 15:47:19 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1741103164.3985b22f517b17d7d503f1ebf798d757658dbc16.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch dev-qt/qtwebengine/files/qtwebengine-6.8.2-cstdint.patch dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ dev-qt/qtwebengine/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 3985b22f517b17d7d503f1ebf798d757658dbc16 X-VCS-Branch: master Date: Tue, 04 Mar 2025 15:47:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fd3c9516-e8f4-479e-a389-dcef602a57da X-Archives-Hash: e983fe0a94ec0dfc5181e73f91e15627 commit: 3985b22f517b17d7d503f1ebf798d757658dbc16 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Mar 4 15:39:22 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Mar 4 15:46:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3985b22f dev-qt/qtwebengine: backport another missing cstdint for gcc+musl Merging with the other cstdint patch to re-use the description. Believe 6.9 patchset is missing 1 bit of that patch that I forgot about when rebasing it, but will update the patchset for 6.9.0-rc later rather than make a separate patch here. Closes: https://bugs.gentoo.org/950579 Thanks-to: Anthony G. Basile gentoo.org> Signed-off-by: Ionen Wolkens gentoo.org> .../files/qtwebengine-6.8.1-cstdint.patch | 26 ------------------ .../files/qtwebengine-6.8.2-cstdint.patch | 32 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild | 2 +- dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 2 +- 4 files changed, 34 insertions(+), 28 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 deleted file mode 100644 index 10f410856032..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - #include ---- 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 -+ - #include diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.2-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.2-cstdint.patch new file mode 100644 index 000000000000..817b9ee949db --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.8.2-cstdint.patch @@ -0,0 +1,32 @@ +Patch status: fixed in >=chromium-133.0.6892.0 + +IWYU issue, only manifests with gcc+musl[1] (clang+musl or gcc+glibc are fine). +Backport of [2] (>=chromium-133.0.6892.0) + [3][4] (>=chromium-128.0.6571.0). + +TODO: [2] likely needs to be kept Qt6.9.0, but the rest is already present + +[1] https://bugs.gentoo.org/950579 +[2] https://chromium.googlesource.com/external/webrtc/+/000f04375b67e6139a1dc88d832d2da65c7acb29 +[3] https://crrev.com/0d3d5062f7d5ff83f38685bf864c71dd5bd9d460 +[4] https://crrev.com/26f3c318377ab31c2b317b656613e2d3c11ce513 +--- 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 + #include +--- a/src/3rdparty/chromium/extensions/browser/path_util.h ++++ b/src/3rdparty/chromium/extensions/browser/path_util.h +@@ -7,2 +7,5 @@ + ++#include ++#include ++ + #include "base/files/file_path.h" +--- 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 ++ + #include diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild index 9f63f5d27431..62c463abe8da 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild @@ -109,7 +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 + "${FILESDIR}"/${PN}-6.8.2-cstdint.patch "${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch ) diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index b41603e45458..7483978a7750 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -109,7 +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 + "${FILESDIR}"/${PN}-6.8.2-cstdint.patch "${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch )