Hello community, here is the log from the commit of package f-spot for openSUSE:Factory checked in at Thu Apr 8 12:33:06 CEST 2010. -------- --- GNOME/f-spot/f-spot.changes 2009-11-05 11:09:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/f-spot/f-spot.changes 2010-04-07 18:26:54.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 7 16:20:41 UTC 2010 - saarmstrong@novell.com + +- Add f-spot-fix-findbar-crash-bnc594142.patch to prevent crash + in findbar. bnc#594142 bgo#593152 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- f-spot-fix-findbar-crash-bnc594142.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.nXtMgH/_old 2010-04-08 12:32:50.000000000 +0200 +++ /var/tmp/diff_new_pack.nXtMgH/_new 2010-04-08 12:32:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package f-spot (Version 0.6.1.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,14 @@ Name: f-spot Version: 0.6.1.5 -Release: 1 +Release: 2 License: GPLv2+ Summary: GNOME Photo Management Application Url: http://www.gnome.org/projects/f-spot/ Group: Productivity/Graphics/Viewers Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM f-spot-fix-findbar-crash-bnc594142.patch bnc594142 bgo593152 saarmstrong@novell.com -- Copied from upstream master, not in 0.6 branch +Patch0: f-spot-fix-findbar-crash-bnc594142.patch BuildRequires: beagle-devel BuildRequires: fdupes BuildRequires: gconf-sharp2 @@ -79,6 +81,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build export CFLAGS="%{optflags} -fstack-protector -fno-strict-aliasing" ++++++ f-spot-fix-findbar-crash-bnc594142.patch ++++++ Index: f-spot-0.6.1.5/src/Widgets/FindBar.cs =================================================================== --- f-spot-0.6.1.5.orig/src/Widgets/FindBar.cs +++ f-spot-0.6.1.5/src/Widgets/FindBar.cs @@ -115,8 +115,7 @@ namespace FSpot.Widgets { { int length = args.EndPos - args.StartPos; //Log.Debug ("start {0} end {1} len {2} last {3}", args.StartPos, args.EndPos, length, last_entry_text); - string txt = last_entry_text.Substring (args.StartPos, length); - + string txt = length < 0 ? last_entry_text : last_entry_text.Substring (args.StartPos, length); for (int i = 0; i < txt.Length; i++) { if (txt [i] == '(') open_parens--; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org