commit: 4485e2110b6c3f615600c821e9377b93bada4f18 Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> AuthorDate: Sun Apr 27 16:51:52 2025 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Sun Apr 27 16:51:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4485e211
x11-libs/wxGTK: sync fixes for automagic gtk USE-dependency from 3.2.5 Again. Previously, 61e4c96e477a6b78883c8032d9677d7474778251. This time the PR was merged after the in-tree ebuilds were fixed up, but was not rebased on the fix before merging it. Fixes: 1c8ca88115f6f0d8595d99cf3fbd7c148ff6b288 Fixes: https://github.com/gentoo/gentoo/pull/39465 Bug: https://bugs.gentoo.org/927952 Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> x11-libs/wxGTK/{wxGTK-3.2.6.ebuild => wxGTK-3.2.6-r1.ebuild} | 8 ++++++-- x11-libs/wxGTK/{wxGTK-3.2.7.ebuild => wxGTK-3.2.7-r1.ebuild} | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/x11-libs/wxGTK/wxGTK-3.2.6.ebuild b/x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild similarity index 96% rename from x11-libs/wxGTK/wxGTK-3.2.6.ebuild rename to x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild index a072cdb09677..268a3fd5daf8 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.6.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit" +IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" RESTRICT="!test? ( test )" @@ -38,7 +38,7 @@ RDEPEND=" media-libs/libpng:0=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[wayland?,${MULTILIB_USEDEP}] + >=x11-libs/gtk+-3.24.41-r1:3[wayland?,X?,${MULTILIB_USEDEP}] x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] x11-libs/libSM[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] @@ -123,6 +123,10 @@ 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 + # Workaround for bug #915154 append-ldflags $(test-flags-CCLD -Wl,--undefined-version) diff --git a/x11-libs/wxGTK/wxGTK-3.2.7.ebuild b/x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild similarity index 96% rename from x11-libs/wxGTK/wxGTK-3.2.7.ebuild rename to x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild index 96e3ced48c0b..38fba1b7d2a7 100644 --- a/x11-libs/wxGTK/wxGTK-3.2.7.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/wxWidgets-${PV}" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" SLOT="${WXRELEASE}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit" +IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" RESTRICT="!test? ( test )" @@ -38,7 +38,7 @@ RDEPEND=" media-libs/libpng:0=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[wayland?,${MULTILIB_USEDEP}] + >=x11-libs/gtk+-3.24.41-r1:3[wayland?,X?,${MULTILIB_USEDEP}] x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] x11-libs/libSM[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] @@ -123,6 +123,10 @@ 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 + # Workaround for bug #915154 append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
