diff options
| author | Eric Meyers <eric.meyers15310@gmail.com> | 2025-11-10 08:29:13 -0600 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-11-10 07:50:05 -0800 |
| commit | 64440b3aaeef576d697d349e8aa85e1a31fe2d92 (patch) | |
| tree | 8c7cb2e553ffe0dd2f4dfb3c475f025a9005cdbc | |
| parent | d41b4f0447ef98047cf6bc6f671295f65931f301 (diff) | |
| download | meta-openembedded-64440b3aaeef576d697d349e8aa85e1a31fe2d92.tar.gz | |
network-manager-applet: Fixing builds when x11 is not included in DISTRO_FEATURES
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 <eric.meyers@arthrex.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 files changed, 51 insertions, 0 deletions
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 @@ | |||
| 1 | From: Eric Meyers <eric.meyers@arthrex.com> | ||
| 2 | Date: Fri, 7 Nov 2025 12:00:00 +0000 | ||
| 3 | Subject: [PATCH] Patch to fix gdkx.h build issues. | ||
| 4 | |||
| 5 | Patch to fix gdkx.h build issues when x11 is not included in DISTRO_FEATURES: | ||
| 6 | |||
| 7 | | In file included from ../sources/network-manager-applet-1.36.0/src/applet.c:25: | ||
| 8 | | ../sources/network-manager-applet-1.36.0/src/applet.h:14:10: fatal error: gdk/gdkx.h: No such file or directory | ||
| 9 | | 14 | #include <gdk/gdkx.h> | ||
| 10 | | | ^~~~~~~~~~~~ | ||
| 11 | | compilation terminated. | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | Signed-off-by: Eric Meyers <eric.meyers@arthrex.com> | ||
| 15 | diff --git a/src/applet.h b/src/applet.h | ||
| 16 | index 7978ba7c..6992196a 100644 | ||
| 17 | --- a/src/applet.h | ||
| 18 | +++ b/src/applet.h | ||
| 19 | @@ -11,7 +11,6 @@ | ||
| 20 | #include <string.h> | ||
| 21 | |||
| 22 | #include <gtk/gtk.h> | ||
| 23 | -#include <gdk/gdkx.h> | ||
| 24 | |||
| 25 | #include <net/ethernet.h> | ||
| 26 | |||
| 27 | diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c | ||
| 28 | index b68141bb..2d8762d8 100644 | ||
| 29 | --- a/src/connection-editor/nm-connection-editor.c | ||
| 30 | +++ b/src/connection-editor/nm-connection-editor.c | ||
| 31 | @@ -15,7 +15,6 @@ | ||
| 32 | #include <sys/types.h> | ||
| 33 | #include <unistd.h> | ||
| 34 | #include <errno.h> | ||
| 35 | -#include <gdk/gdkx.h> | ||
| 36 | |||
| 37 | #if WITH_SELINUX | ||
| 38 | #include <selinux/selinux.h> | ||
| 39 | diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c | ||
| 40 | index a3f41c04..b54c76b0 100644 | ||
| 41 | --- a/src/connection-editor/nm-connection-list.c | ||
| 42 | +++ b/src/connection-editor/nm-connection-list.c | ||
| 43 | @@ -13,7 +13,6 @@ | ||
| 44 | #include <string.h> | ||
| 45 | #include <sys/types.h> | ||
| 46 | #include <unistd.h> | ||
| 47 | -#include <gdk/gdkx.h> | ||
| 48 | |||
| 49 | #include "ce-page.h" | ||
| 50 | #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}" | |||
| 10 | REQUIRED_DISTRO_FEATURES = "opengl" | 10 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 11 | 11 | ||
| 12 | 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)}" | 12 | 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)}" |
| 13 | SRC_URI:append = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', ' file://0001-fix-gdkx-build-error-when-x11-not-included.patch', d)}" | ||
| 13 | 14 | ||
| 14 | SRC_URI[archive.sha256sum] = "a84704487ea3afe1485c47fb2ab598b8f779f540ae0dcbf0a1c5f85e64a7e253" | 15 | SRC_URI[archive.sha256sum] = "a84704487ea3afe1485c47fb2ab598b8f779f540ae0dcbf0a1c5f85e64a7e253" |
| 15 | 16 | ||
