commit: 0a56e4f46c207042d06998548985aaf7698c2f8e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Oct 16 11:46:52 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 16 11:48:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a56e4f4
gui-libs/gtk: restore x86 workaround 9780d05fabc4714201eafa2b345e545ae81a4cb5 added 4.18.6-r1 and the commit adding 0a5f410f1f893d0edb8947d7a1f800741b91b2ea came after (so only touched older ebuilds) but didn't notice, so it got lost on future bumps. Bug: https://bugs.gentoo.org/943705 Closes: https://bugs.gentoo.org/964353 Signed-off-by: Sam James <sam <AT> gentoo.org> gui-libs/gtk/gtk-4.18.6-r1.ebuild | 4 +++- gui-libs/gtk/gtk-4.20.1.ebuild | 4 +++- gui-libs/gtk/gtk-4.20.2.ebuild | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gui-libs/gtk/gtk-4.18.6-r1.ebuild b/gui-libs/gtk/gtk-4.18.6-r1.ebuild index 9fb5726b7cd5..2b7450b95058 100644 --- a/gui-libs/gtk/gtk-4.18.6-r1.ebuild +++ b/gui-libs/gtk/gtk-4.18.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..14} ) -inherit gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs virtualx xdg +inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs virtualx xdg DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces" HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"; @@ -148,6 +148,8 @@ src_prepare() { } src_configure() { + use x86 && append-flags -DDISABLE_X64=1 #943705 https://gitlab.gnome.org/GNOME/gtk/-/issues/4173 + local emesonargs=( # GDK backends $(meson_use X x11-backend) diff --git a/gui-libs/gtk/gtk-4.20.1.ebuild b/gui-libs/gtk/gtk-4.20.1.ebuild index 216584e772c6..5095297ab9a8 100644 --- a/gui-libs/gtk/gtk-4.20.1.ebuild +++ b/gui-libs/gtk/gtk-4.20.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..14} ) -inherit gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs virtualx xdg +inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs virtualx xdg DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces" HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"; @@ -150,6 +150,8 @@ src_prepare() { } src_configure() { + use x86 && append-flags -DDISABLE_X64=1 #943705 https://gitlab.gnome.org/GNOME/gtk/-/issues/4173 + local emesonargs=( # GDK backends $(meson_use X x11-backend) diff --git a/gui-libs/gtk/gtk-4.20.2.ebuild b/gui-libs/gtk/gtk-4.20.2.ebuild index 216584e772c6..5095297ab9a8 100644 --- a/gui-libs/gtk/gtk-4.20.2.ebuild +++ b/gui-libs/gtk/gtk-4.20.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..14} ) -inherit gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs virtualx xdg +inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs virtualx xdg DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces" HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"; @@ -150,6 +150,8 @@ src_prepare() { } src_configure() { + use x86 && append-flags -DDISABLE_X64=1 #943705 https://gitlab.gnome.org/GNOME/gtk/-/issues/4173 + local emesonargs=( # GDK backends $(meson_use X x11-backend)
