From 75b0716bf4eef8cd9264fa689d6535fdde23f6d9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 10 Jul 2007 14:55:11 +0000 Subject: [PATCH] 2.19.4 --- .cvsignore | 2 +- ...2.19.2-svgz.patch => eog-2.19.4-svgz.patch | 23 ++++++++-------- eog.spec | 26 ++++++++++--------- sources | 2 +- 4 files changed, 28 insertions(+), 25 deletions(-) rename eog-2.19.2-svgz.patch => eog-2.19.4-svgz.patch (73%) diff --git a/.cvsignore b/.cvsignore index bbcd563..579d2ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -eog-2.19.3.tar.bz2 +eog-2.19.4.tar.bz2 diff --git a/eog-2.19.2-svgz.patch b/eog-2.19.4-svgz.patch similarity index 73% rename from eog-2.19.2-svgz.patch rename to eog-2.19.4-svgz.patch index b551585..7beba2e 100644 --- a/eog-2.19.2-svgz.patch +++ b/eog-2.19.4-svgz.patch @@ -1,6 +1,7 @@ ---- eog-2.19.2/src/eog-image.c.svgz 2007-05-14 13:02:45.000000000 -0400 -+++ eog-2.19.2/src/eog-image.c 2007-05-19 20:35:24.000000000 -0400 -@@ -477,7 +477,7 @@ eog_image_apply_transformations (EogImag +diff -up eog-2.19.4/src/eog-image.c.svgz eog-2.19.4/src/eog-image.c +--- eog-2.19.4/src/eog-image.c.svgz 2007-07-09 16:20:10.000000000 -0400 ++++ eog-2.19.4/src/eog-image.c 2007-07-10 10:41:07.000000000 -0400 +@@ -480,7 +480,7 @@ eog_image_apply_transformations (EogImag } static GnomeVFSFileSize @@ -9,7 +10,7 @@ { GnomeVFSFileInfo *info; GnomeVFSFileSize bytes; -@@ -488,11 +488,14 @@ eog_image_determine_file_bytes (EogImage +@@ -491,11 +491,14 @@ eog_image_determine_file_bytes (EogImage result = gnome_vfs_get_file_info_uri (img->priv->uri, info, GNOME_VFS_FILE_INFO_DEFAULT | @@ -24,7 +25,7 @@ g_set_error (error, EOG_IMAGE_ERROR, -@@ -500,6 +503,8 @@ eog_image_determine_file_bytes (EogImage +@@ -503,6 +506,8 @@ eog_image_determine_file_bytes (EogImage gnome_vfs_result_to_string (result)); } else { bytes = info->size; @@ -33,7 +34,7 @@ } gnome_vfs_file_info_unref (info); -@@ -831,6 +836,7 @@ eog_image_real_load (EogImage *img, +@@ -834,6 +839,7 @@ eog_image_real_load (EogImage *img, GnomeVFSResult result; EogMetadataReader *md_reader = NULL; GdkPixbufFormat *format; @@ -41,19 +42,19 @@ GdkPixbufLoader *loader = NULL; guchar *buffer; gboolean failed = FALSE; -@@ -851,9 +857,10 @@ eog_image_real_load (EogImage *img, +@@ -852,9 +858,10 @@ eog_image_real_load (EogImage *img, priv->file_type = NULL; } - priv->bytes = eog_image_determine_file_bytes (img, error); + priv->bytes = eog_image_determine_file_bytes (img, &mime_type, error); - if (priv->bytes == 0 && (error == NULL || *error != NULL)) { -+ g_free (mime_type); + if (priv->bytes == 0) { ++ g_free (mime_type); return FALSE; } -@@ -876,6 +883,7 @@ eog_image_real_load (EogImage *img, +@@ -877,6 +884,7 @@ eog_image_real_load (EogImage *img, result = gnome_vfs_open_uri (&handle, priv->uri, GNOME_VFS_OPEN_READ); if (result != GNOME_VFS_OK) { @@ -61,7 +62,7 @@ g_set_error (error, EOG_IMAGE_ERROR, EOG_IMAGE_ERROR_VFS, -@@ -885,9 +893,12 @@ eog_image_real_load (EogImage *img, +@@ -886,9 +894,12 @@ eog_image_real_load (EogImage *img, } buffer = g_new0 (guchar, EOG_IMAGE_READ_BUFFER_SIZE); diff --git a/eog.spec b/eog.spec index 2630a31..6620e5f 100644 --- a/eog.spec +++ b/eog.spec @@ -1,24 +1,23 @@ -%define glib2_version 2.2.0 -%define pango_version 1.2.0 -%define gtk2_version 2.7.1 -%define libgnomeui_version 2.5.92 -%define desktop_file_utils_version 0.9 -%define gail_version 1.2.0 -%define eel2_version 2.2.0 -%define gnome_vfs2_version 2.5.91 +%define gtk2_version 2.10.0 +%define glib2_version 2.12.0 +%define gnome_vfs2_version 2.10.0 +%define libgnomeui_version 2.6.0 %define libglade_version 2.3.6 -%define libexif_version 0.6.12 %define libart_version 2.3.16 %define gnome_desktop_version 2.10.0 %define gnome_icon_theme_version 2.17.1 +%define desktop_file_utils_version 0.9 +%define gail_version 1.2.0 +%define eel2_version 2.2.0 +%define libexif_version 0.6.12 Summary: Eye of GNOME image viewer Name: eog -Version: 2.19.3 -Release: 2%{?dist} +Version: 2.19.4 +Release: 1%{?dist} URL: http://www.gnome.org Source: http://download.gnome.org/sources/eog/2.19/%{name}-%{version}.tar.bz2 -Patch0: eog-2.19.2-svgz.patch +Patch0: eog-2.19.4-svgz.patch License: GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -153,6 +152,9 @@ fi %{_libdir}/pkgconfig/eog.pc %changelog +* Tue Jul 10 2007 Matthias Clasen - 2.19.4-1 +- Update to 2.19.4 + * Fri Jul 6 2007 Matthias Clasen - 2.19.3-2 - Fix a directory ownership issue diff --git a/sources b/sources index 3203051..5711af9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f27b942c44e91d3b0f6f55f72f5ff5a eog-2.19.3.tar.bz2 +b87418cd52ad345bc0f513ac696d5250 eog-2.19.4.tar.bz2