commit:     024c9916dd2727100306e1594c9346c18e282015
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 11 03:22:31 2025 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Wed Jun 11 03:39:40 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024c9916

x11-misc/gigolo: avoid automagic deps on gtk+[X]

e.g. the upstream code checks whether GDK_WINDOWING_X11 is defined
by the gtk headers, and if so will compile against the x11 symbols
it provides. This means that gigolo built on a system with gtk+[-X]
will be compatible with anything, but when built on a system with
gtk+[X], requires that at runtime.

Use a Gentoo-specific macro hack to hide the GTK implementations when we
don't want it, alongside new USE flags to control the dependency usage.

Closes: https://bugs.gentoo.org/957781
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 x11-misc/gigolo/{gigolo-0.6.0.ebuild => gigolo-0.6.0-r1.ebuild} | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/x11-misc/gigolo/gigolo-0.6.0.ebuild 
b/x11-misc/gigolo/gigolo-0.6.0-r1.ebuild
similarity index 85%
rename from x11-misc/gigolo/gigolo-0.6.0.ebuild
rename to x11-misc/gigolo/gigolo-0.6.0-r1.ebuild
index eb2220adf93f..84ef786e06fa 100644
--- a/x11-misc/gigolo/gigolo-0.6.0.ebuild
+++ b/x11-misc/gigolo/gigolo-0.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson xdg-utils
+inherit flag-o-matic meson xdg-utils
 
 DESCRIPTION="A frontend to easily manage connections to remote filesystems 
using GIO/GVfs"
 HOMEPAGE="
@@ -15,10 +15,11 @@ 
SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.xz";
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
+IUSE="X"
 
 DEPEND="
        >=dev-libs/glib-2.66.0
-       >=x11-libs/gtk+-3.24.0:3
+       >=x11-libs/gtk+-3.24.0:3[X?]
 "
 RDEPEND="
        ${DEPEND}
@@ -29,6 +30,9 @@ BDEPEND="
 "
 
 src_configure() {
+       # defang automagic dependencies
+       use X || append-flags -DGENTOO_GTK_HIDE_X11
+
        local emesonargs=(
                -Ddocdir=share/doc/${PF}
        )

Reply via email to