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=10

Browse Source
This commit is contained in:
OBS User unknown 2007-07-11 23:45:23 +00:00 committed by Git OBS Bridge
parent 934c8ffaaa
commit 254aa436b6
8 changed files with 90 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
abuild.patch
View File

@ -1,12 +0,0 @@
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.18.2.tar.bz2
View File

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

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

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

52
eog-casts.patch
View File

@ -1,51 +1,51 @@
--- libeog/eog-metadata-reader.c Index: src/eog-metadata-reader.c
+++ libeog/eog-metadata-reader.c ===================================================================
@@ -257,13 +257,13 @@ --- src/eog-metadata-reader.c.orig
+++ src/eog-metadata-reader.c
@@ -228,13 +228,13 @@ eog_metadata_reader_consume (EogMetadata
if (i + priv->size < len) {
/* read data in one block */
- memcpy ((guchar*) (priv->exif_chunk) + priv->bytes_read, &buf[i], priv->size);
+ memcpy ((void *) (priv->exif_chunk) + priv->bytes_read, (void *) &buf[i], priv->size);
priv->state = EMR_READ;
i = i + priv->size - 1; /* the for-loop consumes the other byte */
}
else {
int chunk_len = len - i;
- memcpy ((guchar*) (priv->exif_chunk) + priv->bytes_read, &buf[i], chunk_len);
+ memcpy ((void *) (priv->exif_chunk) + priv->bytes_read, (void *) &buf[i], chunk_len);
priv->bytes_read += chunk_len; /* bytes already read */
priv->size = (i + priv->size) - len; /* remaining data to read */
i = len - 1;
@@ -256,13 +256,13 @@ eog_metadata_reader_consume (EogMetadata
if (i + priv->size < len) { if (i + priv->size < len) {
/* read data in one block */ /* read data in one block */
- memcpy ((guchar*) (priv->icc_chunk) + priv->bytes_read, &buf[i], priv->size); - memcpy ((guchar*) (priv->icc_chunk) + priv->bytes_read, &buf[i], priv->size);
+ memcpy ((void*) (priv->icc_chunk + priv->bytes_read), (void*)&buf[i], priv->size); + memcpy ((void *) (priv->icc_chunk) + priv->bytes_read, (void *) &buf[i], priv->size);
priv->state = EMR_READ; priv->state = EMR_READ;
i = i + priv->size - 1; /* the for-loop consumes the other byte */ i = i + priv->size - 1; /* the for-loop consumes the other byte */
} }
else { else {
int chunk_len = len - i; int chunk_len = len - i;
- memcpy ((guchar*) (priv->icc_chunk) + priv->bytes_read, &buf[i], chunk_len); - memcpy ((guchar*) (priv->icc_chunk) + priv->bytes_read, &buf[i], chunk_len);
+ memcpy ((void*)(priv->icc_chunk + priv->bytes_read), (void*)&buf[i], chunk_len); + memcpy ((void *) (priv->icc_chunk) + priv->bytes_read, (void *) &buf[i], chunk_len);
priv->bytes_read += chunk_len; /* bytes already read */ priv->bytes_read += chunk_len; /* bytes already read */
priv->size = (i + priv->size) - len; /* remaining data to read */ priv->size = (i + priv->size) - len; /* remaining data to read */
i = len - 1; i = len - 1;
@@ -283,12 +283,12 @@ @@ -282,12 +282,12 @@ eog_metadata_reader_consume (EogMetadata
if (i + priv->size < len) { if (i + priv->size < len) {
/* read data in one block */ /* read data in one block */
- memcpy ((guchar*) (priv->iptc_chunk) + priv->bytes_read, &buf[i], priv->size); - memcpy ((guchar*) (priv->iptc_chunk) + priv->bytes_read, &buf[i], priv->size);
+ memcpy ((void*)(priv->iptc_chunk + priv->bytes_read), (void*)&buf[i], priv->size); + memcpy ((void *) (priv->iptc_chunk) + priv->bytes_read, (void *) &buf[i], priv->size);
priv->state = EMR_READ; priv->state = EMR_READ;
} }
else { else {
int chunk_len = len - i; int chunk_len = len - i;
- memcpy ((guchar*) (priv->iptc_chunk) + priv->bytes_read, &buf[i], chunk_len); - memcpy ((guchar*) (priv->iptc_chunk) + priv->bytes_read, &buf[i], chunk_len);
+ memcpy ((void*)(priv->iptc_chunk + priv->bytes_read), (void*)&buf[i], chunk_len); + memcpy ((void *) (priv->iptc_chunk) + priv->bytes_read, (void *) &buf[i], chunk_len);
priv->bytes_read += chunk_len; /* bytes already read */ priv->bytes_read += chunk_len; /* bytes already read */
priv->size = (i + priv->size) - len; /* remaining data to read */ priv->size = (i + priv->size) - len; /* remaining data to read */
i = len - 1; i = len - 1;
--- shell/recent-files/egg-recent-view-gtk.c
+++ shell/recent-files/egg-recent-view-gtk.c
@@ -822,13 +822,13 @@
if (view->menu != NULL)
g_object_remove_weak_pointer (G_OBJECT (view->menu),
- (gpointer *) &view->menu);
+ &view->menu);
view->menu = menu;
if (view->menu != NULL)
g_object_add_weak_pointer (G_OBJECT (view->menu),
- (gpointer *) &view->menu);
+ &view->menu);
}
/**

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

@ -1,36 +1,14 @@
Index: libeog/eog-image.c Index: src/eog-image.c
=================================================================== ===================================================================
--- libeog/eog-image.c.orig --- src/eog-image.c.orig
+++ libeog/eog-image.c +++ src/eog-image.c
@@ -855,8 +855,7 @@ eog_image_load (EogImage *img, guint dat @@ -1087,8 +1087,7 @@ eog_image_load (EogImage *img, guint dat
} }
if (eog_image_has_data (img, data2read)) { if (eog_image_has_data (img, data2read)) {
- g_warning ("Image %s has requested data already loaded.\n", - g_warning ("Image %s has requested data already loaded.\n",
- eog_image_get_caption (img)); - eog_image_get_caption (img));
+ return TRUE; + return TRUE;
} }
if (priv->status == EOG_IMAGE_STATUS_FAILED) { priv->status = EOG_IMAGE_STATUS_LOADING;
Index: shell/eog-window.c
===================================================================
--- shell/eog-window.c.orig
+++ shell/eog-window.c
@@ -3500,10 +3500,13 @@ handle_image_selection_changed (EogWrapL
data = g_new0 (EogJobImageLoadData, 1);
EOG_JOB_DATA (data)->window = window;
- data->image = image; /* no additional ref required, since
- * its already increased by
- * eog_wrap_list_get_first_selected_image
- */
+
+ data->image = eog_image_data_ref (image);
+
+ /* Need to unref this, because the refcount was already
+ * increased by eog_wrap_list_get_first_selected_image
+ */
+ g_object_unref (image);
job = eog_job_new_full (data,
job_image_load_action,

30
eog-pixeldim.patch
View File

@ -1,30 +0,0 @@
Index: libeog/eog-image.c
===================================================================
--- libeog/eog-image.c.orig
+++ libeog/eog-image.c
@@ -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);
if (entry != NULL && (priv->width >= 0)) {
if (entry->format == EXIF_FORMAT_LONG)
- exif_set_long (entry->data, bo, priv->width);
+ if (entry->format == EXIF_FORMAT_LONG)
+ exif_set_long (entry->data, bo, priv->width);
+ if (entry->format == EXIF_FORMAT_SHORT)
+ 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);
if (entry != NULL && (priv->height >= 0)) {
if (entry->format == EXIF_FORMAT_LONG)
- exif_set_long (entry->data, bo, priv->height);
+ if (entry->format == EXIF_FORMAT_LONG)
+ exif_set_long (entry->data, bo, priv->height);
+ if (entry->format == EXIF_FORMAT_SHORT)
+ exif_set_short (entry->data, bo, priv->height);
+ /* other number formats should not happen */
else if (entry->format == EXIF_FORMAT_SHORT)
exif_set_short (entry->data, bo, priv->height);
else

13
eog.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Jul 11 16:06:06 CEST 2007 - maw@suse.de
- Add explicit versions in Provides: and Obsoletes:
- Buildrequire libwnck-1-22-devel instead of libwnck-devel.
-------------------------------------------------------------------
Mon Jul 9 18:37:13 CEST 2007 - maw@suse.de
- Update to version 2.19.3
- New -devel subpackage
- Various bug fixes.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 18 15:45:06 CDT 2007 - maw@suse.de Mon Jun 18 15:45:06 CDT 2007 - maw@suse.de

55
eog.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package eog (Version 2.18.2) # spec file for package eog (Version 2.19.3)
# #
# 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
@ -13,21 +13,21 @@
Name: eog Name: eog
BuildRequires: docbook_4 eel-devel gnome-doc-utils-devel gnome-icon-theme gnutls-devel BuildRequires: docbook_4 eel-devel gnome-doc-utils-devel gnome-icon-theme gnutls-devel
BuildRequires: indent libgnomeprintui-devel libidl librsvg-devel BuildRequires: indent libgnomeprintui-devel libidl librsvg-devel
BuildRequires: libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper BuildRequires: libwnck-1-22-devel mDNSResponder-devel perl-XML-Parser scrollkeeper
BuildRequires: libexif-devel update-desktop-files BuildRequires: libexif-devel update-desktop-files
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) License: GPL v2 or later, LGPL v2 or later
Group: Productivity/Graphics/Viewers Group: Productivity/Graphics/Viewers
Provides: eog2 Provides: eog2 = 2.2.0
Obsoletes: eog2 Obsoletes: eog2 <= 2.2.0
Requires: gnome-icon-theme Requires: gnome-icon-theme
Version: 2.18.2 Version: 2.19.3
Release: 1 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 Patch0: 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 ### Patch3: abuild.patch
URL: http://www.gnome.org/ URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -40,12 +40,25 @@ compiled for the GNOME 2.x Desktop.
%package devel
Requires: %{name} = %{version} gconf2-devel gnome-vfs2-devel gtk2-devel libglade2-devel libgnomeui-devel pkg-config
Summary: Eye of GNOME for the GNOME 2.x Desktop
Group: Productivity/Graphics/Viewers
Autoreqprov: on
%description devel
Eye of GNOME is a very fast picture viewer. It can be used as a plug-in
for Nautilus or as a stand-alone application. This version of EOG is
compiled for the GNOME 2.x Desktop.
%prep %prep
%setup -q %setup -q
%patch %patch0
%patch1 %patch1
%patch2 ### %patch2
%patch3 -p1 ### %patch3 -p1
%build %build
%configure\ %configure\
@ -56,7 +69,7 @@ make %{?jobs:-j%jobs}
%install %install
%makeinstall %makeinstall
rm -r $RPM_BUILD_ROOT/var/scrollkeeper rm -r $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 Graphics Viewer %suse_update_desktop_file -r -N "Eye of Gnome" -G "Image Viewer" eog GNOME Graphics Viewer
%find_lang %{name} %find_lang %{name}
%find_gconf_schemas %find_gconf_schemas
@ -77,13 +90,27 @@ rm -rf $RPM_BUILD_ROOT
%{_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/*/*/*/*.png
%{_datadir}/icons/*/*/*/*.svg %{_datadir}/icons/*/*/*/*.svg
%files devel
%defattr (-, root, root)
%dir %{_includedir}/eog
%dir %{_includedir}/eog/eog
%{_includedir}/eog/eog/*.h
%{_libdir}/pkgconfig/eog.pc
%changelog %changelog
* Wed Jul 11 2007 - maw@suse.de
- Add explicit versions in Provides: and Obsoletes:
- Buildrequire libwnck-1-22-devel instead of libwnck-devel.
* Mon Jul 09 2007 - maw@suse.de
- Update to version 2.19.3
- New -devel subpackage
- Various bug fixes.
* Mon Jun 18 2007 - maw@suse.de * Mon Jun 18 2007 - maw@suse.de
- Update to version 2.18.2, which has the following changes (bug - Update to version 2.18.2, which has the following changes (bug
numbers are for bugzilla.gnome.org): numbers are for bugzilla.gnome.org):