commit: f93b9fcea73460ef443b5d90dec31c8bb0225b6a
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 18 19:16:37 2025 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> 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 <eschwartz <AT> 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
