commit: 26c8f03d39d3fdaad9d0ed4f42bde8bf2bfa3f83 Author: Lukas Schmelting <lschmelting <AT> posteo <DOT> com> AuthorDate: Sat Oct 25 19:00:03 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 25 19:19:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c8f03d
gnome-base/gnome-control-center: hard depend on gdk backends Since version 48.3 and for both the X and wayland gdk backends not all occurences of e.g. gdkx.h and gdkwayland.h are guarded GDK_WINDOWING_X11 and GDK_WINDOWING_WAYLAND, respectively. Closes: https://bugs.gentoo.org/964711 Signed-off-by: Lukas Schmelting <lschmelting <AT> posteo.com> Part-of: https://github.com/gentoo/gentoo/pull/44333 Closes: https://github.com/gentoo/gentoo/pull/44333 Signed-off-by: Sam James <sam <AT> gentoo.org> ...rol-center-48.3.ebuild => gnome-control-center-48.3-r1.ebuild} | 8 +++----- ...rol-center-48.4.ebuild => gnome-control-center-48.4-r1.ebuild} | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gnome-base/gnome-control-center/gnome-control-center-48.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-48.3-r1.ebuild similarity index 97% rename from gnome-base/gnome-control-center/gnome-control-center-48.3.ebuild rename to gnome-base/gnome-control-center/gnome-control-center-48.3-r1.ebuild index c42632528123..07074f8e83b5 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-48.3.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-48.3-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..14} ) -inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg +inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" HOMEPAGE="https://apps.gnome.org/Settings"; @@ -32,11 +32,11 @@ RESTRICT="!test? ( test )" # Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order DEPEND=" gnome-online-accounts? ( - x11-libs/gtk+:3[X?,wayland] + x11-libs/gtk+:3[X,wayland] >=net-libs/gnome-online-accounts-3.51.0:= ) >=media-libs/libpulse-2.0[glib] - >=gui-libs/gtk-4.17.1:4[X?,wayland] + >=gui-libs/gtk-4.17.1:4[X,wayland] >=gui-libs/libadwaita-1.7_alpha:1 >=sys-apps/accountsservice-23.11.69 >=x11-misc/colord-0.1.34:0= @@ -169,8 +169,6 @@ src_configure() { append-flags -fno-strict-aliasing filter-lto - use X || append-cppflags -DGENTOO_GTK_HIDE_X11 - local emesonargs=( $(meson_use bluetooth) $(meson_use cups) diff --git a/gnome-base/gnome-control-center/gnome-control-center-48.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-48.4-r1.ebuild similarity index 97% rename from gnome-base/gnome-control-center/gnome-control-center-48.4.ebuild rename to gnome-base/gnome-control-center/gnome-control-center-48.4-r1.ebuild index ac8ad3bf87aa..12d19df52a94 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-48.4.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-48.4-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..14} ) -inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg +inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" HOMEPAGE="https://apps.gnome.org/Settings"; @@ -32,11 +32,11 @@ RESTRICT="!test? ( test )" # Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order DEPEND=" gnome-online-accounts? ( - x11-libs/gtk+:3[X?,wayland] + x11-libs/gtk+:3[X,wayland] >=net-libs/gnome-online-accounts-3.51.0:= ) >=media-libs/libpulse-2.0[glib] - >=gui-libs/gtk-4.17.1:4[X?,wayland] + >=gui-libs/gtk-4.17.1:4[X,wayland] >=gui-libs/libadwaita-1.7_alpha:1 >=sys-apps/accountsservice-23.11.69 >=x11-misc/colord-0.1.34:0= @@ -169,8 +169,6 @@ src_configure() { append-flags -fno-strict-aliasing filter-lto - use X || append-cppflags -DGENTOO_GTK_HIDE_X11 - local emesonargs=( $(meson_use bluetooth) $(meson_use cups)
