Hello community,
here is the log from the commit of package eog
checked in at Fri Mar 9 01:44:19 CET 2007.
--------
--- GNOME/eog/eog.changes 2007-03-03 19:25:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/eog/eog.changes 2007-03-08 23:11:33.649249000 +0100
@@ -1,0 +2,6 @@
+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.
+
+-------------------------------------------------------------------
Old:
----
eog-2.16.1.tar.bz2
New:
----
abuild.patch
eog-2.17.91.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eog.spec ++++++
--- /var/tmp/diff_new_pack.xz7048/_old 2007-03-09 01:44:04.000000000 +0100
+++ /var/tmp/diff_new_pack.xz7048/_new 2007-03-09 01:44:04.000000000 +0100
@@ -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.
# This file and all modifications and additions to the pristine
@@ -21,13 +21,14 @@
Obsoletes: eog2
Autoreqprov: on
Requires: gnome-icon-theme
-Version: 2.16.1
-Release: 43
+Version: 2.17.91
+Release: 1
Summary: Eye of GNOME for the GNOME 2.x Desktop
Source: %{name}-%{version}.tar.bz2
Patch: eog-casts.patch
Patch1: eog-fast-image-switch-crash.patch
Patch2: eog-pixeldim.patch
+Patch3: abuild.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -45,6 +46,7 @@
%patch
%patch1
%patch2
+%patch3 -p1
%build
%configure\
@@ -54,6 +56,7 @@
%install
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/
%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
@@ -77,12 +80,17 @@
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/*
%{_datadir}/applications/eog.desktop
-%{_datadir}/pixmaps/eog
+# %{_datadir}/pixmaps/eog
%{_datadir}/pixmaps/*.png
%{_datadir}/eog
%{_datadir}/omf/eog
+%{_datadir}/icons/*/*/*/*.png
+%{_datadir}/icons/*/*/*/*.svg
%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
- readd accidentally dropped exif dependency
* Tue Feb 27 2007 - dmueller@suse.de
++++++ abuild.patch ++++++
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
#endif
+#include
#include
#include
#include
++++++ eog-2.16.1.tar.bz2 -> eog-2.17.91.tar.bz2 ++++++
++++ 93139 lines of diff (skipped)
++++++ eog-fast-image-switch-crash.patch ++++++
--- /var/tmp/diff_new_pack.xz7048/_old 2007-03-09 01:44:07.000000000 +0100
+++ /var/tmp/diff_new_pack.xz7048/_new 2007-03-09 01:44:07.000000000 +0100
@@ -1,8 +1,8 @@
Index: libeog/eog-image.c
-================================================================================
---- libeog/eog-image.c
+===================================================================
+--- libeog/eog-image.c.orig
+++ 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)) {
@@ -12,18 +12,11 @@
}
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
-@@ -3221,7 +3221,7 @@
- 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 @@
+@@ -3500,10 +3500,13 @@ handle_image_selection_changed (EogWrapL
data = g_new0 (EogJobImageLoadData, 1);
EOG_JOB_DATA (data)->window = window;
++++++ eog-pixeldim.patch ++++++
--- /var/tmp/diff_new_pack.xz7048/_old 2007-03-09 01:44:07.000000000 +0100
+++ /var/tmp/diff_new_pack.xz7048/_new 2007-03-09 01:44:07.000000000 +0100
@@ -1,25 +1,30 @@
---- libeog/eog-image.c
+Index: libeog/eog-image.c
+===================================================================
+--- libeog/eog-image.c.orig
+++ 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);
if (entry != NULL && (priv->width >= 0)) {
-- 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 */
- }
-
+ 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)) {
-- 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_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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org