From 830c88f22e935d918e06830e9819059ed0fd21fd Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 10 Jul 2017 20:33:09 +0100 Subject: gnome-session: remove Signed-off-by: Ross Burton --- .../gnome-session/use_G_GINT64_FORMAT.patch | 61 ---------------------- .../gnome-session/gnome-session_2.32.1.bb | 32 ------------ 2 files changed, 93 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch b/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch deleted file mode 100644 index b09f8d200a..0000000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch +++ /dev/null @@ -1,61 +0,0 @@ -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-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb deleted file mode 100644 index c49f2d3fb8..0000000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Gnome session manager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -PR = "r3" - -SECTION = "x11/gnome" -DEPENDS = "libxtst gtk+ glib-2.0 upower dbus-glib gconf pango gdk-pixbuf-native startup-notification" - -inherit gnome - -SRC_URI += "file://use_G_GINT64_FORMAT.patch" - -SRC_URI[archive.md5sum] = "222bad6b446cb19a6b9028ea24538002" -SRC_URI[archive.sha256sum] = "22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a" -GNOME_COMPRESS_TYPE="bz2" - -EXTRA_OECONF = " --with-gtk=2.0 ac_cv_path_GCONF_SANITY_CHECK=set --disable-docbook-docs" - -do_configure_append() { - for i in $(find ${S} -name "Makefile") ; do - sed -i -e s:"GCONFTOOL = .*/usr/bin/gconftool-2":"GCONFTOOL = /usr/bin/gconftool-2":g $i - sed -i -e s:"GCONF_SANITY_CHECK = set":"GCONF_SANITY_CHECK = /usr/libexec/gconf-sanity-check-2":g $i - done -} - -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-ck-connector', '', d)}" -FILES_${PN} += "${datadir}/xsessions ${datadir}/icons ${datadir}/gnome ${libdir}/gnome-session/helpers" -FILES_${PN}-dbg += "${libexecdir}/gnome-session/helpers/.debug" - -# http://errors.yoctoproject.org/Errors/Details/68621/ -PNBLACKLIST[gnome-session] ?= "BROKEN: fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" -- cgit 1.2.3-korg