This commit is contained in:
parent
3111f26b9a
commit
5ddd37cbd4
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:8960e4d2378aedfc807fd53dd3ea8e1334ee7dd5b3c1413e5ed46e050964b244
|
|
||||||
size 1584605
|
|
3
eog-2.19.91.tar.bz2
Normal file
3
eog-2.19.91.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2f96fd320065cf29c50f7f6a9278fc2e8d7519be359e7ac6a219f5445d69b6c7
|
||||||
|
size 1618015
|
@ -2,50 +2,65 @@ Index: src/eog-metadata-reader.c
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- src/eog-metadata-reader.c.orig
|
--- src/eog-metadata-reader.c.orig
|
||||||
+++ src/eog-metadata-reader.c
|
+++ src/eog-metadata-reader.c
|
||||||
@@ -228,13 +228,13 @@ eog_metadata_reader_consume (EogMetadata
|
@@ -297,12 +297,12 @@ eog_metadata_reader_consume (EogMetadata
|
||||||
|
if (chunk) {
|
||||||
if (i + priv->size < len) {
|
if (i + priv->size < len) {
|
||||||
/* read data in one block */
|
/* read data in one block */
|
||||||
- memcpy ((guchar*) (priv->exif_chunk) + priv->bytes_read, &buf[i], priv->size);
|
- memcpy ((guchar*) (chunk) + priv->bytes_read, &buf[i + offset], priv->size);
|
||||||
+ memcpy ((void *) (priv->exif_chunk) + priv->bytes_read, (void *) &buf[i], priv->size);
|
+ memcpy ((void*) (chunk) + priv->bytes_read, &buf[i + offset], 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;
|
||||||
|
- memcpy ((guchar*) (priv->exif_chunk) + priv->bytes_read, &buf[i], chunk_len);
|
||||||
|
+ memcpy ((void*) (priv->exif_chunk) + priv->bytes_read, &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;
|
||||||
|
@@ -319,7 +319,7 @@ eog_metadata_reader_consume (EogMetadata
|
||||||
|
eog_debug_message (DEBUG_IMAGE_DATA, "Read continuation of EXIF data, length: %i", priv->size);
|
||||||
|
{
|
||||||
int chunk_len = len - i;
|
int chunk_len = len - i;
|
||||||
- memcpy ((guchar*) (priv->exif_chunk) + priv->bytes_read, &buf[i], chunk_len);
|
- 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);
|
+ memcpy ((void*) (priv->exif_chunk) + priv->bytes_read, &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;
|
||||||
@@ -256,13 +256,13 @@ eog_metadata_reader_consume (EogMetadata
|
@@ -333,7 +333,7 @@ eog_metadata_reader_consume (EogMetadata
|
||||||
|
eog_debug_message (DEBUG_IMAGE_DATA, "Read continuation of XMP data, length: %i", priv->size);
|
||||||
|
{
|
||||||
|
int chunk_len = len - i;
|
||||||
|
- memcpy ((guchar*) (priv->xmp_chunk) + priv->bytes_read, &buf[i], chunk_len);
|
||||||
|
+ memcpy ((void*) (priv->xmp_chunk) + priv->bytes_read, &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;
|
||||||
|
@@ -354,12 +354,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->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, &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, &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;
|
||||||
@@ -282,12 +282,12 @@ eog_metadata_reader_consume (EogMetadata
|
@@ -379,11 +379,11 @@ 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, &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, &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;
|
||||||
|
17
eog.changes
17
eog.changes
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Aug 29 15:13:55 CEST 2007 - maw@suse.de
|
||||||
|
|
||||||
|
- Update to version 2.19.91:
|
||||||
|
* Features:
|
||||||
|
+ XMP support
|
||||||
|
+ Side pane can be expanded by plugins
|
||||||
|
+ Inhibit screensaver when running slideshow/fullscreen
|
||||||
|
+ Improved selection visual feedback in the image collection
|
||||||
|
pane
|
||||||
|
* Bugs (bugzilla.gnome.org) fixed: #470297, #311308, #467835,
|
||||||
|
#470416, #470686, #466681, #456451, #408591, #427806, #451101,
|
||||||
|
#453151, #455672, #455700, #459819, #460780, #462362, #462785,
|
||||||
|
#462971, #462973, #464709, #465060,and #465628.
|
||||||
|
* Updated translations
|
||||||
|
- Refresh eog-casts.patch.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Aug 7 22:56:32 CEST 2007 - maw@suse.de
|
Tue Aug 7 22:56:32 CEST 2007 - maw@suse.de
|
||||||
|
|
||||||
|
28
eog.spec
28
eog.spec
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package eog (Version 2.19.4)
|
# spec file for package eog (Version 2.19.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
|
||||||
@ -11,7 +11,7 @@
|
|||||||
# norootforbuild
|
# norootforbuild
|
||||||
|
|
||||||
Name: eog
|
Name: eog
|
||||||
BuildRequires: docbook_4 eel-devel fdupes gnome-doc-utils-devel gnome-icon-theme gnutls-devel
|
BuildRequires: docbook_4 eel-devel fdupes gnome-doc-utils-devel gnome-icon-theme gnutls-devel shared-mime-info
|
||||||
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-devel mDNSResponder-devel perl-XML-Parser scrollkeeper
|
||||||
BuildRequires: libexif-devel update-desktop-files
|
BuildRequires: libexif-devel update-desktop-files
|
||||||
@ -20,14 +20,12 @@ Group: Productivity/Graphics/Viewers
|
|||||||
Provides: eog2 = 2.2.0
|
Provides: eog2 = 2.2.0
|
||||||
Obsoletes: eog2 <= 2.2.0
|
Obsoletes: eog2 <= 2.2.0
|
||||||
Requires: gnome-icon-theme
|
Requires: gnome-icon-theme
|
||||||
Version: 2.19.4
|
Version: 2.19.91
|
||||||
Release: 4
|
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
|
||||||
Patch0: 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
|
|
||||||
### Patch3: abuild.patch
|
|
||||||
URL: http://www.gnome.org/
|
URL: http://www.gnome.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Requires: %{name}-lang = %{version}
|
Requires: %{name}-lang = %{version}
|
||||||
@ -59,8 +57,6 @@ compiled for the GNOME 2.x Desktop.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0
|
%patch0
|
||||||
%patch1
|
%patch1
|
||||||
### %patch2
|
|
||||||
### %patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure\
|
%configure\
|
||||||
@ -93,8 +89,6 @@ 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/*.png
|
|
||||||
%{_datadir}/eog
|
%{_datadir}/eog
|
||||||
%{_datadir}/omf/eog
|
%{_datadir}/omf/eog
|
||||||
%{_datadir}/icons/*/*/*/*.png
|
%{_datadir}/icons/*/*/*/*.png
|
||||||
@ -113,6 +107,20 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/pkgconfig/eog.pc
|
%{_libdir}/pkgconfig/eog.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 29 2007 - maw@suse.de
|
||||||
|
- Update to version 2.19.91:
|
||||||
|
* Features:
|
||||||
|
+ XMP support
|
||||||
|
+ Side pane can be expanded by plugins
|
||||||
|
+ Inhibit screensaver when running slideshow/fullscreen
|
||||||
|
+ Improved selection visual feedback in the image collection
|
||||||
|
pane
|
||||||
|
* Bugs (bugzilla.gnome.org) fixed: #470297, #311308, #467835,
|
||||||
|
[#470416], #470686, #466681, #456451, #408591, #427806, #451101,
|
||||||
|
[#453151], #455672, #455700, #459819, #460780, #462362, #462785,
|
||||||
|
[#462971], #462973, #464709, #465060,and #465628.
|
||||||
|
* Updated translations
|
||||||
|
- Refresh eog-casts.patch.
|
||||||
* Tue Aug 07 2007 - maw@suse.de
|
* Tue Aug 07 2007 - maw@suse.de
|
||||||
- Use %%fdupes
|
- Use %%fdupes
|
||||||
- Split off a -lang subpackage.
|
- Split off a -lang subpackage.
|
||||||
|
Loading…
Reference in New Issue
Block a user