Version bump to fix png compiling.

10 files changed, 18 insertions, 207 deletions

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 2927cf9c0507..0ac0fb8437ec 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/gd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.15 2004/11/02 21:41:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.16 2004/11/03 00:44:16 vapier Exp $
+
+*gd-2.0.32 (02 Nov 2004)
+
+  02 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/1.8.4-dec-alpha-compiler.diff, -files/1.8.4-jpeg-inc.patch,
+  -files/1.8.4-png-overflows.patch, -gd-1.8.4-r2.ebuild, -gd-2.0.31.ebuild,
+  +gd-2.0.32.ebuild:
+  Version bump to fix png compiling.
 
   02 Nov 2004; Markus Rothe <corsair@gentoo.org> gd-2.0.31.ebuild:
   Stable on ppc64, bug #69070
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index b06fa7c9159e..bfde24cb1dd5 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,12 +1,13 @@
 MD5 7da843233eb1411d307718636ec6c9b7 ChangeLog 7991
-MD5 de07bc1eeb3a2a8dcf9c11ad63c8f9fb gd-1.8.4-r2.ebuild 2271
+MD5 52aaedc3012a4bc8ded7a0e60df2a25a gd-2.0.32.ebuild 1012
 MD5 91fb60093026cec390b6df0ddd4a1d59 gd-2.0.28.ebuild 957
-MD5 52aaedc3012a4bc8ded7a0e60df2a25a gd-2.0.31.ebuild 1012
 MD5 312563b7288a2111976b24b0865d9df8 metadata.xml 1227
-MD5 c700ef06f9532087e4f27487633179a9 files/1.8.4-dec-alpha-compiler.diff 725
+MD5 de07bc1eeb3a2a8dcf9c11ad63c8f9fb gd-1.8.4-r2.ebuild 2271
 MD5 09cc9995071652c954638c7ed2590dee files/1.8.4-jpeg-inc.patch 419
-MD5 b70b849b60f7bc6a409d6effcd8b2cfb files/1.8.4-png-overflows.patch 2410
-MD5 38fb558a8071c00ce93e35aede13aaf6 files/2.0.31-png-check.patch 369
-MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-gd-1.8.4-r2 60
+MD5 ef1f623ab65a05b7e14e9bd61bb02c65 files/digest-gd-2.0.32 61
 MD5 7f1d011b6f09a5125c3c5151abbb2f56 files/digest-gd-2.0.28 133
+MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-gd-1.8.4-r2 60
+MD5 c700ef06f9532087e4f27487633179a9 files/1.8.4-dec-alpha-compiler.diff 725
 MD5 7b4c1fddfe76029cf9683586b0ea732c files/digest-gd-2.0.31 61
+MD5 38fb558a8071c00ce93e35aede13aaf6 files/2.0.31-png-check.patch 369
+MD5 b70b849b60f7bc6a409d6effcd8b2cfb files/1.8.4-png-overflows.patch 2410
diff --git a/media-libs/gd/files/1.8.4-dec-alpha-compiler.diff b/media-libs/gd/files/1.8.4-dec-alpha-compiler.diff
deleted file mode 100644
index b63aeb62f709..000000000000
--- a/media-libs/gd/files/1.8.4-dec-alpha-compiler.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru gd-1.8.3.orig/gd.c gd-1.8.3/gd.c
---- gd-1.8.3.orig/gd.c	2000-06-03 20:26:12.000000000 +0100
-+++ gd-1.8.3/gd.c	2003-05-24 20:04:41.000000000 +0100
-@@ -1,6 +1,3 @@
--#ifndef _OSD_POSIX	/* _OSD_POSIX defines *alloc() in stdlib.h */
--#include <malloc.h>
--#endif /*_OSD_POSIX*/
- #include <stdio.h>
- #include <math.h>
- #include <string.h>
-diff -ru gd-1.8.3.orig/gdcache.h gd-1.8.3/gdcache.h
---- gd-1.8.3.orig/gdcache.h	2000-06-03 20:26:12.000000000 +0100
-+++ gd-1.8.3/gdcache.h	2003-05-24 20:04:55.000000000 +0100
-@@ -40,7 +40,6 @@
- /* header                                                */
- /*********************************************************/
- 
--#include <malloc.h>
- #ifndef NULL
- #define NULL (void *)0
- #endif
diff --git a/media-libs/gd/files/1.8.4-jpeg-inc.patch b/media-libs/gd/files/1.8.4-jpeg-inc.patch
deleted file mode 100644
index ed0b9615a04f..000000000000
--- a/media-libs/gd/files/1.8.4-jpeg-inc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gd_jpeg.c.orig	2003-10-08 10:24:43.000000000 -0400
-+++ gd_jpeg.c	2003-10-08 10:24:57.000000000 -0400
-@@ -23,12 +23,12 @@
- #include <limits.h>
- #include <string.h>
- /* 1.8.1: remove dependency on jinclude.h */
--#include "jpeglib.h"
--#include "jerror.h"
- #include "gd.h"
- #include "gdhelpers.h"
- 
- #ifdef HAVE_LIBJPEG
-+#include "jpeglib.h"
-+#include "jerror.h"
- 
- static const char * const GD_JPEG_VERSION = "2.0";
- 
diff --git a/media-libs/gd/files/1.8.4-png-overflows.patch b/media-libs/gd/files/1.8.4-png-overflows.patch
deleted file mode 100644
index 365d6a76a731..000000000000
--- a/media-libs/gd/files/1.8.4-png-overflows.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- gd-1.8.4/gd_png.c	2001-02-06 14:44:02.000000000 -0500
-+++ gd-1.8.4/gd_png.c.new	2004-10-31 21:36:03.939822448 -0500
-@@ -11,6 +11,23 @@
- 
- #ifdef HAVE_LIBPNG
- 
-+#include <limits.h>
-+
-+int overflow2(int a, int b)
-+{
-+	if(a < 0 || b < 0) {
-+		fprintf(stderr, "gd warning: one parameter to a memory allocation multiplication is negative, failing operation gracefully\n");
-+		return 1;
-+	}
-+	if(b == 0)
-+		return 0;
-+	if(a > INT_MAX / b) {
-+		fprintf(stderr, "gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully\n");
-+		return 1;
-+	}
-+	return 0;
-+}
-+
- /*---------------------------------------------------------------------------
- 
-     gd_png.c                 Copyright 1999 Greg Roelofs and Thomas Boutell
-@@ -342,11 +359,20 @@
- 
-     /* allocate space for the PNG image data */
-     rowbytes = png_get_rowbytes(png_ptr, info_ptr);
-+    if (overflow2(rowbytes, height)) {
-+        png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
-+        return NULL;
-+    }
-     if ((image_data = (png_bytep)gdMalloc(rowbytes*height)) == NULL) {
-         fprintf(stderr, "gd-png error: cannot allocate image data\n");
-         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-         return NULL;
-     }
-+    if (overflow2(height, sizeof (png_bytep))) {
-+        png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
-+        gdFree (image_data);
-+        return NULL;
-+    }
-     if ((row_pointers = (png_bytepp)gdMalloc(height*sizeof(png_bytep))) == NULL) {
-         fprintf(stderr, "gd-png error: cannot allocate row pointers\n");
-         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-@@ -577,10 +603,17 @@
-      * interlaced images, but interlacing causes some serious complications. */
-     if (remap) {
-         png_bytep *row_pointers;
-+        if (overflow2(sizeof (png_bytep), height)) {
-+            return;
-+        } 
- 	row_pointers = gdMalloc(sizeof(png_bytep) * height);
-         if (row_pointers == NULL) {
-             fprintf(stderr, "gd-png error: unable to allocate row_pointers\n");
-         }
-+        if (overflow2(width, height)) {
-+            fprintf(stderr, "gd-png error: unable to allocate rows\n");
-+            return;
-+        }
-         for (j = 0;  j < height;  ++j) {
-             if ((row_pointers[j] = (png_bytep)gdMalloc(width)) == NULL) {
-                 fprintf(stderr, "gd-png error: unable to allocate rows\n");
diff --git a/media-libs/gd/files/digest-gd-1.8.4-r2 b/media-libs/gd/files/digest-gd-1.8.4-r2
deleted file mode 100644
index e41c6df5c626..000000000000
--- a/media-libs/gd/files/digest-gd-1.8.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2aef76e79f206f9798233f025f5dd28d gd-1.8.4.tar.gz 257631
diff --git a/media-libs/gd/files/digest-gd-2.0.31 b/media-libs/gd/files/digest-gd-2.0.31
deleted file mode 100644
index 52dd37dac1d9..000000000000
--- a/media-libs/gd/files/digest-gd-2.0.31
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a6e508f7911458151fe4a1475cbba51 gd-2.0.31.tar.gz 587984
diff --git a/media-libs/gd/files/digest-gd-2.0.32 b/media-libs/gd/files/digest-gd-2.0.32
new file mode 100644
index 000000000000..a465e30b6b3d
--- /dev/null
+++ b/media-libs/gd/files/digest-gd-2.0.32
@@ -0,0 +1 @@
+MD5 f7978941e578de778a3f4da759db7b29 gd-2.0.32.tar.gz 587498
diff --git a/media-libs/gd/gd-1.8.4-r2.ebuild b/media-libs/gd/gd-1.8.4-r2.ebuild
deleted file mode 100644
index bcd63dcd6f7a..000000000000
--- a/media-libs/gd/gd-1.8.4-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-1.8.4-r2.ebuild,v 1.4 2004/11/01 02:39:08 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A graphics library for fast image creation"
-HOMEPAGE="http://www.boutell.com/gd/"
-SRC_URI="http://www.boutell.com/gd/http/${P}.tar.gz"
-
-LICENSE="|| ( as-is BSD )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="X truetype freetype-version-1 jpeg"
-
-DEPEND="media-libs/libpng
-	jpeg? ( media-libs/jpeg )
-	X? ( virtual/x11 )
-	freetype-version-1? ( =media-libs/freetype-1* )
-	!freetype-version-1?  (
-		truetype? ( =media-libs/freetype-2* )
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-png-overflows.patch
-
-	local compopts
-	local libsopts
-	local incopts
-
-	use alpha \
-		&& [ "$(tc-getCC)" == "ccc" ] \
-		&& epatch ${FILESDIR}/${PV}-dec-alpha-compiler.diff
-
-	use X \
-		&& compopts="${compopts} -DHAVE_XPM" \
-		&& libsopts="${libsopts} -lXpm -lX11"
-	use jpeg \
-		&& compopts="${compopts} -DHAVE_LIBJPEG" \
-		&& libsopts="${libsopts} -ljpeg" \
-		|| epatch ${FILESDIR}/${PV}-jpeg-inc.patch
-
-	compopts="${compopts} -DHAVE_LIBPNG"
-	libsopts="${libsopts} -lpng"
-
-	if use freetype-version-1 ; then
-		compopts="${compopts} -DHAVE_LIBTTF"
-		libsopts="${libsopts} -lttf"
-		incopts="-I/usr/include/freetype"
-	elif use truetype ; then
-		compopts="${compopts} -DHAVE_LIBFREETYPE"
-		libsopts="${libsopts} -lfreetype"
-		incopts="-I/usr/include/freetype2"
-	fi
-
-	sed -i \
-		-e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \
-		-e "s:^\(LIBS\)=.*:\1=-lm -lgd -lz ${libsopts}:" \
-		-e "s:^\(INCLUDEDIRS\)=:\1=${incopts} :" \
-		-e "s:\(COMPILER=\)gcc:\1$(tc-getCC):" \
-		Makefile || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/{bin,lib,include/gd-1}
-	make \
-		INSTALL_LIB=${D}/usr/lib \
-		INSTALL_BIN=${D}/usr/bin \
-		INSTALL_INCLUDE=${D}/usr/include/gd-1 \
-		install || die
-	preplib /usr
-
-	dodoc readme.txt
-	dohtml -r ./
-
-	# now make it slotable
-	mv ${D}/usr/lib/libgd{,1}.a
-	if `has_version =media-libs/gd-2*` ; then
-		rm -rf ${D}/usr/bin
-	else
-		dosym libgd1.a /usr/lib/libgd.a
-		cd ${D}/usr/include/gd-1/
-		for f in * ; do
-			dosym gd-1/${f} /usr/include/${f}
-		done
-	fi
-}
diff --git a/media-libs/gd/gd-2.0.31.ebuild b/media-libs/gd/gd-2.0.32.ebuild
index 60f58b2a4d78..fd08183d8d06 100644
--- a/media-libs/gd/gd-2.0.31.ebuild
+++ b/media-libs/gd/gd-2.0.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.31.ebuild,v 1.3 2004/11/02 21:41:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.32.ebuild,v 1.1 2004/11/03 00:44:16 vapier Exp $
 
 inherit gnuconfig eutils
 
@@ -21,7 +21,6 @@ DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-png-check.patch
 	gnuconfig_update
 }