diff options
author | Changqing Li <changqing.li@windriver.com> | 2025-08-28 12:54:47 +0800 |
---|---|---|
committer | Gyorgy Sarvari <skandigraun@gmail.com> | 2025-09-11 08:55:53 +0200 |
commit | 4a7ca620709d2d184312c2c99e50b9b763cedd83 (patch) | |
tree | c1e9549cd6559e37b611b6f9724124f1ee1a3fff | |
parent | 7acabbe066dc1bdabcf3e972aac996015b2f2fed (diff) | |
download | meta-openembedded-4a7ca620709d2d184312c2c99e50b9b763cedd83.tar.gz |
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 <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
-rw-r--r-- | meta-gnome/recipes-gnome/libwnck/files/0001-tasklist.c-fix-Wincompatible-pointer-types-error.patch | 42 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb | 2 |
2 files changed, 44 insertions, 0 deletions
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 @@ | |||
1 | From 01d9add9f9c25442329879d1c3513c68ed14a749 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Thu, 28 Aug 2025 10:29:59 +0800 | ||
4 | Subject: [PATCH] tasklist.c: fix -Wincompatible-pointer-types error | ||
5 | |||
6 | Fix the following compile error: | ||
7 | ../../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] | ||
8 | 4355 | &tv_sec, &tv_usec); | ||
9 | | ^~~~~~~ | ||
10 | | | | ||
11 | | long int * | ||
12 | 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, | ||
13 | from ../../sources/libwnck-2.31.0/libwnck/private.h:36, | ||
14 | from ../../sources/libwnck-2.31.0/libwnck/tasklist.c:40: | ||
15 | /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 *' | ||
16 | 84 | time_t *tv_sec, | ||
17 | | ~~~~~~~~~~~~~~~~~~~^~~~~~ | ||
18 | |||
19 | Upstream-Status: Inappropriate [ Latest master don't have this code ] | ||
20 | |||
21 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
22 | --- | ||
23 | libwnck/tasklist.c | 3 ++- | ||
24 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c | ||
27 | index 4f0c6c4..758fc5f 100644 | ||
28 | --- a/libwnck/tasklist.c | ||
29 | +++ b/libwnck/tasklist.c | ||
30 | @@ -4340,7 +4340,8 @@ sequence_timeout_callback (void *user_data) | ||
31 | WnckTasklist *tasklist = user_data; | ||
32 | GList *tmp; | ||
33 | GTimeVal now; | ||
34 | - long tv_sec, tv_usec; | ||
35 | + long long tv_sec; | ||
36 | + long tv_usec; | ||
37 | double elapsed; | ||
38 | |||
39 | g_get_current_time (&now); | ||
40 | -- | ||
41 | 2.34.1 | ||
42 | |||
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" | |||
12 | inherit gnomebase gobject-introspection features_check gtk-doc | 12 | inherit gnomebase gobject-introspection features_check gtk-doc |
13 | REQUIRED_DISTRO_FEATURES = "x11" | 13 | REQUIRED_DISTRO_FEATURES = "x11" |
14 | 14 | ||
15 | SRC_URI += "file://0001-tasklist.c-fix-Wincompatible-pointer-types-error.patch" | ||
16 | |||
15 | SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" | 17 | SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" |
16 | SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e" | 18 | SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e" |
17 | 19 | ||