From 2ac466b34636e1ced264f899387b944b4887f409f06f29f8efff80429735de18 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 9 Sep 2011 10:57:01 +0000 Subject: [PATCH] Accepting request 81673 from home:vuntz:branches:GNOME:Factory Fix a crash OBS-URL: https://build.opensuse.org/request/show/81673 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=122 --- gnome-desktop-gnome-wall-clock-crash.patch | 27 ++++++++++++++++++++++ gnome-desktop.changes | 6 +++++ gnome-desktop.spec | 3 +++ 3 files changed, 36 insertions(+) create mode 100644 gnome-desktop-gnome-wall-clock-crash.patch diff --git a/gnome-desktop-gnome-wall-clock-crash.patch b/gnome-desktop-gnome-wall-clock-crash.patch new file mode 100644 index 0000000..fd8843c --- /dev/null +++ b/gnome-desktop-gnome-wall-clock-crash.patch @@ -0,0 +1,27 @@ +commit a65613bf0a507a226c172bb6f503e27532efb0fa +Author: Vincent Untz +Date: Thu Sep 8 19:01:35 2011 +0200 + + GnomeWallClock: Remove the date/time source on dispose + + We don't do it in finalize since the dispose handler needs the objects + that are being disposed. + + https://bugzilla.gnome.org/show_bug.cgi?id=658583 + +diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnome-wall-clock.c +index 49437d8..167619d 100644 +--- a/libgnome-desktop/gnome-wall-clock.c ++++ b/libgnome-desktop/gnome-wall-clock.c +@@ -84,6 +84,11 @@ gnome_wall_clock_dispose (GObject *object) + { + GnomeWallClock *self = GNOME_WALL_CLOCK (object); + ++ if (self->priv->clock_update_id) { ++ g_source_remove (self->priv->clock_update_id); ++ self->priv->clock_update_id = 0; ++ } ++ + if (self->priv->tz_monitor != NULL) { + g_object_unref (self->priv->tz_monitor); + self->priv->tz_monitor = NULL; diff --git a/gnome-desktop.changes b/gnome-desktop.changes index bec59eb..84d6769 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 9 10:36:36 UTC 2011 - vuntz@opensuse.org + +- Add gnome-desktop-gnome-wall-clock-crash.patch: fix an issue + leading to a gnome-screensaver crash. + ------------------------------------------------------------------- Mon Sep 5 07:33:49 UTC 2011 - vuntz@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 785fee3..3bba42c 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -27,6 +27,8 @@ Url: http://www.gnome.org Group: System/GUI/GNOME Source: http://download.gnome.org/sources/gnome-desktop/3.1/%{name}-%{version}.tar.bz2 Source99: baselibs.conf +# PATCH-FIX-UPSTREAM gnome-desktop-gnome-wall-clock-crash.patch vuntz@opensuse.org -- Fix a crash killing gnome-screensaver, taken from git +Patch0: gnome-desktop-gnome-wall-clock-crash.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel @@ -103,6 +105,7 @@ gtk-doc. %prep %setup -q translation-update-upstream +%patch0 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh] && NOCONFIGURE=1 ./autogen.sh