summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2008-10-11 23:55:09 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2008-10-11 23:55:09 +0000
commitc7e141368651542c3732bf2b966c521b7863ce36 (patch)
tree800ad8591bbee3ca6f835db1f1863f6aaea81c65
parentBump to 2.4.2. Finally fix parallel installation issues. (diff)
downloadgentoo-2-c7e141368651542c3732bf2b966c521b7863ce36.tar.gz
gentoo-2-c7e141368651542c3732bf2b966c521b7863ce36.tar.bz2
gentoo-2-c7e141368651542c3732bf2b966c521b7863ce36.zip
Patch didn't apply cleanly on 2.22.3.
(Portage version: 2.2_rc11/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64, RepoMan options: --force)
-rw-r--r--media-gfx/eog/ChangeLog6
-rw-r--r--media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch6
2 files changed, 8 insertions, 4 deletions
diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 38468fac37cd..6308fdcce6e6 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/eog
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.211 2008/10/11 23:35:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.212 2008/10/11 23:55:09 eva Exp $
+
+ 11 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+ files/eog-2.22.3-unrecognized-chunks.patch:
+ Patch didn't apply cleanly on 2.22.3.
*eog-2.22.3-r2 (11 Oct 2008)
diff --git a/media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch b/media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch
index 56df1f913145..21229b62f765 100644
--- a/media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch
+++ b/media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch
@@ -5,10 +5,10 @@
Don't overwrite the last read chunk when skipping over unrecognized
APP1 chunks. Avoids memory corruption and subsequent segfaults.
-Index: trunk/src/eog-metadata-reader-jpg.c
+Index: trunk/src/eog-metadata-reader.c
====================================================================
---- trunk/src/eog-metadata-reader-jpg.c 2008/09/30 11:58:28 4810
-+++ trunk/src/eog-metadata-reader-jpg.c 2008/09/30 13:49:31 4811
+--- trunk/src/eog-metadata-reader.c 2008/09/30 11:58:28 4810
++++ trunk/src/eog-metadata-reader.c 2008/09/30 13:49:31 4811
@@ -321,6 +321,7 @@
case EJA_OTHER:
default: