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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9EF51581EC for ; Fri, 22 Nov 2024 19:15:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B5D7E087D; Fri, 22 Nov 2024 19:15:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 pigeon.gentoo.org (Postfix) with ESMTPS id 09FB4E087D for ; Fri, 22 Nov 2024 19:15:05 +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 E618534027D for ; Fri, 22 Nov 2024 19:15:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52C3A18C4 for ; Fri, 22 Nov 2024 19:15:01 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1732302810.5104c2485d7b397387d21913d76ff9b262a2ca91.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ dev-qt/qtwebengine/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5104c2485d7b397387d21913d76ff9b262a2ca91 X-VCS-Branch: master Date: Fri, 22 Nov 2024 19:15:01 +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: b243a42f-e68a-4a3a-8c11-003c5129bf94 X-Archives-Hash: e5b31b66dccf2694dfdd2584988ef3d3 commit: 5104c2485d7b397387d21913d76ff9b262a2ca91 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 22 19:13:30 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 22 19:13:30 2024 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5104c248 dev-qt/qtwebengine: Drop upstreamed patch Signed-off-by: Andreas Sturmlechner gentoo.org> .../qtwebengine-5.15.13_p20240510-gcc15.patch | 35 ---------------------- dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild | 1 - 2 files changed, 36 deletions(-) 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 deleted file mode 100644 index d3073b6c..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch +++ /dev/null @@ -1,35 +0,0 @@ -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.16.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild index 3833e554..eb2dc1c5 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild @@ -100,7 +100,6 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${WORKDIR}/${PATCHSET}" - "${FILESDIR}/${PN}-5.15.13_p20240510-gcc15.patch" "${FILESDIR}/${PN}-5.15.14_p20240510-re2.patch" # bug 913923 "${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-cstdint.patch" "${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-template-id-cdtor.patch"