commit: 6e2554159f17e7e10e06a017fc87185f540e6952 Author: Lukas Schmelting <lschmelting <AT> posteo <DOT> com> AuthorDate: Sat Sep 20 15:19:04 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 16 08:15:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e255415
gnome-base/nautilus: enforce binary depend on gtk x11/wayland backends ``` * QA Notice: binaries depend on Gtk's wayland-specific ABI without USE dep: * * /usr/bin/nautilus * QA Notice: binaries depend on Gtk's x11-specific ABI without USE dep: * * /usr/bin/nautilus ``` Closes: https://bugs.gentoo.org/960859 Signed-off-by: Lukas Schmelting <lschmelting <AT> posteo.com> Part-of: https://github.com/gentoo/gentoo/pull/43235 Signed-off-by: Sam James <sam <AT> gentoo.org> .../nautilus/{nautilus-47.4.ebuild => nautilus-47.4-r1.ebuild} | 9 ++++++--- .../nautilus/{nautilus-47.5.ebuild => nautilus-47.5-r1.ebuild} | 9 ++++++--- .../nautilus/{nautilus-48.3.ebuild => nautilus-48.3-r1.ebuild} | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gnome-base/nautilus/nautilus-47.4.ebuild b/gnome-base/nautilus/nautilus-47.4-r1.ebuild similarity index 90% rename from gnome-base/nautilus/nautilus-47.4.ebuild rename to gnome-base/nautilus/nautilus-47.4-r1.ebuild index d8d2c6aadefb..26fdac4499b2 100644 --- a/gnome-base/nautilus/nautilus-47.4.ebuild +++ b/gnome-base/nautilus/nautilus-47.4-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg +inherit flag-o-matic gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg DESCRIPTION="Default file manager for the GNOME desktop" HOMEPAGE="https://apps.gnome.org/Nautilus/"; @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" -IUSE="+cloudproviders doc gnome +gstreamer +introspection +previewer selinux" +IUSE="X +cloudproviders doc gnome +gstreamer +introspection +previewer selinux wayland" REQUIRED_USE="doc? ( introspection )" DEPEND=" @@ -25,7 +25,7 @@ DEPEND=" >=app-arch/gnome-autoar-0.4.4 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 - >=gui-libs/gtk-4.15.2:4[introspection?] + >=gui-libs/gtk-4.15.2:4[X?,introspection?,wayland?] >=gui-libs/libadwaita-1.6_beta:1 >=dev-libs/libportal-0.7:=[gtk] >=x11-libs/pango-1.28.3 @@ -76,6 +76,9 @@ src_prepare() { } src_configure() { + use X || append-cppflags -DGENTOO_GTK_HIDE_X11 + use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND + local emesonargs=( $(meson_use doc docs) -Dextensions=true # image file properties, also required for -Dgstreamer=true diff --git a/gnome-base/nautilus/nautilus-47.5.ebuild b/gnome-base/nautilus/nautilus-47.5-r1.ebuild similarity index 89% rename from gnome-base/nautilus/nautilus-47.5.ebuild rename to gnome-base/nautilus/nautilus-47.5-r1.ebuild index a9627b510094..9e2c4a7d3cbd 100644 --- a/gnome-base/nautilus/nautilus-47.5.ebuild +++ b/gnome-base/nautilus/nautilus-47.5-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg +inherit flag-o-matic gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg DESCRIPTION="Default file manager for the GNOME desktop" HOMEPAGE="https://apps.gnome.org/Nautilus/"; @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="+cloudproviders doc gnome +gstreamer +introspection +previewer selinux" +IUSE="X +cloudproviders doc gnome +gstreamer +introspection +previewer selinux wayland" REQUIRED_USE="doc? ( introspection )" DEPEND=" @@ -25,7 +25,7 @@ DEPEND=" >=app-arch/gnome-autoar-0.4.4 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 - >=gui-libs/gtk-4.15.2:4[introspection?] + >=gui-libs/gtk-4.15.2:4[X?,introspection?,wayland?] >=gui-libs/libadwaita-1.6_beta:1 >=dev-libs/libportal-0.7:=[gtk] >=x11-libs/pango-1.28.3 @@ -74,6 +74,9 @@ src_prepare() { } src_configure() { + use X || append-cppflags -DGENTOO_GTK_HIDE_X11 + use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND + local emesonargs=( $(meson_use doc docs) -Dextensions=true # image file properties, also required for -Dgstreamer=true diff --git a/gnome-base/nautilus/nautilus-48.3.ebuild b/gnome-base/nautilus/nautilus-48.3-r1.ebuild similarity index 89% rename from gnome-base/nautilus/nautilus-48.3.ebuild rename to gnome-base/nautilus/nautilus-48.3-r1.ebuild index c78426712886..3758f9f39ad3 100644 --- a/gnome-base/nautilus/nautilus-48.3.ebuild +++ b/gnome-base/nautilus/nautilus-48.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg +inherit flag-o-matic gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg DESCRIPTION="Default file manager for the GNOME desktop" HOMEPAGE="https://apps.gnome.org/Nautilus/"; @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="+cloudproviders doc gnome +gstreamer +introspection +previewer selinux" +IUSE="X +cloudproviders doc gnome +gstreamer +introspection +previewer selinux wayland" REQUIRED_USE="doc? ( introspection )" DEPEND=" @@ -25,7 +25,7 @@ DEPEND=" >=app-arch/gnome-autoar-0.4.4 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 - >=gui-libs/gtk-4.17.5:4[introspection?] + >=gui-libs/gtk-4.17.5:4[X?,introspection?,wayland?] >=gui-libs/libadwaita-1.6_beta:1 >=dev-libs/libportal-0.7:=[gtk] >=x11-libs/pango-1.28.3 @@ -74,6 +74,9 @@ src_prepare() { } src_configure() { + use X || append-cppflags -DGENTOO_GTK_HIDE_X11 + use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND + local emesonargs=( $(meson_use doc docs) -Dextensions=true # image file properties, also required for -Dgstreamer=true
