Add gcc4 patch for bug 118706.

Package-Manager: portage-2.0.53

4 files changed, 47 insertions, 4 deletions

diff --git a/media-gfx/jhead/ChangeLog b/media-gfx/jhead/ChangeLog
index 508a236d8d01..19795d859ac2 100644
--- a/media-gfx/jhead/ChangeLog
+++ b/media-gfx/jhead/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/jhead
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.34 2006/01/10 21:03:31 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.35 2006/01/11 23:09:31 vanquirius Exp $
+
+  11 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/jhead-2.5-gcc4.diff, jhead-2.5.ebuild:
+  Add gcc4 patch for bug 118706. Thanks to Bernard Cafarelli <voyageur at
+  operamail dot com>.
 
 *jhead-2.5 (10 Jan 2006)
 
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 8a29026ecd64..06d66e96d299 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,9 +1,10 @@
-MD5 656d55dd48bae6458117637ee22aa6a0 ChangeLog 3939
+MD5 9a2cbaee992f696f950c64ddd447af19 ChangeLog 4136
 MD5 914162d5ed1fd8cf9f24104fff013410 files/digest-jhead-2.2 60
 MD5 89f78d6efa8594f34ceb1a4a20b61803 files/digest-jhead-2.4 60
 MD5 242b88f25a0dc329fb64272ddf5a3d40 files/digest-jhead-2.5 60
 MD5 7b4626f3d33f81e78651e4e78cd6032c files/jhead-2.4-gcc4.diff 5559
+MD5 78553c79093dbd7cb0a3f1e1ef461076 files/jhead-2.5-gcc4.diff 1492
 MD5 088f32d3a102d96ca5231db2c396e0d7 jhead-2.2.ebuild 791
 MD5 ac71d330f94996b9645721e1eec813cc jhead-2.4.ebuild 857
-MD5 89570d15d5c4fa88abd60404b515571a jhead-2.5.ebuild 843
+MD5 4e2f87f51c6fb44fc750c22731ec5357 jhead-2.5.ebuild 885
 MD5 daf676490886bcebc03a96609cd21923 metadata.xml 227
diff --git a/media-gfx/jhead/files/jhead-2.5-gcc4.diff b/media-gfx/jhead/files/jhead-2.5-gcc4.diff
new file mode 100644
index 000000000000..1ee3aec3b797
--- /dev/null
+++ b/media-gfx/jhead/files/jhead-2.5-gcc4.diff
@@ -0,0 +1,36 @@
+diff -Naur jhead-2.5.orig/exif.c jhead-2.5/exif.c
+--- jhead-2.5.orig/exif.c	2006-01-11 22:55:20.000000000 +0100
++++ jhead-2.5/exif.c	2006-01-11 22:59:36.000000000 +0100
+@@ -329,7 +329,7 @@
+         ByteCount -= s;
+         if (ByteCount <= 0) break;
+         printf(", ");
+-        ((char *)ValuePtr) += s;
++        ValuePtr = (char *)ValuePtr + s;
+     }
+     if (n >= 16) printf("...");
+ }
+diff -Naur jhead-2.5.orig/jhead.c jhead-2.5/jhead.c
+--- jhead-2.5.orig/jhead.c	2006-01-11 22:55:20.000000000 +0100
++++ jhead-2.5/jhead.c	2006-01-11 22:58:51.000000000 +0100
+@@ -932,7 +932,7 @@
+ 
+             for (a = 0; a < ImageInfo.numDateTimeTags; a++) {
+                 char * Pointer;
+-                Pointer = ExifSection->Data+ImageInfo.DateTimeOffsets[a]+8;
++                Pointer = (char *)ExifSection->Data+ImageInfo.DateTimeOffsets[a]+8;
+                 memcpy(Pointer, TempBuf, 19);
+             }
+ 
+diff -Naur jhead-2.5.orig/jpgfile.c jhead-2.5/jpgfile.c
+--- jhead-2.5.orig/jpgfile.c	2006-01-11 22:55:20.000000000 +0100
++++ jhead-2.5/jpgfile.c	2006-01-11 22:58:07.000000000 +0100
+@@ -346,7 +346,7 @@
+         char * ThumbnailPointer;
+         Section_t * ExifSection;
+         ExifSection = FindSection(M_EXIF);
+-        ThumbnailPointer = ExifSection->Data+ImageInfo.ThumbnailOffset+8;
++        ThumbnailPointer = (char *)ExifSection->Data+ImageInfo.ThumbnailOffset+8;
+ 
+         fwrite(ThumbnailPointer, ImageInfo.ThumbnailSize ,1, ThumbnailFile);
+         fclose(ThumbnailFile);
diff --git a/media-gfx/jhead/jhead-2.5.ebuild b/media-gfx/jhead/jhead-2.5.ebuild
index e87e6a50d1cc..0b0602ff2902 100644
--- a/media-gfx/jhead/jhead-2.5.ebuild
+++ b/media-gfx/jhead/jhead-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.5.ebuild,v 1.1 2006/01/10 21:03:32 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.5.ebuild,v 1.2 2006/01/11 23:09:31 vanquirius Exp $
 
 inherit eutils toolchain-funcs
 
@@ -18,6 +18,7 @@ RDEPEND="virtual/libc
 
 src_unpack() {
 	unpack ${A}; cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.5-gcc4.diff
 	sed -i "s:-O3 -Wall:${CFLAGS}:" makefile || die "sed failed"
 }