From 789fb364ad5e69314572d8ba2cf375eb443dd1cd Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 14 May 2012 15:12:59 +0100 Subject: [PATCH] Update to 3.4.2 --- .gitignore | 1 + gnome-desktop-3.4.1-bg-date-crash.patch | 31 ------------------------- gnome-desktop3.spec | 10 ++++---- sources | 2 +- 4 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 gnome-desktop-3.4.1-bg-date-crash.patch diff --git a/.gitignore b/.gitignore index 1cfc3a5..a9102c2 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ gnome-desktop-2.90.4.tar.bz2 /gnome-desktop-3.3.92.tar.xz /gnome-desktop-3.4.0.tar.xz /gnome-desktop-3.4.1.tar.xz +/gnome-desktop-3.4.2.tar.xz diff --git a/gnome-desktop-3.4.1-bg-date-crash.patch b/gnome-desktop-3.4.1-bg-date-crash.patch deleted file mode 100644 index 751cd9b..0000000 --- a/gnome-desktop-3.4.1-bg-date-crash.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 48793aa3329ce4a1cbd0ddbb4a06e2fb94c70f0c Mon Sep 17 00:00:00 2001 -From: Daniel Drake -Date: Wed, 11 Apr 2012 19:59:32 +0000 -Subject: gnome-bg: Fix crash when system clock is behind start date - -The 1-slide background included in Fedora 17 causes a crash -in gnome-bg when the system clock is set behind the date specified -in the slideshow xml file. - -This was due to slide->duration being set to UINT_MAX (to indicate a -single-slide show) but show->total_duration not being updated to take -account of this. The calculation in get_current_slide() was therefore -confused, and triggered a g_assert_not_reached(). - -https://bugzilla.gnome.org/show_bug.cgi?id=673551 ---- -diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c -index c6e4e06..9a583a6 100644 ---- a/libgnome-desktop/gnome-bg.c -+++ b/libgnome-desktop/gnome-bg.c -@@ -2953,7 +2953,7 @@ read_slideshow_file (const char *filename, - /* one slide, there's no transition */ - } else if (len == 1) { - Slide *slide = show->slides->head->data; -- slide->duration = G_MAXUINT; -+ slide->duration = show->total_duration = G_MAXUINT; - } - } - --- -cgit v0.9.0.2 diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec index f44dc3f..242c876 100644 --- a/gnome-desktop3.spec +++ b/gnome-desktop3.spec @@ -9,13 +9,11 @@ Summary: Shared code among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop3 -Version: 3.4.1 -Release: 2%{?dist} +Version: 3.4.2 +Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/3.4/gnome-desktop-%{version}.tar.xz -Patch0: gnome-desktop-3.4.1-bg-date-crash.patch - License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries @@ -73,7 +71,6 @@ libgnomedesktop. %prep %setup -q -n gnome-desktop-%{version} -%patch0 -p1 %build %configure --with-pnp-ids-path="/usr/share/hwdata/pnp.ids" \ @@ -109,6 +106,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %doc %{_datadir}/gtk-doc/html/gnome-desktop3/ %changelog +* Mon May 14 2012 Richard Hughes - 3.4.2-1 +- Update to 3.4.2 + * Mon Apr 16 2012 Daniel Drake - 3.4.1-2 - Add upstream patch to fix crash when the system clock is wrong - Fixes GNOME#673551, OLPC#11714 diff --git a/sources b/sources index fa762f6..2b55705 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9d02cb67ce7dcb3c21bfadb20734ea2 gnome-desktop-3.4.1.tar.xz +efd11d3841c34cc1709d0ea1d3f83cf1 gnome-desktop-3.4.2.tar.xz