From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1719307-garchives=archives.gentoo.org@lists.gentoo.org>
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 C5A731582EF
for <garchives@archives.gentoo.org>; Tue, 18 Feb 2025 22:10:09 +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 AC5833430D7
for <garchives@archives.gentoo.org>; Tue, 18 Feb 2025 22:10:09 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id AE772110471;
Tue, 18 Feb 2025 22:10:08 +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 bobolink.gentoo.org (Postfix) with ESMTPS id A369C110470
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Feb 2025 22:10:08 +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 54E45341256
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Feb 2025 22:10:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AC693175A
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Feb 2025 22:10:06 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1739916577.2a8e6ca015fa6107230f131d1232bfe2bb55bcbd.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/files/, dev-python/wxpython/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch dev-python/wxpython/wxpython-4.2.1-r2.ebuild
X-VCS-Directories: dev-python/wxpython/files/ dev-python/wxpython/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 2a8e6ca015fa6107230f131d1232bfe2bb55bcbd
X-VCS-Branch: master
Date: Tue, 18 Feb 2025 22:10:06 +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: e9bddece-220a-4cb3-a64a-bd34c95e4568
X-Archives-Hash: c1624dfeda6e8562102cb22c2bc1a119
commit: 2a8e6ca015fa6107230f131d1232bfe2bb55bcbd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 22:09:19 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 22:09:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8e6ca0
dev-python/wxpython: fix build w/ >=dev-python/sip-6.10.0
Closes: https://bugs.gentoo.org/949510
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../wxpython/files/wxpython-4.2.1-sip-6.10.0.patch | 23 ++++++++++++++++++++++
dev-python/wxpython/wxpython-4.2.1-r2.ebuild | 3 ++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch b/dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch
new file mode 100644
index 000000000000..5d6751d7a8d4
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/949510#c4
+https://github.com/wxWidgets/Phoenix/commit/de9aa4be5bb49adf82991c7582ea3c42ed505bf7.patch
+
+From de9aa4be5bb49adf82991c7582ea3c42ed505bf7 Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt@techie.net>
+Date: Sun, 9 Feb 2025 17:50:08 -0500
+Subject: [PATCH] Update SIP ABI version to 12.14
+
+We haven't supported 12.8 since before we upgraded to SIP 6.6+.
+However, SIP has not been correctly generating the correct module
+version until very recently, so generating 12.8 doesn't actually compile
+with current wxPython.
+--- a/buildtools/config.py
++++ b/buildtools/config.py
+@@ -88,7 +88,7 @@ class Configuration(object):
+ PKGDIR = 'wx'
+ # The name of the top-level package
+
+- SIP_ABI = '12.8'
++ SIP_ABI = '12.14'
+ SIP_TRACE = False
+
+ # ---------------------------------------------------------------
diff --git a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
index ec62390a1579..0a82fba9a074 100644
--- a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
+++ b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.2.1-integer-division-for-randint.patch"
"${FILESDIR}/${PN}-4.2.1-x86-time.patch"
"${FILESDIR}/${PN}-4.2.1-doxygen-1.9.7.patch"
+ "${FILESDIR}/${PN}-4.2.1-sip-6.10.0.patch"
)
python_prepare_all() {