From: Hanno Boeck <hanno@gentoo.org>
Date: Mon, 28 Nov 2005 18:38:37 +0000 (+0000)
Subject: gcc41 fix for opensp
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5405c2924a4e08f5b7e8ca7648f089d8801d2077;p=gentoo.git

gcc41 fix for opensp
Package-Manager: portage-2.0.53_rc7
---

diff --git a/app-text/opensp/ChangeLog b/app-text/opensp/ChangeLog
index 0f5e4c8280f2..5f710c3e9866 100644
--- a/app-text/opensp/ChangeLog
+++ b/app-text/opensp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/opensp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/ChangeLog,v 1.27 2005/10/31 10:37:45 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/ChangeLog,v 1.28 2005/11/28 18:38:37 hanno Exp $
+
+  28 Nov 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/opensp-1.5.1-gcc41.patch, opensp-1.5.1.ebuild:
+  Fix for gcc 4.1.
 
   31 Oct 2005; Leonardo Boshell <leonardop@gentoo.org> opensp-1.5.1.ebuild:
   Use the same CFLAGS filters from openjade to avoid obscure bugs (bug #100828).
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 8ed901035b4a..8fd66dc00045 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -1,5 +1,16 @@
-MD5 e591e8e83182eb0d0c8bb66013a0afbb ChangeLog 3078
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7131145d053829a2a868340645049cd9 ChangeLog 3196
 MD5 f2c6fce376b1b43840245b32f1ba23d6 files/digest-opensp-1.5.1 65
 MD5 28c4615619978171db28bf0060eb6dc7 files/opensp-1.5-gcc34.patch 263
+MD5 05bc78ac9871b98e47ea4bb537bb516e files/opensp-1.5.1-gcc41.patch 656
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 a47d46c056d376824ff4bdfe01ab06ca opensp-1.5.1.ebuild 1870
+MD5 ceb47ce337ddcd752c4e300d601c287a opensp-1.5.1.ebuild 1911
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDi07Ir2QksT29OyARAoCQAJ9qeJ0kcsk7VzNMuYBmrP63G/WB9wCePVSz
+T2YXVm9bRU+Yan1REeJiY68=
+=rOGp
+-----END PGP SIGNATURE-----
diff --git a/app-text/opensp/files/opensp-1.5.1-gcc41.patch b/app-text/opensp/files/opensp-1.5.1-gcc41.patch
new file mode 100644
index 000000000000..fa9b4397cefe
--- /dev/null
+++ b/app-text/opensp/files/opensp-1.5.1-gcc41.patch
@@ -0,0 +1,12 @@
+diff -dpruN --exclude='config*' OpenSP-1.5.1.orig/include/InternalInputSource.h OpenSP-1.5.1/include/InternalInputSource.h
+--- OpenSP-1.5.1.orig/include/InternalInputSource.h	2003-07-17 20:14:00.000000000 +0200
++++ OpenSP-1.5.1/include/InternalInputSource.h	2005-11-16 07:22:04.700397800 +0100
+@@ -34,7 +34,7 @@ public:
+   void pushCharRef(Char ch, const NamedCharRef &);
+   Boolean rewind(Messenger &);
+   const StringC *contents();
+-  InternalInputSource *InternalInputSource::asInternalInputSource();
++  InternalInputSource *asInternalInputSource();
+   ~InternalInputSource();
+ private:
+   InternalInputSource(const InternalInputSource &); // undefined
diff --git a/app-text/opensp/opensp-1.5.1.ebuild b/app-text/opensp/opensp-1.5.1.ebuild
index 7ea040e30805..0e6d85cd4793 100644
--- a/app-text/opensp/opensp-1.5.1.ebuild
+++ b/app-text/opensp/opensp-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/opensp-1.5.1.ebuild,v 1.11 2005/10/31 10:37:45 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/opensp-1.5.1.ebuild,v 1.12 2005/11/28 18:38:37 hanno Exp $
 
 inherit eutils flag-o-matic
 
@@ -28,6 +28,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-1.5-gcc34.patch
+	epatch ${FILESDIR}/opensp-1.5.1-gcc41.patch
 }
 
 src_compile() {