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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29A9515827B for ; Tue, 19 Aug 2025 19:08:12 +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) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 083DA342394 for ; Tue, 19 Aug 2025 19:08:12 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 3ACA6110564; Tue, 19 Aug 2025 19:08:01 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 299CC110564 for ; Tue, 19 Aug 2025 19:08:01 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4013342359 for ; Tue, 19 Aug 2025 19:08:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D558344D for ; Tue, 19 Aug 2025 19:07:58 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1755630359.f93b9fcea73460ef443b5d90dec31c8bb0225b6a.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild x11-libs/wxGTK/wxGTK-3.2.6-r2.ebuild x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild x11-libs/wxGTK/wxGTK-3.2.7-r2.ebuild x11-libs/wxGTK/wxGTK-3.2.8-r1.ebuild x11-libs/wxGTK/wxGTK-3.2.8.1-r1.ebuild x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild x11-libs/wxGTK/wxGTK-3.2.8.ebuild X-VCS-Directories: x11-libs/wxGTK/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: f93b9fcea73460ef443b5d90dec31c8bb0225b6a X-VCS-Branch: master Date: Tue, 19 Aug 2025 19:07:58 +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: 66cd24a6-8d32-4d3b-b97a-ba295a2b9ea4 X-Archives-Hash: 1fc252092a9fc7ed7479431ce4aab272 commit: f93b9fcea73460ef443b5d90dec31c8bb0225b6a Author: Eli Schwartz gentoo org> AuthorDate: Mon Aug 18 19:16:37 2025 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Tue Aug 19 19:05:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93b9fce x11-libs/wxGTK: fix automagic gtk USE-dependency yet again, maybe for real append-* has many variants: - flags - cppflags - cflags - cxxflags Somehow we ended up using number 3, which doesn't include number 4, despite which, wxGTK has mixed C / C++ sources that both use GDK_WINDOWING_*. Newer versions of my QA script do catch this -- tested locally. Since it processes the RDEPEND file from metadata rather than ${RDEPEND}, it knows that [wayland?] when it was *disabled* cannot still have the relevant symbols... something only possible when the macro has been typoed. Closes: https://bugs.gentoo.org/961621 Signed-off-by: Eli Schwartz gentoo.org> x11-libs/wxGTK/{wxGTK-3.2.6-r1.ebuild => wxGTK-3.2.6-r2.ebuild} | 7 +++++-- x11-libs/wxGTK/{wxGTK-3.2.7-r1.ebuild => wxGTK-3.2.7-r2.ebuild} | 7 +++++-- x11-libs/wxGTK/{wxGTK-3.2.8.ebuild => wxGTK-3.2.8-r1.ebuild} | 4 ++-- .../wxGTK/{wxGTK-3.2.8.1-r1.ebuild => wxGTK-3.2.8.1-r2.ebuild} | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.6-r2.ebuild similarity index 97% rename from x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild rename to x11-libs/wxGTK/wxGTK-3.2.6-r2.ebuild index 268a3fd5daf8..865c7e0ff1ba 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.6-r2.ebuild @@ -124,8 +124,11 @@ src_prepare() { multilib_src_configure() { # defang automagic dependencies, bug #927952 - use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND - use X || append-cflags -DGENTOO_GTK_HIDE_X11 + use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cppflags -DGENTOO_GTK_HIDE_X11 + + # bug #952961 + tc-is-lto && filter-flags -fno-semantic-interposition # Workaround for bug #915154 append-ldflags $(test-flags-CCLD -Wl,--undefined-version) diff --git a/x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.7-r2.ebuild similarity index 97% rename from x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild rename to x11-libs/wxGTK/wxGTK-3.2.7-r2.ebuild index bf0c05822f25..9e7175d3a1a2 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.7-r2.ebuild @@ -124,8 +124,11 @@ src_prepare() { multilib_src_configure() { # defang automagic dependencies, bug #927952 - use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND - use X || append-cflags -DGENTOO_GTK_HIDE_X11 + use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cppflags -DGENTOO_GTK_HIDE_X11 + + # bug #952961 + tc-is-lto && filter-flags -fno-semantic-interposition # Workaround for bug #915154 append-ldflags $(test-flags-CCLD -Wl,--undefined-version) diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8-r1.ebuild similarity index 98% rename from x11-libs/wxGTK/wxGTK-3.2.8.ebuild rename to x11-libs/wxGTK/wxGTK-3.2.8-r1.ebuild index 9a231b453e32..aace41198824 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.8-r1.ebuild @@ -128,8 +128,8 @@ src_prepare() { multilib_src_configure() { # defang automagic dependencies, bug #927952 - use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND - use X || append-cflags -DGENTOO_GTK_HIDE_X11 + use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cppflags -DGENTOO_GTK_HIDE_X11 # bug #952961 tc-is-lto && filter-flags -fno-semantic-interposition diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild similarity index 98% rename from x11-libs/wxGTK/wxGTK-3.2.8.1-r1.ebuild rename to x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild index f7a8db41eed4..2fc5cd04a3da 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.8.1-r1.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild @@ -83,8 +83,8 @@ PATCHES=( multilib_src_configure() { # defang automagic dependencies, bug #927952 - use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND - use X || append-cflags -DGENTOO_GTK_HIDE_X11 + use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cppflags -DGENTOO_GTK_HIDE_X11 # bug #952961 tc-is-lto && filter-flags -fno-semantic-interposition