Add gcc-4.1 patch for bug 135393. Thanks to Piotr Jaroszynski <peper at aster dot pl>. Also removing development version ebuild.

(Portage version: 2.0.54)

6 files changed, 27 insertions, 33 deletions

diff --git a/media-gfx/swftools/ChangeLog b/media-gfx/swftools/ChangeLog
index 9d740bcefc12..65570d4c9d9e 100644
--- a/media-gfx/swftools/ChangeLog
+++ b/media-gfx/swftools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/swftools
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/ChangeLog,v 1.16 2006/01/15 21:49:10 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/ChangeLog,v 1.17 2006/06/03 20:55:34 vanquirius Exp $
+
+  03 Jun 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/swftools-0.7.0-gcc41.patch, swftools-0.7.0.ebuild,
+  -swftools-0.7.1.20051207.ebuild:
+  Add gcc-4.1 patch for bug 135393. Thanks to Piotr Jaroszynski <peper at
+  aster dot pl>. Also removing development version ebuild.
 
   15 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
   swftools-0.7.1.20051207.ebuild:
diff --git a/media-gfx/swftools/Manifest b/media-gfx/swftools/Manifest
index 5600715cec1a..4ea4a081dd77 100644
--- a/media-gfx/swftools/Manifest
+++ b/media-gfx/swftools/Manifest
@@ -1,8 +1,7 @@
 MD5 a037d2e14826a9fb1aac872369ce9eff ChangeLog 2575
 MD5 15aa8ade8fb71cd3ecb378d6b47ec99d files/digest-swftools-0.6.2 67
 MD5 99faa6b769b99cb31e6340ebfcd8aa56 files/digest-swftools-0.7.0 67
-MD5 cdd08117f3b8f8929a0ec54aabf18ecb files/digest-swftools-0.7.1.20051207 65
+MD5 e66ce1208e8e5a0e076c3920d2fa5cf7 files/swftools-0.7.0-gcc41.patch 674
 MD5 df1755e88d0ee1163718c633acf18d07 metadata.xml 405
 MD5 693f9ddcee30675a8685a7710d2d4ce9 swftools-0.6.2.ebuild 637
-MD5 143175483afd7388babbd1a4a7ed8a03 swftools-0.7.0.ebuild 638
-MD5 56e5cb3a7ca6fa79c01d05d2c93b4632 swftools-0.7.1.20051207.ebuild 730
+MD5 71b65377bf22a6b7a72524493a1d39da swftools-0.7.0.ebuild 726
diff --git a/media-gfx/swftools/files/digest-swftools-0.7.1.20051207 b/media-gfx/swftools/files/digest-swftools-0.7.1.20051207
deleted file mode 100644
index 0ba5c1bb5b6b..000000000000
--- a/media-gfx/swftools/files/digest-swftools-0.7.1.20051207
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c416ef02502d941957c7a11f2075adcb swftools-dev.tar.gz 1674053
diff --git a/media-gfx/swftools/files/swftools-0.7.0-gcc41.patch b/media-gfx/swftools/files/swftools-0.7.0-gcc41.patch
new file mode 100644
index 000000000000..dcee5a2a9538
--- /dev/null
+++ b/media-gfx/swftools/files/swftools-0.7.0-gcc41.patch
@@ -0,0 +1,11 @@
+--- swftools-0.7.0-orig/pdf2swf/SWFOutputDev.cc	2005-08-06 11:11:42.000000000 +0200
++++ swftools-0.7.0/pdf2swf/SWFOutputDev.cc	2006-06-03 16:31:13.000000000 +0200
+@@ -245,7 +245,7 @@
+   void drawGeneralImage(GfxState *state, Object *ref, Stream *str,
+ 				   int width, int height, GfxImageColorMap*colorMap, GBool invert,
+ 				   GBool inlineImg, int mask, int *maskColors);
+-  int SWFOutputDev::setGfxFont(char*id, char*filename, double quality);
++  int setGfxFont(char*id, char*filename, double quality);
+   void strokeGfxline(GfxState *state, gfxline_t*line);
+   void clipToGfxLine(GfxState *state, gfxline_t*line);
+   void fillGfxLine(GfxState *state, gfxline_t*line);
diff --git a/media-gfx/swftools/swftools-0.7.0.ebuild b/media-gfx/swftools/swftools-0.7.0.ebuild
index 9513e47cd4a9..efdcf08b3bdd 100644
--- a/media-gfx/swftools/swftools-0.7.0.ebuild
+++ b/media-gfx/swftools/swftools-0.7.0.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/swftools/swftools-0.7.0.ebuild,v 1.4 2006/01/12 18:03:54 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/swftools-0.7.0.ebuild,v 1.5 2006/06/03 20:55:34 vanquirius Exp $
 
 inherit eutils
 
@@ -17,6 +17,12 @@ DEPEND=">=media-libs/t1lib-1.3.1
 		media-libs/jpeg"
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.7.0-gcc41.patch
+}
+
 src_install() {
 	einstall || die "Install died."
 	dodoc AUTHORS ChangeLog FAQ TODO
diff --git a/media-gfx/swftools/swftools-0.7.1.20051207.ebuild b/media-gfx/swftools/swftools-0.7.1.20051207.ebuild
deleted file mode 100644
index 50722976eda3..000000000000
--- a/media-gfx/swftools/swftools-0.7.1.20051207.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/swftools-0.7.1.20051207.ebuild,v 1.3 2006/01/15 21:49:11 vanquirius Exp $
-
-# NOTE: development version ebuild, be careful
-
-inherit eutils
-
-DESCRIPTION="SWF Tools is a collection of SWF manipulation and generation utilities"
-HOMEPAGE="http://www.swftools.org/"
-SRC_URI="mirror://gentoo/${PN}-dev.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-libs/t1lib-1.3.1
-		media-libs/freetype
-		media-libs/jpeg"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-2005-12-07-1809"
-
-src_install() {
-	einstall || die "Install died."
-	dodoc AUTHORS ChangeLog FAQ TODO
-}