diff options
| author | Markus Volk <f_l_k@t-online.de> | 2026-01-22 16:43:34 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-01-27 11:58:25 -0800 |
| commit | 33f450b6273761c5b6ff7696eb083f7264d34601 (patch) | |
| tree | 0eb186694b93ecdfe2ec7559db7648d2a69bb841 | |
| parent | 67430e2a6705e899df9d51e20e9fb6ae483c71f9 (diff) | |
| download | meta-openembedded-33f450b6273761c5b6ff7696eb083f7264d34601.tar.gz | |
gnome-shell: fix build without x11 in DISTRO_FEATURES
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch | 30 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.3.bb | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch new file mode 100644 index 0000000000..e9cee8e91a --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From 2ae299419ec7b15a59e2b2b8a5b266b9f29df5a4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Thu, 22 Jan 2026 12:52:34 +0100 | ||
| 4 | Subject: [PATCH] shell-app-usage.c: only include x11 headers if HAVE_X11 | ||
| 5 | |||
| 6 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | --- | ||
| 10 | src/shell-app-usage.c | 2 ++ | ||
| 11 | 1 file changed, 2 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/src/shell-app-usage.c b/src/shell-app-usage.c | ||
| 14 | index 9e57a91b2..77adcf6a2 100644 | ||
| 15 | --- a/src/shell-app-usage.c | ||
| 16 | +++ b/src/shell-app-usage.c | ||
| 17 | @@ -5,8 +5,10 @@ | ||
| 18 | #include <string.h> | ||
| 19 | #include <stdlib.h> | ||
| 20 | |||
| 21 | +#ifdef HAVE_X11 | ||
| 22 | #include <X11/Xlib.h> | ||
| 23 | #include <X11/Xatom.h> | ||
| 24 | +#endif | ||
| 25 | #include <glib.h> | ||
| 26 | #include <gio/gio.h> | ||
| 27 | #include <meta/display.h> | ||
| 28 | -- | ||
| 29 | 2.52.0 | ||
| 30 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.3.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.3.bb index 33ba5eaa39..c8a5e20899 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.3.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.3.bb | |||
| @@ -24,7 +24,7 @@ DEPENDS = " \ | |||
| 24 | 24 | ||
| 25 | inherit gnomebase gsettings gettext gobject-introspection gtk-icon-cache features_check bash-completion | 25 | inherit gnomebase gsettings gettext gobject-introspection gtk-icon-cache features_check bash-completion |
| 26 | 26 | ||
| 27 | REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" | 27 | REQUIRED_DISTRO_FEATURES = "polkit systemd pam" |
| 28 | 28 | ||
| 29 | GTKIC_VERSION = "4" | 29 | GTKIC_VERSION = "4" |
| 30 | GTKDOC_MESON_OPTION = "gtk_doc" | 30 | GTKDOC_MESON_OPTION = "gtk_doc" |
| @@ -33,6 +33,7 @@ GIR_MESON_OPTION = "" | |||
| 33 | # gobject-introspection is mandatory and cannot be configured | 33 | # gobject-introspection is mandatory and cannot be configured |
| 34 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" | 34 | REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" |
| 35 | 35 | ||
| 36 | SRC_URI += "file://0001-shell-app-usage.c-only-include-x11-headers-if-HAVE_X.patch" | ||
| 36 | SRC_URI[archive.sha256sum] = "fb0203fc748593f14e51732618e1f042525fd719764a0fdb0ee3f6fe413a9b2b" | 37 | SRC_URI[archive.sha256sum] = "fb0203fc748593f14e51732618e1f042525fd719764a0fdb0ee3f6fe413a9b2b" |
| 37 | 38 | ||
| 38 | PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 39 | PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
