commit: 893b1340a565c808a1fc6f04307e55e38fa33a73 Author: Lukas Schmelting <lschmelting <AT> posteo <DOT> com> AuthorDate: Tue Nov 4 18:02:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 10 02:52:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893b1340
gnome-base/nautilus: hard depend on gdk X and wayland backends Eli Schwartz is in discussion with upstream about making the X and wayland gdk backends optional. Hard depend on those backends in the mean time, letting users successfully compile nautilus when setting USE="-X" or USE="-wayland". See-also: https://gitlab.gnome.org/GNOME/nautilus/-/issues/4025 Bug: https://bugs.gentoo.org/963534 Signed-off-by: Lukas Schmelting <lschmelting <AT> posteo.com> Part-of: https://github.com/gentoo/gentoo/pull/44469 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{nautilus-47.4-r1.ebuild => nautilus-47.4-r2.ebuild} | 9 +++------ .../{nautilus-47.5-r1.ebuild => nautilus-47.5-r2.ebuild} | 9 +++------ .../{nautilus-48.3-r1.ebuild => nautilus-48.3-r2.ebuild} | 9 +++------ .../{nautilus-48.4.1.ebuild => nautilus-48.4.1-r1.ebuild} | 9 +++------ 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/gnome-base/nautilus/nautilus-47.4-r1.ebuild b/gnome-base/nautilus/nautilus-47.4-r2.ebuild similarity index 90% rename from gnome-base/nautilus/nautilus-47.4-r1.ebuild rename to gnome-base/nautilus/nautilus-47.4-r2.ebuild index 961fdfea1f63..522e3a2025a3 100644 --- a/gnome-base/nautilus/nautilus-47.4-r1.ebuild +++ b/gnome-base/nautilus/nautilus-47.4-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg +inherit 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="X +cloudproviders doc gnome +gstreamer +introspection +previewer selinux wayland" +IUSE="+cloudproviders doc gnome +gstreamer +introspection +previewer selinux" 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[X?,introspection?,wayland?] + >=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,9 +76,6 @@ 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-r1.ebuild b/gnome-base/nautilus/nautilus-47.5-r2.ebuild similarity index 89% rename from gnome-base/nautilus/nautilus-47.5-r1.ebuild rename to gnome-base/nautilus/nautilus-47.5-r2.ebuild index 587361061f95..b9272fb945dd 100644 --- a/gnome-base/nautilus/nautilus-47.5-r1.ebuild +++ b/gnome-base/nautilus/nautilus-47.5-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg +inherit 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="X +cloudproviders doc gnome +gstreamer +introspection +previewer selinux wayland" +IUSE="+cloudproviders doc gnome +gstreamer +introspection +previewer selinux" 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[X?,introspection?,wayland?] + >=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,9 +74,6 @@ 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-r1.ebuild b/gnome-base/nautilus/nautilus-48.3-r2.ebuild similarity index 89% rename from gnome-base/nautilus/nautilus-48.3-r1.ebuild rename to gnome-base/nautilus/nautilus-48.3-r2.ebuild index f5c1d8cfc2e0..0ee79002d847 100644 --- a/gnome-base/nautilus/nautilus-48.3-r1.ebuild +++ b/gnome-base/nautilus/nautilus-48.3-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg +inherit 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="X +cloudproviders doc gnome +gstreamer +introspection +previewer selinux wayland" +IUSE="+cloudproviders doc gnome +gstreamer +introspection +previewer selinux" 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[X?,introspection?,wayland?] + >=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,9 +74,6 @@ 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.4.1.ebuild b/gnome-base/nautilus/nautilus-48.4.1-r1.ebuild similarity index 89% rename from gnome-base/nautilus/nautilus-48.4.1.ebuild rename to gnome-base/nautilus/nautilus-48.4.1-r1.ebuild index 265860c67a04..43790c90f51d 100644 --- a/gnome-base/nautilus/nautilus-48.4.1.ebuild +++ b/gnome-base/nautilus/nautilus-48.4.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg +inherit 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="X +cloudproviders doc gnome +gstreamer +introspection +previewer selinux wayland" +IUSE="+cloudproviders doc gnome +gstreamer +introspection +previewer selinux" REQUIRED_USE="doc? ( introspection )" DEPEND=" @@ -24,7 +24,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[X?,introspection?,wayland?] + >=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 @@ -73,9 +73,6 @@ 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
