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@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@gentoo.org>
This commit is contained in:
Lukas Schmelting 2025-10-25 21:00:03 +02:00 committed by Sam James
parent b1233da614
commit 26c8f03d39
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
2 changed files with 6 additions and 10 deletions

View File

@ -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)

View File

@ -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)