From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1605320-garchives=archives.gentoo.org@lists.gentoo.org>
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 3CDAC158041
for <garchives@archives.gentoo.org>; Thu, 29 Feb 2024 02:09:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7BC89E2A38;
Thu, 29 Feb 2024 02:09:42 +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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 55235E2A38
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Feb 2024 02:09:42 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 58B74343029
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Feb 2024 02:09:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DC73E14E0
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Feb 2024 02:09:39 +0000 (UTC)
From: "Ionen Wolkens" <ionen@gentoo.org>
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" <ionen@gentoo.org>
Message-ID: <1709172362.e0226bb33e74851ac96f181ae9bf43f60e7e991c.ionen@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-qt/qtbase/qtbase-6.6.9999.ebuild dev-qt/qtbase/qtbase-6.7.9999.ebuild dev-qt/qtbase/qtbase-6.9999.ebuild
X-VCS-Directories: dev-qt/qtbase/
X-VCS-Committer: ionen
X-VCS-Committer-Name: Ionen Wolkens
X-VCS-Revision: e0226bb33e74851ac96f181ae9bf43f60e7e991c
X-VCS-Branch: master
Date: Thu, 29 Feb 2024 02:09:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f005438b-730b-4ce7-88d9-bb3d8927c22c
X-Archives-Hash: 4a878c8419f426bc7fa1399cbfb01960
commit: e0226bb33e74851ac96f181ae9bf43f60e7e991c
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 29 02:05:07 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 02:06:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0226bb3
dev-qt/qtbase: drop upstreamed x32 fix from live
Thanks for getting this fixed upstream.
Bug: https://bugs.gentoo.org/925103
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.6.9999.ebuild | 1 -
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 1 -
dev-qt/qtbase/qtbase-6.9999.ebuild | 1 -
3 files changed, 3 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index a39a20691815..d7b14a3f1a66 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -137,7 +137,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
- "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index c2827c3f3ac9..e2aa70f1ea9b 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -138,7 +138,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
- "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index c2827c3f3ac9..e2aa70f1ea9b 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -138,7 +138,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
- "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
)
src_prepare() {