rpms/gnome-desktop3
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add upstream patch to fix date crash

Browse Source
This commit is contained in:
Daniel Drake 2012-04-16 09:44:53 -06:00
parent d336afa235
commit 15c8d3f6cf
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gnome-desktop-3.4.1-bg-date-crash.patch Normal file
View File

@ -0,0 +1,31 @@
From 48793aa3329ce4a1cbd0ddbb4a06e2fb94c70f0c Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
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

9
gnome-desktop3.spec
View File

@ -10,10 +10,12 @@
Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop3
Version: 3.4.1
Release: 1%{?dist}
Release: 2%{?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
@ -71,6 +73,7 @@ libgnomedesktop.
%prep
%setup -q -n gnome-desktop-%{version}
%patch0 -p1
%build
%configure --with-pnp-ids-path="/usr/share/hwdata/pnp.ids" \
@ -106,6 +109,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%doc %{_datadir}/gtk-doc/html/gnome-desktop3/
%changelog
* Mon Apr 16 2012 Daniel Drake <dsd@laptop.org> - 3.4.1-2
- Add upstream patch to fix crash when the system clock is wrong
- Fixes GNOME#673551, OLPC#11714
* Mon Apr 16 2012 Richard Hughes <hughsient@gmail.com> - 3.4.1-1
- Update to 3.4.1