From e33270bb821c8f8f3e3f3be501d3a14e0fa035c1 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Thu, 13 Jun 2024 10:09:05 +0800 Subject: xfwm4: fix gcc -Wincompatible-pointer-types Fix xfwm4 incompatible pointer type error with gcc option -Wincompatible-pointer-types: | ../../xfwm4-4.18.0/src/startup_notification.c:139:57: error: passing argument 2 of 'sn_startup_sequence_get_last_active_time' from incompatible pointer type [-Wincompatible-pointer-types] | 139 | sn_startup_sequence_get_last_active_time (sequence, &l_sec, &l_usec); | | ^~~~~~ | | | | | long int * Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- ...xfwm4-fix-incompatible-pointer-type-error.patch | 38 ++++++++++++++++++++++ meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4/xfwm4-fix-incompatible-pointer-type-error.patch diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4/xfwm4-fix-incompatible-pointer-type-error.patch b/meta-xfce/recipes-xfce/xfwm4/xfwm4/xfwm4-fix-incompatible-pointer-type-error.patch new file mode 100644 index 0000000000..3e2ffe234f --- /dev/null +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4/xfwm4-fix-incompatible-pointer-type-error.patch @@ -0,0 +1,38 @@ +Fix xfwm4 incompatible pointer type error: + +| ../../xfwm4-4.18.0/src/startup_notification.c:139:57: error: passing argument 2 of 'sn_startup_sequence_get_last_active_time' from incompatible pointer type [-Wincompatible-pointer-types] +| 139 | sn_startup_sequence_get_last_active_time (sequence, &l_sec, &l_usec); +| | ^~~~~~ +| | | +| | long int * +| In file included from .../usr/include/startup-notification-1.0/libsn/sn.h:32, +| from ../../xfwm4-4.18.0/src/startup_notification.c:33: +| .../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: Kai Kang + +--- + src/startup_notification.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/startup_notification.c b/src/startup_notification.c +index 2a08cad..05434ca 100644 +--- a/src/startup_notification.c ++++ b/src/startup_notification.c +@@ -136,7 +136,7 @@ sn_collect_timed_out_foreach (void *element, void *data) + + sequence = element; + ctod = (CollectTimedOutData *) data; +- sn_startup_sequence_get_last_active_time (sequence, &l_sec, &l_usec); ++ sn_startup_sequence_get_last_active_time (sequence, (time_t *)&l_sec, &l_usec); + tv_sec = l_sec; tv_usec = l_usec; + + elapsed = ((double) ctod->now - (tv_sec * G_USEC_PER_SEC) - tv_usec) diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb index 839f1c8704..2770829e98 100644 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb @@ -8,6 +8,8 @@ inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += "file://xfwm4-fix-incompatible-pointer-type-error.patch" + SRC_URI[sha256sum] = "92cd1b889bb25cb4bc06c1c6736c238d96e79c1e706b9f77fad0a89d6e5fc13f" PACKAGECONFIG ?= " \ -- cgit v1.2.3-54-g00ecf