diff mbox series

[meta-gnome] libwnck/libwnck3: fix incompatible pointer type error

Message ID 20240608165112.760050-1-kai.kang@windriver.com
State New
Headers show
Series [meta-gnome] libwnck/libwnck3: fix incompatible pointer type error | expand

Commit Message

Kai June 8, 2024, 4:51 p.m. UTC 
From: Kai Kang <kai.kang@windriver.com>

Update tasklist.c to fix incompatible pointer type error:

| 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 *

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 ...-fix-incompatible-pointer-type-error.patch | 29 +++++++++++++++++
 ...-fix-incompatible-pointer-type-error.patch | 31 +++++++++++++++++++
 .../recipes-gnome/libwnck/libwnck3_43.0.bb    |  3 ++
 .../recipes-gnome/libwnck/libwnck_2.31.0.bb   |  1 +
 4 files changed, 64 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/libwnck/files/libwnck-fix-incompatible-pointer-type-error.patch
 create mode 100644 meta-gnome/recipes-gnome/libwnck/files/libwnck3-fix-incompatible-pointer-type-error.patch
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/libwnck/files/libwnck-fix-incompatible-pointer-type-error.patch b/meta-gnome/recipes-gnome/libwnck/files/libwnck-fix-incompatible-pointer-type-error.patch
new file mode 100644
index 000000000..59a4c09e6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libwnck/files/libwnck-fix-incompatible-pointer-type-error.patch
@@ -0,0 +1,29 @@ 
+Update tasklist.c to fix incompatible pointer type error:
+
+| 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 *
+
+Upstream-Status: Inactive-Upstream
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ libwnck/tasklist.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
+index 4f0c6c4..d3bdf96 100644
+--- a/libwnck/tasklist.c
++++ b/libwnck/tasklist.c
+@@ -4352,7 +4352,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 =
+         ((((double)now.tv_sec - tv_sec) * G_USEC_PER_SEC +
diff --git a/meta-gnome/recipes-gnome/libwnck/files/libwnck3-fix-incompatible-pointer-type-error.patch b/meta-gnome/recipes-gnome/libwnck/files/libwnck3-fix-incompatible-pointer-type-error.patch
new file mode 100644
index 000000000..9ccd18d70
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libwnck/files/libwnck3-fix-incompatible-pointer-type-error.patch
@@ -0,0 +1,31 @@ 
+Update tasklist.c to fix incompatible pointer type error:
+
+| libwnck/tasklist.c: In function 'sequence_timeout_callback':
+| libwnck/tasklist.c:4922:49: error: passing argument 2 of 'sn_startup_sequence_get_last_active_time'
+     from incompatible pointer type [-Wincompatible-pointer-types]
+|  4922 |                                                 &tv_sec, &tv_usec);
+|       |                                                 ^~~~~~~
+|       |                                                 |
+|       |                                                 long int *
+
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libwnck/-/merge_requests/56]
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+---
+ libwnck/tasklist.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
+index b773247..f195074 100644
+--- a/libwnck/tasklist.c
++++ b/libwnck/tasklist.c
+@@ -4919,7 +4919,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;
+ 
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.0.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.0.bb
index c7f798911..34944f45e 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.0.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.0.bb
@@ -19,6 +19,9 @@  inherit gnomebase gobject-introspection gtk-doc gettext features_check
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
+
+SRC_URI += "file://libwnck3-fix-incompatible-pointer-type-error.patch"
+
 SRC_URI[archive.sha256sum] = "905bcdb85847d6b8f8861e56b30cd6dc61eae67ecef4cd994a9f925a26a2c1fe"
 
 # gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
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 d7f47002f..82900a8f4 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,7 @@  GNOMEBASEBUILDCLASS = "autotools"
 inherit gnomebase gobject-introspection features_check gtk-doc
 REQUIRED_DISTRO_FEATURES = "x11"
 
+SRC_URI += "file://libwnck-fix-incompatible-pointer-type-error.patch"
 SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32"
 SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e"