From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99672159C96 for ; Sun, 28 Jul 2024 04:30:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8B522BC11D; Sun, 28 Jul 2024 04:30:07 +0000 (UTC) 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 pigeon.gentoo.org (Postfix) with ESMTPS id B61672BC11D for ; Sun, 28 Jul 2024 04:30:07 +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 B3416342F65 for ; Sun, 28 Jul 2024 04:30:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19D2A1DC5 for ; Sun, 28 Jul 2024 04:30:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1722140946.71aa9caf3b5d60044c6aafd2214e683d417c3d07.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 71aa9caf3b5d60044c6aafd2214e683d417c3d07 X-VCS-Branch: master Date: Sun, 28 Jul 2024 04:30:05 +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: 755124a4-814d-4d0b-bb33-2022d4fe8a7a X-Archives-Hash: 59cec1f5101cb513c13ff78d02f3037b commit: 71aa9caf3b5d60044c6aafd2214e683d417c3d07 Author: Sam James gentoo org> AuthorDate: Sun Jul 28 04:29:06 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 28 04:29:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71aa9caf dev-qt/qtwebengine: fix build with GCC 15 (qt5) Thanks to Ionen for finding the QUIC patch. We may end up needing more for qt5. Closes: https://bugs.gentoo.org/936416 Signed-off-by: Sam James gentoo.org> .../qtwebengine-5.15.13_p20240510-gcc15.patch | 35 ++++++++++++++++++++++ .../qtwebengine-5.15.14_p20240510.ebuild | 5 +++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch new file mode 100644 index 000000000000..d3073b6c5ab6 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/936416 + +Backport of two upstream commits: +* https://chromium-review.googlesource.com/c/chromium/src/+/5512719 +* https://quiche.googlesource.com/quiche/+/c1af894e0f5c4f732a983e7c93227854e203570e%5E%21/#F0 +--- a/src/3rdparty/chromium/base/containers/id_map.h ++++ b/src/3rdparty/chromium/base/containers/id_map.h +@@ -153,8 +153,8 @@ class IDMap final { + } + + const Iterator& operator=(const Iterator& iter) { +- map_ = iter.map; +- iter_ = iter.iter; ++ map_ = iter.map_; ++ iter_ = iter.iter_; + Init(); + return *this; + } +--- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_interval_deque.h ++++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_interval_deque.h +@@ -198,12 +198,12 @@ class QUIC_NO_EXPORT QuicIntervalDeque { + Iterator operator+(difference_type amount) const { + Iterator copy = *this; + copy.index_ += amount; +- DCHECK(copy.index_ < copy.deque_->size()); ++ DCHECK(copy.index_ < copy.deque_->Size()); + return copy; + } + Iterator& operator+=(difference_type amount) { + index_ += amount; +- DCHECK(index_ < deque_->size()); ++ DCHECK(index_ < deque_->Size()); + return *this; + } + difference_type operator-(const Iterator& rhs) const { diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild index 9eea881bc404..63451386d971 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild @@ -99,7 +99,10 @@ BDEPEND="${PYTHON_DEPS} sys-devel/flex " -PATCHES=( "${WORKDIR}/${PATCHSET}" ) +PATCHES=( + "${WORKDIR}/${PATCHSET}" + "${FILESDIR}/${PN}-5.15.13_p20240510-gcc15.patch" +) python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"