blob: 0328202f1b2ad47b4578a6f8e9a1807e250a218a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From fd075074182f756e2872569925f70f5f4e2386c2 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sun, 25 May 2025 12:24:16 +0000
Subject: [PATCH] Fix build issue caused by OE-core changes to
startup-notification:
../libwnck-43.2/libwnck/tasklist.c: In function 'sequence_timeout_callback':
../libwnck-43.2/libwnck/tasklist.c:5034:49: error: passing argument 2 of 'sn_startup_sequence_get_last_active_time' from incompatible pointer type [-Wincompatible-pointer-types]
5034 | &tv_sec, &tv_usec);
| ^~~~~~~
| |
| long int *
In file included from /build/angstrom/build/tmp/work/armv7at2hf-neon-angstrom-linux-gnueabi/libwnck3/43.2/recipe-sysroot/usr/include/startup-notification-1.0/libsn/sn.h:32,
from ../libwnck-43.2/libwnck/tasklist.c:40:
/build/angstrom/build/tmp/work/armv7at2hf-neon-angstrom-linux-gnueabi/libwnck3/43.2/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,
| ~~~~~~~~~~~~~~~~~~~^~~~~~
It is caused by a patch of startup-notification in oe-core which is backported from upstream mailllist and changes the signature of function sn_startup_sequence_get_last_active_time().
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Refresh the patch
Don't use explicit type cast to avoid truncation, use long long for tv_sec.
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
libwnck/tasklist.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
index 7418f89..f0f30b2 100644
--- a/libwnck/tasklist.c
+++ b/libwnck/tasklist.c
@@ -5019,7 +5019,8 @@ sequence_timeout_callback (void *user_data)
WnckTasklist *tasklist = user_data;
GList *tmp;
gint64 now;
- long tv_sec, tv_usec;
+ long long tv_sec;
+ long tv_usec;
double elapsed;
now = g_get_real_time ();
--
2.34.1
|
