Add patch to fix compilation with gcc-4.3; bug #250754

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 i686

4 files changed, 44 insertions, 14 deletions

diff --git a/app-text/rtf2html/ChangeLog b/app-text/rtf2html/ChangeLog
index f1d1678d16c6..0956d4fb6248 100644
--- a/app-text/rtf2html/ChangeLog
+++ b/app-text/rtf2html/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/rtf2html
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rtf2html/ChangeLog,v 1.2 2008/03/23 11:15:30 swegener Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/rtf2html/ChangeLog,v 1.3 2009/01/03 22:53:39 halcy0n Exp $
+
+  03 Jan 2009; Mark Loeser <halcy0n@gentoo.org>
+  +files/rtf2html-0.2.0-gcc43.patch, rtf2html-0.2.0.ebuild:
+  Add patch to fix compilation with gcc-4.3; bug #250754
 
 *rtf2html-0.2.0 (17 Mar 2008)
 
diff --git a/app-text/rtf2html/Manifest b/app-text/rtf2html/Manifest
index bc77a58f6fac..cad4149ea4f7 100644
--- a/app-text/rtf2html/Manifest
+++ b/app-text/rtf2html/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX rtf2html-0.2.0-gcc43.patch 693 RMD160 9c3c9ee4554623ceaf5d1e901bf7a21b98f032ac SHA1 ea1dcdae9ee412b0410206fc11700484d93ddd00 SHA256 c21d3a20785baf4936798848d15cf87614fc804c2c9a289b42c797c3fe035791
 DIST rtf2html-0.2.0.tar.bz2 75292 RMD160 1aff956c3c78f48d299d66e037cd08d35e7a5da9 SHA1 b4e2e1620e4e48dc7fd589d5c83e315d529fe723 SHA256 13d39bdd3387aeba1e640d3209aa2ce56871291247734757d399675e4b8b918b
-EBUILD rtf2html-0.2.0.ebuild 642 RMD160 2ebfdd30f902bbf5bf6d1a4d6416afa7d595cd5e SHA1 54e9d1b6672a12756f7bfb940a68eec75003ec78 SHA256 4fb1b2a7f21d89619f0cb247435d6d4d42d74831be56f087b6cdedc3c278774a
-MISC ChangeLog 333 RMD160 6b828e83b4b73787bdf8786e0df2f83691fbb02a SHA1 38e19f180c99365d13618619e0d51fbe725739f3 SHA256 2aeb7ad4a80bf6e60552a8a93b8737e1bc71cd1aa87a5d9f8f152aa28fcf883f
+EBUILD rtf2html-0.2.0.ebuild 651 RMD160 d514fa98b301c674defc5c1a220a25cb78b91153 SHA1 b1c41221b06b51f5b53d8c221a8de575059d7cb2 SHA256 10cc747c7b9c5de50da38290580993b254c5153098775c66185e71e518414f0e
+MISC ChangeLog 498 RMD160 93152d1c467d840bcc55dc16b21d406c04cb00d6 SHA1 bd2b972176419072b53173a07e0dd1cb63903e8a SHA256 21cc7c0f5e40e79532d1229ec7c13032197f25e1bff336d50b862a12571d6f2d
 MISC metadata.xml 257 RMD160 b09f722a70b31a7a021c4702c88e5525e1d26ab8 SHA1 71392236bda977d14fa4065bd69efee19e985855 SHA256 befff6ec9d6a4a132aaea2bdc486413f976210902f2830ede0b2435491259351
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH5jvaI1lqEGTUzyQRAgmaAJ0Xxa+Tuwwou7qBw0pONfbDQVuW1ACghY07
-/AVzfepvAXr0AFPRwbF75po=
-=k80i
+iEYEARECAAYFAklf7HkACgkQCRZPokWLroQCPQCfcn4b1H8WgLVdPW9hqlTn+Ezv
+u3wAn2YrPzPIvg+mxER+l2t6UTDzXXts
+=2IL9
 -----END PGP SIGNATURE-----
diff --git a/app-text/rtf2html/files/rtf2html-0.2.0-gcc43.patch b/app-text/rtf2html/files/rtf2html-0.2.0-gcc43.patch
new file mode 100644
index 000000000000..f87661fd3796
--- /dev/null
+++ b/app-text/rtf2html/files/rtf2html-0.2.0-gcc43.patch
@@ -0,0 +1,22 @@
+diff -ur rtf2html-0.2.0-orig/rtf_keyword.h rtf2html-0.2.0/rtf_keyword.h
+--- rtf2html-0.2.0-orig/rtf_keyword.h	2007-08-03 04:50:45.000000000 -0400
++++ rtf2html-0.2.0/rtf_keyword.h	2009-01-03 17:45:14.000000000 -0500
+@@ -2,6 +2,7 @@
+ 
+ 
#include "config.h"
+ #include <string>
++#include <cstdlib>
+ #include <map>
+ #include <ctype.h>
+ 
+diff -ur rtf2html-0.2.0-orig/rtf_table.cpp rtf2html-0.2.0/rtf_table.cpp
+--- rtf2html-0.2.0-orig/rtf_table.cpp	2007-07-31 11:16:52.000000000 -0400
++++ rtf2html-0.2.0/rtf_table.cpp	2009-01-03 17:45:14.000000000 -0500
+@@ -4,6 +4,7 @@
+ #include <iostream>

+ #include <stdexcept>

+ #include <functional>

++#include <algorithm>

+ 

+ typedef std::set<int> intset;

+ 

diff --git a/app-text/rtf2html/rtf2html-0.2.0.ebuild b/app-text/rtf2html/rtf2html-0.2.0.ebuild
index a0490f029a4f..f9732f296231 100644
--- a/app-text/rtf2html/rtf2html-0.2.0.ebuild
+++ b/app-text/rtf2html/rtf2html-0.2.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rtf2html/rtf2html-0.2.0.ebuild,v 1.1 2008/03/17 10:57:23 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rtf2html/rtf2html-0.2.0.ebuild,v 1.2 2009/01/03 22:53:39 halcy0n Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -16,10 +18,11 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-src_compile()
-{
-	econf || die "Configuration failed"
-	emake || die "Compilation failed"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_install()