From 4a7ca620709d2d184312c2c99e50b9b763cedd83 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 28 Aug 2025 12:54:47 +0800 Subject: libwnck: fix build failure for lib32-libwnck Fix the following compile error: ../../sources/libwnck-2.31.0/libwnck/tasklist.c:4355:49: error: passing argument 2 of 'sn_startup_sequence_get_last_active_time' from incompatible pointer type [-Wincompatible-pointer-types] 4355 | &tv_sec, &tv_usec); | ^~~~~~~ | | | long int * In file included from /build/tmp/work/core2-32-wrsmllib32-linux/lib32-libwnck/2.31.0/lib32-recipe-sysroot/usr/include/startup-notification-1.0/libsn/sn.h:32, from ../../sources/libwnck-2.31.0/libwnck/private.h:36, from ../../sources/libwnck-2.31.0/libwnck/tasklist.c:40: /build/tmp/work/core2-32-wrsmllib32-linux/lib32-libwnck/2.31.0/lib32-recipe-sysroot/usr/include/startup-notification-1.0/libsn/sn-monitor.h:84:79: note: expected 'time_t *' {aka 'long long int *'} but argument is of type 'long int *' 84 | time_t *tv_sec, | ~~~~~~~~~~~~~~~~~~~^~~~~~ Signed-off-by: Changqing Li Signed-off-by: Khem Raj Signed-off-by: Gyorgy Sarvari --- ...t.c-fix-Wincompatible-pointer-types-error.patch | 42 ++++++++++++++++++++++ meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 meta-gnome/recipes-gnome/libwnck/files/0001-tasklist.c-fix-Wincompatible-pointer-types-error.patch diff --git a/meta-gnome/recipes-gnome/libwnck/files/0001-tasklist.c-fix-Wincompatible-pointer-types-error.patch b/meta-gnome/recipes-gnome/libwnck/files/0001-tasklist.c-fix-Wincompatible-pointer-types-error.patch new file mode 100644 index 0000000000..4e23f613aa --- /dev/null +++ b/meta-gnome/recipes-gnome/libwnck/files/0001-tasklist.c-fix-Wincompatible-pointer-types-error.patch @@ -0,0 +1,42 @@ +From 01d9add9f9c25442329879d1c3513c68ed14a749 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 28 Aug 2025 10:29:59 +0800 +Subject: [PATCH] tasklist.c: fix -Wincompatible-pointer-types error + +Fix the following compile error: +../../sources/libwnck-2.31.0/libwnck/tasklist.c:4355:49: error: passing argument 2 of 'sn_startup_sequence_get_last_active_time' from incompatible pointer type [-Wincompatible-pointer-types] + 4355 | &tv_sec, &tv_usec); + | ^~~~~~~ + | | + | long int * +In file included from /build/tmp/work/core2-32-wrsmllib32-linux/lib32-libwnck/2.31.0/lib32-recipe-sysroot/usr/include/startup-notification-1.0/libsn/sn.h:32, + from ../../sources/libwnck-2.31.0/libwnck/private.h:36, + from ../../sources/libwnck-2.31.0/libwnck/tasklist.c:40: +/build/tmp/work/core2-32-wrsmllib32-linux/lib32-libwnck/2.31.0/lib32-recipe-sysroot/usr/include/startup-notification-1.0/libsn/sn-monitor.h:84:79: note: expected 'time_t *' {aka 'long long int *'} but argument is of type 'long int *' + 84 | time_t *tv_sec, + | ~~~~~~~~~~~~~~~~~~~^~~~~~ + +Upstream-Status: Inappropriate [ Latest master don't have this code ] + +Signed-off-by: Changqing Li +--- + libwnck/tasklist.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c +index 4f0c6c4..758fc5f 100644 +--- a/libwnck/tasklist.c ++++ b/libwnck/tasklist.c +@@ -4340,7 +4340,8 @@ sequence_timeout_callback (void *user_data) + WnckTasklist *tasklist = user_data; + GList *tmp; + GTimeVal now; +- long tv_sec, tv_usec; ++ long long tv_sec; ++ long tv_usec; + double elapsed; + + g_get_current_time (&now); +-- +2.34.1 + diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index d7f47002f8..5552d2e2b9 100644 --- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -12,6 +12,8 @@ GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += "file://0001-tasklist.c-fix-Wincompatible-pointer-types-error.patch" + SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e" -- cgit v1.2.3-54-g00ecf