This commit is contained in:
parent
80683849e3
commit
414141081e
13
eog-nullify-gerror-450055.patch
Normal file
13
eog-nullify-gerror-450055.patch
Normal file
@ -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);
|
@ -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
|
||||
|
||||
|
19
eog.spec
19
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
|
||||
|
Loading…
Reference in New Issue
Block a user