Commit c466cb9 (https://github.com/openembedded/meta-openembedded/commit/c466cb9) switched to using ANY_OF_DISTRO_FEATURES, so theoretically users can have either x11 or wayland in their DISTRO_FEATURES. In the case that only wayland is specified, this build error is seen:
| In file included from ../sources/network-manager-applet-1.36.0/src/applet.c:25: | ../sources/network-manager-applet-1.36.0/src/applet.h:14:10: fatal error: gdk/gdkx.h: No such file or directory | 14 | #include <gdk/gdkx.h> | | ^~~~~~~~~~~~ | compilation terminated. gdkx.h is brought in via including x11 in DISTRO_FEATURES - so this patch removes the incompatible headers in the case of x11 not being specified in DISTRO_FEATURES. Signed-off-by: Eric Meyers <[email protected]> --- ...kx-build-error-when-x11-not-included.patch | 50 +++++++++++++++++++ .../network-manager-applet_1.36.0.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-fix-gdkx-build-error-when-x11-not-included.patch diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-fix-gdkx-build-error-when-x11-not-included.patch b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-fix-gdkx-build-error-when-x11-not-included.patch new file mode 100644 index 0000000000..f0cc54c131 --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-fix-gdkx-build-error-when-x11-not-included.patch @@ -0,0 +1,50 @@ +From: Eric Meyers <[email protected]> +Date: Fri, 7 Nov 2025 12:00:00 +0000 +Subject: [PATCH] Patch to fix gdkx.h build issues. + +Patch to fix gdkx.h build issues when x11 is not included in DISTRO_FEATURES: + +| In file included from ../sources/network-manager-applet-1.36.0/src/applet.c:25: +| ../sources/network-manager-applet-1.36.0/src/applet.h:14:10: fatal error: gdk/gdkx.h: No such file or directory +| 14 | #include <gdk/gdkx.h> +| | ^~~~~~~~~~~~ +| compilation terminated. + +Upstream-Status: Pending +Signed-off-by: Eric Meyers <[email protected]> +diff --git a/src/applet.h b/src/applet.h +index 7978ba7c..6992196a 100644 +--- a/src/applet.h ++++ b/src/applet.h +@@ -11,7 +11,6 @@ + #include <string.h> + + #include <gtk/gtk.h> +-#include <gdk/gdkx.h> + + #include <net/ethernet.h> + +diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c +index b68141bb..2d8762d8 100644 +--- a/src/connection-editor/nm-connection-editor.c ++++ b/src/connection-editor/nm-connection-editor.c +@@ -15,7 +15,6 @@ + #include <sys/types.h> + #include <unistd.h> + #include <errno.h> +-#include <gdk/gdkx.h> + + #if WITH_SELINUX + #include <selinux/selinux.h> +diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c +index a3f41c04..b54c76b0 100644 +--- a/src/connection-editor/nm-connection-list.c ++++ b/src/connection-editor/nm-connection-list.c +@@ -13,7 +13,6 @@ + #include <string.h> + #include <sys/types.h> + #include <unistd.h> +-#include <gdk/gdkx.h> + + #include "ce-page.h" + #include "nm-connection-editor.h" diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb index 10e514775a..f6c6bdab96 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb @@ -10,6 +10,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" +SRC_URI:append = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', ' file://0001-fix-gdkx-build-error-when-x11-not-included.patch', d)}" SRC_URI[archive.sha256sum] = "a84704487ea3afe1485c47fb2ab598b8f779f540ae0dcbf0a1c5f85e64a7e253"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#121463): https://lists.openembedded.org/g/openembedded-devel/message/121463 Mute This Topic: https://lists.openembedded.org/mt/116219708/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
