Fix bug 119476, patch by taviso (borrowed from imagemagick bug).

(Portage version: 2.0.54)

5 files changed, 132 insertions, 12 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index b7ad9d2a7239..b1943f9536d4 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/graphicsmagick
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.24 2005/11/28 13:00:36 mcummings Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.25 2006/02/12 22:25:32 kloeri Exp $
+
+*graphicsmagick-1.1.7 (12 Feb 2006)
+
+  12 Feb 2006; Bryan Østergaard <kloeri@gentoo.org
+  +files/graphicsmagick-1.1.7-overflow.patch, +graphicsmagick-1.1.7.ebuild:
+  Fix bug 119476, patch by taviso (borrowed from imagemagick bug).
 
   28 Nov 2005; <mcumming@gentoo.org> graphicsmagick-1.1.5-r1.ebuild,
   graphicsmagick-1.1.5.ebuild, graphicsmagick-1.1.6-r1.ebuild,
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 23b65cc32521..c6d2e90aed1f 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6eac08112968c27fac862909b48e11f0 ChangeLog 3770
 MD5 c07ee30f29005c8130ae5639813149b7 files/digest-graphicsmagick-1.1.5 74
 MD5 c07ee30f29005c8130ae5639813149b7 files/digest-graphicsmagick-1.1.5-r1 74
 MD5 0ae4b45e8525b3c84deeae402fd11c79 files/digest-graphicsmagick-1.1.6 74
 MD5 0ae4b45e8525b3c84deeae402fd11c79 files/digest-graphicsmagick-1.1.6-r1 74
+MD5 1bd4583aea1b79ce9c97f3129c31757c files/digest-graphicsmagick-1.1.7 74
+MD5 e839cb87efd01d7afa56143043c26be4 files/graphicsmagick-1.1.7-overflow.patch 466
 MD5 0d86c7176f6338aed5b5f86af8f76d63 files/xwd-dos.patch 1103
 MD5 965343c92e42a8c90c4cb6bd7e8402f1 graphicsmagick-1.1.5-r1.ebuild 2431
 MD5 8a71e26cc7fe52a2ab396809f2eb59d5 graphicsmagick-1.1.5.ebuild 2359
 MD5 9e2febc14e2e085cffb834b7442360fe graphicsmagick-1.1.6-r1.ebuild 2602
 MD5 bfd824780fb9e271b794cb184116f9cd graphicsmagick-1.1.6.ebuild 2428
+MD5 464ea9423207aed053542500f1906e00 graphicsmagick-1.1.7.ebuild 2739
 MD5 eae2172901a7cc6b7a6e37fc9267a2b9 metadata.xml 197
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDiv99tG5z4I8BtQoRApvdAJ9Jj5TfuADNnXfEel0vSvBDhCe+qACfaHVn
-nnF4IWJmtC9MbLD48wRxfWU=
-=5HGI
------END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7
new file mode 100644
index 000000000000..6c9bce30c3eb
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7
@@ -0,0 +1 @@
+MD5 f75d830ca623bf10385b3ad62c48437a GraphicsMagick-1.1.7.tar.bz2 4957394
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-overflow.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-overflow.patch
new file mode 100644
index 000000000000..88ff71f7a7fa
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-overflow.patch
@@ -0,0 +1,11 @@
+--- magick/image.c.orig	2006-02-11 19:07:59.000000000 +0100
++++ magick/image.c	2006-02-11 19:08:06.000000000 +0100
+@@ -6250,7 +6250,7 @@
+       /*
+         Rectify multi-image file support.
+       */
+-      FormatString(filename,image_info->filename,0);
++      FormatString(filename,"%s",image_info->filename,0);
+       if ((LocaleCompare(filename,image_info->filename) != 0) &&
+           (strchr(filename,'%') == (char *) NULL))
+         image_info->adjoin=False;
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.1.7.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.1.7.ebuild
new file mode 100644
index 000000000000..20298b197bc2
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.1.7.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.1.7.ebuild,v 1.1 2006/02/12 22:25:32 kloeri Exp $
+
+inherit libtool flag-o-matic perl-app
+replace-flags k6-3 i586
+replace-flags k6-2 i586
+replace-flags k6 i586
+
+IUSE="X gs jbig jp2 jpeg lcms lzw perl png tiff truetype wmf xml2 doc"
+
+MY_PN=GraphicsMagick
+MY_P=${MY_PN}-${PV}
+
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A collection of tools and libraries for many image formats"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.graphicsmagick.org/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=sys-apps/sed-4
+	>=app-arch/bzip2-1
+	sys-libs/zlib
+	X? ( virtual/x11 )
+	gs?   ( virtual/ghostscript )
+	jbig? ( media-libs/jbigkit )
+	jp2? ( media-libs/jasper )
+	jpeg? ( >=media-libs/jpeg-6b )
+	lcms? ( >=media-libs/lcms-1.06 )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	truetype? ( =media-libs/freetype-2* )
+	wmf? ( >=media-libs/libwmf-0.2.5 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-overflow.patch
+}
+
+src_compile() {
+	[[ $(tc-arch) = "x86" ]] && replace-flags -mcpu -mtune
+	case $(tc-arch) in
+		x86|amd64) replace-flags "-mcpu" "-mtune" ;;
+	esac
+
+
+	local myconf=""
+	myconf="${myconf} $(use_with X x)"
+	myconf="${myconf} $(use_with jbig)"
+	myconf="${myconf} $(use_with jp2)"
+	myconf="${myconf} $(use_with jpeg)"
+	myconf="${myconf} $(use_with lcms)"
+	myconf="${myconf} $(use_enable lzw)"
+	myconf="${myconf} $(use_with png)"
+	myconf="${myconf} $(use_with tiff)"
+	myconf="${myconf} $(use_with truetype ttf)"
+	myconf="${myconf} $(use_with wmf)"
+	myconf="${myconf} $(use_with xml2 xml)"
+
+	# Netscape is still used ?  More people should have Mozilla
+	sed -i 's:netscape:mozilla:g' configure
+
+	econf \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		--enable-shared \
+		--with-quantum-depth=16 \
+		--with-threads \
+		--with-bzlib \
+		--without-perl \
+		${myconf} || die
+
+	# make PerlMagick using portage tools instead of Makefile to avoid sandbox issues
+	if use perl ; then
+		cd PerlMagick
+		perl-app_src_prep
+		perl-app_src_compile
+		cd ..
+	fi
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	if use perl ; then
+		cd PerlMagick
+		perl-module_src_install
+		cd ..
+	fi
+
+	dosym /usr/lib/${MY_P}/ /usr/lib/GraphicsMagick
+
+	rm -f ${D}/usr/share/GraphicsMagick/*.txt
+	rm -rf ${D}/usr/share/${MY_P}/www
+
+	if use doc; then
+	    dohtml -r www/*
+	fi
+
+	dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick-config
+	dosed "s:-I/usr/include ::" /usr/bin/GraphicsMagick++-config
+}