From 3b3257bf5bcb0b34606aa4fcd9caababa7019341 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Jun 2013 07:06:12 +0000 Subject: [PATCH] gnome-session: Fix build on 64bit targets use more portable G_GINT64_FORMAT instead of lld printf format (From meta-openembedded rev: b905770a499394923c5b62680c7ffe1014b7512b) Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../gnome-session/use_G_GINT64_FORMAT.patch | 61 ++++++++++++++++++++++ .../gnome-session/gnome-session_2.32.1.bb | 2 + 2 files changed, 63 insertions(+) create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch new file mode 100644 index 0000000..b09f8d2 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch @@ -0,0 +1,61 @@ +This patch fixes the build errors when building gnome-session for 64bit target using gcc 4.8 + +| gs-idle-monitor.c: In function 'handle_alarm_notify_event': +| gs-idle-monitor.c:196:9: error: format '%lld' expects argument of type 'long long int', but argument 5 has type 'gint64' [-Werror=format=] +| g_debug ("Watch %d fired, idle time = %lld", +| ^ +| gs-idle-monitor.c: In function '_xsync_alarm_set': +| gs-idle-monitor.c:453:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] +| g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld", +| ^ +| gs-idle-monitor.c:457:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] +| g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%lld", +| ^ +| gs-idle-monitor.c:464:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] +| g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld", +| ^ +| gs-idle-monitor.c:468:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] + +Upstream-Status: Unknown + +Signed-off-by: Khem Raj +Index: gnome-session-2.32.1/gnome-session/gs-idle-monitor.c +=================================================================== +--- gnome-session-2.32.1.orig/gnome-session/gs-idle-monitor.c 2010-11-17 03:17:04.000000000 -0800 ++++ gnome-session-2.32.1/gnome-session/gs-idle-monitor.c 2013-06-11 23:33:12.239960082 -0700 +@@ -193,7 +193,7 @@ + return; + } + +- g_debug ("Watch %d fired, idle time = %lld", ++ g_debug ("Watch %d fired, idle time = %" G_GINT64_FORMAT "", + watch->id, + _xsyncvalue_to_int64 (alarm_event->counter_value)); + +@@ -450,22 +450,22 @@ + + attr.trigger.test_type = XSyncPositiveTransition; + if (watch->xalarm_positive != None) { +- g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld", ++ g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%" G_GINT64_FORMAT "", + _xsyncvalue_to_int64 (attr.trigger.wait_value)); + XSyncChangeAlarm (GDK_DISPLAY (), watch->xalarm_positive, flags, &attr); + } else { +- g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%lld", ++ g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%" G_GINT64_FORMAT "", + _xsyncvalue_to_int64 (attr.trigger.wait_value)); + watch->xalarm_positive = XSyncCreateAlarm (GDK_DISPLAY (), flags, &attr); + } + + attr.trigger.test_type = XSyncNegativeTransition; + if (watch->xalarm_negative != None) { +- g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld", ++ g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%" G_GINT64_FORMAT "", + _xsyncvalue_to_int64 (attr.trigger.wait_value)); + XSyncChangeAlarm (GDK_DISPLAY (), watch->xalarm_negative, flags, &attr); + } else { +- g_debug ("GSIdleMonitor: creating new alarm for negative transition wait=%lld", ++ g_debug ("GSIdleMonitor: creating new alarm for negative transition wait=%" G_GINT64_FORMAT "", + _xsyncvalue_to_int64 (attr.trigger.wait_value)); + watch->xalarm_negative = XSyncCreateAlarm (GDK_DISPLAY (), flags, &attr); + } diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb index 93b0284..73f1ad5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb @@ -9,6 +9,8 @@ DEPENDS = "libxtst gtk+ glib-2.0 upower dbus-glib gconf pango gdk-pixbuf-native inherit gnome +SRC_URI += "file://use_G_GINT64_FORMAT.patch" + SRC_URI[archive.md5sum] = "222bad6b446cb19a6b9028ea24538002" SRC_URI[archive.sha256sum] = "22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a" -- 2.7.4