rpm/eog
SHA256
1
0
Fork 0
forked from pool/eog
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eog?expand=0&rev=4

Browse Source
This commit is contained in:
OBS User unknown 2007-03-09 00:44:20 +00:00 committed by Git OBS Bridge
parent 8289a08cb0
commit 86d42e934c
7 changed files with 65 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
abuild.patch Normal file
View File

@ -0,0 +1,12 @@
Index: eog-2.17.91/shell/eog-save-as-dialog-helper.c
===================================================================
--- eog-2.17.91.orig/shell/eog-save-as-dialog-helper.c
+++ eog-2.17.91/shell/eog-save-as-dialog-helper.c
@@ -2,6 +2,7 @@
#include <config.h>
#endif
+#include <string.h>
#include <stdlib.h>
#include <libgnomeui/gnome-client.h>
#include <glade/glade.h>

3
eog-2.16.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:350e698c05f415e56a694954c5039534b980f2da865b9dd7ffeb594cb63e7fb7
size 661380

3
eog-2.17.91.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b35317e996b66872aa536cecedea64c941a8763de3d8705040227dcbc806fcd
size 1127541

21
eog-fast-image-switch-crash.patch
View File

@ -1,8 +1,8 @@
Index: libeog/eog-image.c Index: libeog/eog-image.c
================================================================================ ===================================================================
--- libeog/eog-image.c --- libeog/eog-image.c.orig
+++ libeog/eog-image.c +++ libeog/eog-image.c
@@ -946,8 +946,7 @@ @@ -855,8 +855,7 @@ eog_image_load (EogImage *img, guint dat
} }
if (eog_image_has_data (img, data2read)) { if (eog_image_has_data (img, data2read)) {
@ -12,18 +12,11 @@ Index: libeog/eog-image.c
} }
if (priv->status == EOG_IMAGE_STATUS_FAILED) { if (priv->status == EOG_IMAGE_STATUS_FAILED) {
--- shell/eog-window.c Index: shell/eog-window.c
===================================================================
--- shell/eog-window.c.orig
+++ shell/eog-window.c +++ shell/eog-window.c
@@ -3221,7 +3221,7 @@ @@ -3500,10 +3500,13 @@ handle_image_selection_changed (EogWrapL
g_assert_not_reached ();
}
- g_object_unref (image);
+ eog_image_data_unref (image);
/* The companion lock is in job_image_load_action. */
eog_image_unlock (image);
@@ -3298,10 +3298,13 @@
data = g_new0 (EogJobImageLoadData, 1); data = g_new0 (EogJobImageLoadData, 1);
EOG_JOB_DATA (data)->window = window; EOG_JOB_DATA (data)->window = window;

45
eog-pixeldim.patch
View File

@ -1,25 +1,30 @@
--- libeog/eog-image.c Index: libeog/eog-image.c
===================================================================
--- libeog/eog-image.c.orig
+++ libeog/eog-image.c +++ libeog/eog-image.c
@@ -365,12 +365,20 @@ @@ -356,7 +356,11 @@ update_exif_data (EogImage *image)
entry = exif_content_get_entry (priv->exif->ifd [EXIF_IFD_EXIF], EXIF_TAG_PIXEL_X_DIMENSION); entry = exif_content_get_entry (priv->exif->ifd [EXIF_IFD_EXIF], EXIF_TAG_PIXEL_X_DIMENSION);
if (entry != NULL && (priv->width >= 0)) { if (entry != NULL && (priv->width >= 0)) {
- exif_set_long (entry->data, bo, priv->width); if (entry->format == EXIF_FORMAT_LONG)
+ if (entry->format == EXIF_FORMAT_LONG) - exif_set_long (entry->data, bo, priv->width);
+ exif_set_long (entry->data, bo, priv->width); + if (entry->format == EXIF_FORMAT_LONG)
+ if (entry->format == EXIF_FORMAT_SHORT) + exif_set_long (entry->data, bo, priv->width);
+ exif_set_short (entry->data, bo, priv->width); + if (entry->format == EXIF_FORMAT_SHORT)
+ /* other number formats should not happen */ + exif_set_short (entry->data, bo, priv->width);
} + /* other number formats should not happen */
else if (entry->format == EXIF_FORMAT_SHORT)
exif_set_short (entry->data, bo, priv->width);
else
@@ -366,7 +370,11 @@ update_exif_data (EogImage *image)
entry = exif_content_get_entry (priv->exif->ifd [EXIF_IFD_EXIF], EXIF_TAG_PIXEL_Y_DIMENSION); entry = exif_content_get_entry (priv->exif->ifd [EXIF_IFD_EXIF], EXIF_TAG_PIXEL_Y_DIMENSION);
if (entry != NULL && (priv->height >= 0)) { if (entry != NULL && (priv->height >= 0)) {
- exif_set_long (entry->data, bo, priv->height); if (entry->format == EXIF_FORMAT_LONG)
+ if (entry->format == EXIF_FORMAT_LONG) - exif_set_long (entry->data, bo, priv->height);
+ exif_set_long (entry->data, bo, priv->height); + if (entry->format == EXIF_FORMAT_LONG)
+ if (entry->format == EXIF_FORMAT_SHORT) + exif_set_long (entry->data, bo, priv->height);
+ exif_set_short (entry->data, bo, priv->height); + if (entry->format == EXIF_FORMAT_SHORT)
+ /* other number formats should not happen */ + exif_set_short (entry->data, bo, priv->height);
} + /* other number formats should not happen */
} else if (entry->format == EXIF_FORMAT_SHORT)
#else exif_set_short (entry->data, bo, priv->height);
else

6
eog.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 8 16:11:11 CST 2007 - maw@suse.de
- Update to version 2.17.91
- Refresh some patches that didn't cleanly apply.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 3 19:25:44 CET 2007 - dmueller@suse.de Sat Mar 3 19:25:44 CET 2007 - dmueller@suse.de

16
eog.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package eog (Version 2.16.1) # spec file for package eog (Version 2.17.91)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -21,13 +21,14 @@ Provides: eog2
Obsoletes: eog2 Obsoletes: eog2
Autoreqprov: on Autoreqprov: on
Requires: gnome-icon-theme Requires: gnome-icon-theme
Version: 2.16.1 Version: 2.17.91
Release: 43 Release: 1
Summary: Eye of GNOME for the GNOME 2.x Desktop Summary: Eye of GNOME for the GNOME 2.x Desktop
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Patch: eog-casts.patch Patch: eog-casts.patch
Patch1: eog-fast-image-switch-crash.patch Patch1: eog-fast-image-switch-crash.patch
Patch2: eog-pixeldim.patch Patch2: eog-pixeldim.patch
Patch3: abuild.patch
URL: http://www.gnome.org/ URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -45,6 +46,7 @@ compiled for the GNOME 2.x Desktop.
%patch %patch
%patch1 %patch1
%patch2 %patch2
%patch3 -p1
%build %build
%configure\ %configure\
@ -54,6 +56,7 @@ make %{?jobs:-j%jobs}
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
ln -s ../icons/gnome/48x48/apps/image-viewer.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ ln -s ../icons/gnome/48x48/apps/image-viewer.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
%suse_update_desktop_file -r -N "Eye of Gnome" -G "Image Viewer" eog GNOME Application Graphics Viewer %suse_update_desktop_file -r -N "Eye of Gnome" -G "Image Viewer" eog GNOME Application Graphics Viewer
for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/eog/*/eog.xml; do for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/eog/*/eog.xml; do
@ -77,12 +80,17 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING ChangeLog NEWS README %doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/* %{_bindir}/*
%{_datadir}/applications/eog.desktop %{_datadir}/applications/eog.desktop
%{_datadir}/pixmaps/eog # %{_datadir}/pixmaps/eog
%{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/*.png
%{_datadir}/eog %{_datadir}/eog
%{_datadir}/omf/eog %{_datadir}/omf/eog
%{_datadir}/icons/*/*/*/*.png
%{_datadir}/icons/*/*/*/*.svg
%changelog %changelog
* Thu Mar 08 2007 - maw@suse.de
- Update to version 2.17.91
- Refresh some patches that didn't cleanly apply.
* Sat Mar 03 2007 - dmueller@suse.de * Sat Mar 03 2007 - dmueller@suse.de
- readd accidentally dropped exif dependency - readd accidentally dropped exif dependency
* Tue Feb 27 2007 - dmueller@suse.de * Tue Feb 27 2007 - dmueller@suse.de