diff mbox series

[meta-gnome,walnascar,2/2] libwnck3: fix build failure for lib32-libwnck3

Message ID 20250910152923.859295-2-skandigraun@gmail.com
State New
Headers show
Series [meta-gnome,walnascar,1/2] libwnck3: update to 43.2 and fix build errors | expand

Commit Message

Gyorgy Sarvari Sept. 10, 2025, 3:29 p.m. UTC 
From: Changqing Li <changqing.li@windriver.com>

Refresh patch for fix build issue

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 ...caused-by-OE-core-changes-to-startup.patch | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

Comments

Changqing Li Sept. 11, 2025, 4:16 a.m. UTC | #1 
On 9/10/25 23:29, Gyorgy Sarvari via lists.openembedded.org wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> From: Changqing Li<changqing.li@windriver.com>
>
> Refresh patch for fix build issue
>
> Signed-off-by: Changqing Li<changqing.li@windriver.com>
> Signed-off-by: Gyorgy Sarvari<skandigraun@gmail.com>
> ---
>   ...caused-by-OE-core-changes-to-startup.patch | 33 +++++++++++--------
>   1 file changed, 20 insertions(+), 13 deletions(-)
>
> diff --git a/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch b/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
> index 91e23c785b..0328202f1b 100644
> --- a/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
> +++ b/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
> @@ -1,4 +1,4 @@
> -From 1df0f4ae8fd54bc1ae940dfafa701c84d068674d Mon Sep 17 00:00:00 2001
> +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
> @@ -21,23 +21,30 @@ It is caused by a patch of startup-notification in oe-core which is backported f
>   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.

Hi, Gyorgy

Sorry to say that this patch need to update according to the following 
commit:

https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=15a204024dcc87ab16bdd24a8c52fab5287c2e0f

Regards

Changqing

> +
> +Signed-off-by: Changqing Li<changqing.li@windriver.com>
> +
>   ---
> - libwnck/tasklist.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> + libwnck/tasklist.c | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
>
>   diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
> -index 7418f89..460e11d 100644
> +index 7418f89..f0f30b2 100644
>   --- a/libwnck/tasklist.c
>   +++ b/libwnck/tasklist.c
> -@@ -5031,7 +5031,7 @@ sequence_timeout_callback (void *user_data)
> -       WnckTask *task = WNCK_TASK (tmp->data);
> -
> -       sn_startup_sequence_get_last_active_time (task->startup_sequence,
> --                                                &tv_sec, &tv_usec);
> -+                                                (time_t *) &tv_sec, &tv_usec);
> -
> -       elapsed = (now - (tv_sec * G_USEC_PER_SEC + tv_usec)) / 1000.0;
> +@@ -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.33.0
> +2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#119349):https://lists.openembedded.org/g/openembedded-devel/message/119349
> Mute This Topic:https://lists.openembedded.org/mt/115171723/3616873
> Group Owner:openembedded-devel+owner@lists.openembedded.org
> Unsubscribe:https://lists.openembedded.org/g/openembedded-devel/unsub [changqing.li@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Gyorgy Sarvari Sept. 11, 2025, 7:03 a.m. UTC | #2 
On 9/11/25 06:16, Changqing Li wrote:
> On 9/10/25 23:29, Gyorgy Sarvari via lists.openembedded.org wrote:
>> CAUTION: This email comes from a non Wind River email account!
>> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>>
>> From: Changqing Li <changqing.li@windriver.com>
>>
>> Refresh patch for fix build issue
>>
>> Signed-off-by: Changqing Li <changqing.li@windriver.com>
>> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
>> ---
>>  ...caused-by-OE-core-changes-to-startup.patch | 33 +++++++++++--------
>>  1 file changed, 20 insertions(+), 13 deletions(-)
>>
>> diff --git a/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch b/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
>> index 91e23c785b..0328202f1b 100644
>> --- a/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
>> +++ b/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
>> @@ -1,4 +1,4 @@
>> -From 1df0f4ae8fd54bc1ae940dfafa701c84d068674d Mon Sep 17 00:00:00 2001
>> +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
>> @@ -21,23 +21,30 @@ It is caused by a patch of startup-notification in oe-core which is backported f
>>  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.
>
> Hi, Gyorgy
>
> Sorry to say that this patch need to update according to the following
> commit:
>
> https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=15a204024dcc87ab16bdd24a8c52fab5287c2e0f
>

You are correct, the build has indeed failed eventually for libwnck.

Thank you for the review, I have submitted the missing backports.

> Regards
>
> Changqing
>
>> +
>> +Signed-off-by: Changqing Li <changqing.li@windriver.com>
>> +
>>  ---
>> - libwnck/tasklist.c | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> + libwnck/tasklist.c | 3 ++-
>> + 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>>  diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
>> -index 7418f89..460e11d 100644
>> +index 7418f89..f0f30b2 100644
>>  --- a/libwnck/tasklist.c
>>  +++ b/libwnck/tasklist.c
>> -@@ -5031,7 +5031,7 @@ sequence_timeout_callback (void *user_data)
>> -       WnckTask *task = WNCK_TASK (tmp->data);
>> -
>> -       sn_startup_sequence_get_last_active_time (task->startup_sequence,
>> --                                                &tv_sec, &tv_usec);
>> -+                                                (time_t *) &tv_sec, &tv_usec);
>> -
>> -       elapsed = (now - (tv_sec * G_USEC_PER_SEC + tv_usec)) / 1000.0;
>> +@@ -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.33.0
>> +2.34.1
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#119349): https://lists.openembedded.org/g/openembedded-devel/message/119349
>> Mute This Topic: https://lists.openembedded.org/mt/115171723/3616873
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [changqing.li@windriver.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch b/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
index 91e23c785b..0328202f1b 100644
--- a/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
+++ b/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
@@ -1,4 +1,4 @@ 
-From 1df0f4ae8fd54bc1ae940dfafa701c84d068674d Mon Sep 17 00:00:00 2001
+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
@@ -21,23 +21,30 @@  It is caused by a patch of startup-notification in oe-core which is backported f
 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 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ libwnck/tasklist.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
-index 7418f89..460e11d 100644
+index 7418f89..f0f30b2 100644
 --- a/libwnck/tasklist.c
 +++ b/libwnck/tasklist.c
-@@ -5031,7 +5031,7 @@ sequence_timeout_callback (void *user_data)
-       WnckTask *task = WNCK_TASK (tmp->data);
- 
-       sn_startup_sequence_get_last_active_time (task->startup_sequence,
--                                                &tv_sec, &tv_usec);
-+                                                (time_t *) &tv_sec, &tv_usec);
- 
-       elapsed = (now - (tv_sec * G_USEC_PER_SEC + tv_usec)) / 1000.0;
+@@ -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.33.0
+2.34.1