gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

x11-libs/wxGTK: fix automagic gtk USE-dependency yet again, maybe for real

Browse Source 
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@gentoo.org>
This commit is contained in:
Eli Schwartz
2025-08-18 15:16:37 -04:00
parent 7985cc5f2b
commit f93b9fcea7
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild → x11-libs/wxGTK/wxGTK-3.2.6-r2.ebuild
View File

@@ -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)

7
x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild → x11-libs/wxGTK/wxGTK-3.2.7-r2.ebuild
View File

@@ -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)

4
x11-libs/wxGTK/wxGTK-3.2.8.ebuild → x11-libs/wxGTK/wxGTK-3.2.8-r1.ebuild
View File

@@ -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

4
x11-libs/wxGTK/wxGTK-3.2.8.1-r1.ebuild → x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild
View File

@@ -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