From 414141081e40c335bd8dbd0fcb11af39f8bd5ecd5a7ca126fda9f5e0a6d48e96 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Dec 2008 11:28:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eog?expand=0&rev=31 --- eog-nullify-gerror-450055.patch | 13 +++++++++++++ eog.changes | 5 +++++ eog.spec | 19 ++++++++++++------- 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 eog-nullify-gerror-450055.patch diff --git a/eog-nullify-gerror-450055.patch b/eog-nullify-gerror-450055.patch new file mode 100644 index 0000000..fb3f49e --- /dev/null +++ b/eog-nullify-gerror-450055.patch @@ -0,0 +1,13 @@ +Index: src/eog-image.c +=================================================================== +--- src/eog-image.c.orig ++++ src/eog-image.c +@@ -1518,7 +1518,7 @@ static gboolean + eog_image_copy_file (EogImage *image, EogImageSaveInfo *source, EogImageSaveInfo *target, GError **error) + { + gboolean result; +- GError *ioerror; ++ GError *ioerror = NULL; + + g_return_val_if_fail (EOG_IS_IMAGE_SAVE_INFO (source), FALSE); + g_return_val_if_fail (EOG_IS_IMAGE_SAVE_INFO (target), FALSE); diff --git a/eog.changes b/eog.changes index fef8e79..6eded6e 100644 --- a/eog.changes +++ b/eog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 12 15:24:32 CET 2008 - rodrigo@novell.com + +- Nullify GError before sending it to g_file_copy (bnc#450055) + ------------------------------------------------------------------- Tue Oct 21 21:17:13 EST 2008 - mboman@suse.de diff --git a/eog.spec b/eog.spec index 0b8b14f..9a02e93 100644 --- a/eog.spec +++ b/eog.spec @@ -48,9 +48,11 @@ Provides: eog2 = 2.20.0 Obsoletes: eog2 <= 2.20.0 Requires: gnome-icon-theme Version: 2.24.1 -Release: 1 +Release: 2 Summary: Eye of GNOME for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM eog-nullify-gerror-450055.patch bnc#450055 rodrigo@novell.com +Patch1: eog-nullify-gerror-450055.patch Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -81,6 +83,7 @@ compiled for the GNOME 2.x Desktop. %lang_package %prep %setup -q +%patch1 %build %configure\ @@ -129,7 +132,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/eog.pc %changelog -* Tue Oct 21 2008 mboman@suse.de +* Fri Dec 12 2008 rodrigo@novell.com +- Nullify GError before sending it to g_file_copy (bnc#450055) +* Wed Oct 22 2008 mboman@suse.de - Update to version 2.24.1: + Improvements to the JPEG metadata reader + Fix progress reporting when images only need copying during "Save As" @@ -140,7 +145,7 @@ rm -rf $RPM_BUILD_ROOT + Docs improvements. + Bugs fixed: bgo#530447, bgo#555940, bgo#555942 + Translation updates -* Tue Sep 30 2008 mboman@suse.de +* Wed Oct 01 2008 mboman@suse.de - Update to version 2.24.0: + bgo#552109, won't set wallpaper + Translation updates @@ -198,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT + Updated translations. * Fri Mar 21 2008 vuntz@suse.de - Add a gnome-desktop-devel buildrequires to fix the build. -* Thu Mar 13 2008 maw@suse.de +* Fri Mar 14 2008 maw@suse.de - Update to version 2.22.0: + Contextual menu in image view widget + Support for resetting the toolbar to its default layout @@ -360,7 +365,7 @@ rm -rf $RPM_BUILD_ROOT - Make sure the correct image is displayed when reselecting the current image while loading another one - Updated translations -* Wed Sep 13 2006 jhargadon@suse.de +* Thu Sep 14 2006 jhargadon@suse.de - update to version 2.16.0.1 - Fix infinite loop on canvas destruction - Updated translations @@ -426,7 +431,7 @@ rm -rf $RPM_BUILD_ROOT - Updated to version 2.12.0. * Mon Aug 22 2005 gekker@suse.de - Update to version 2.11.92 -* Mon Aug 01 2005 gekker@suse.de +* Tue Aug 02 2005 gekker@suse.de - Update to version 2.11.90 * Thu Jul 21 2005 gekker@suse.de - Update to version 2.11.0 @@ -489,7 +494,7 @@ rm -rf $RPM_BUILD_ROOT - Added alsa to neededforbuild, because esound can depend on it. * Tue Aug 20 2002 hhetter@suse.de - added PreReq: filesystem -* Mon Aug 12 2002 ro@suse.de +* Tue Aug 13 2002 ro@suse.de - remove control-center from neededforbuild * Tue Aug 06 2002 hhetter@suse.de - updated to version 1.0.2