Fixed gcc 3.3 compile failures.

5 files changed, 121 insertions, 2 deletions

diff --git a/media-gfx/surf/ChangeLog b/media-gfx/surf/ChangeLog
index a2bcd730695c..86503a7887dc 100644
--- a/media-gfx/surf/ChangeLog
+++ b/media-gfx/surf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/surf
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/ChangeLog,v 1.2 2004/06/24 22:50:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/ChangeLog,v 1.3 2004/06/30 03:55:58 matsuu Exp $
+
+*surf-1.0.4-r1 (30 Jun 2004)
+
+  30 Jun 2004; MATSUU Takuto <matsuu@gentoo.org> +files/surf-1.0.4-gcc33.patch,
+  +surf-1.0.4-r1.ebuild:
+  Fixed gcc 3.3 compile failures. Bug#53755.
 
 *surf-1.0.4 (05 Oct 2003)
 
diff --git a/media-gfx/surf/Manifest b/media-gfx/surf/Manifest
index a5f38213c4ef..99b1df4f3031 100644
--- a/media-gfx/surf/Manifest
+++ b/media-gfx/surf/Manifest
@@ -1,4 +1,7 @@
+MD5 3e728c278096b1428d89c9242202916d surf-1.0.4-r1.ebuild 897
 MD5 2a6203360db56f7ac040d5ec6986e979 surf-1.0.4.ebuild 810
-MD5 810bf37eb6faf6ffe1cbccd047fd8c4f ChangeLog 316
+MD5 8b251b3ff7f1213016700f9a6f108246 ChangeLog 495
 MD5 8a67b13e5639d281680288bd86cfdbab metadata.xml 506
+MD5 42e79d8544b3618f7beaee05d2e16ef9 files/surf-1.0.4-gcc33.patch 2009
 MD5 3ca4fef631e9dc15c4f8fb9e2024ca24 files/digest-surf-1.0.4 62
+MD5 3ca4fef631e9dc15c4f8fb9e2024ca24 files/digest-surf-1.0.4-r1 62
diff --git a/media-gfx/surf/files/digest-surf-1.0.4-r1 b/media-gfx/surf/files/digest-surf-1.0.4-r1
new file mode 100644
index 000000000000..50cc4252046a
--- /dev/null
+++ b/media-gfx/surf/files/digest-surf-1.0.4-r1
@@ -0,0 +1 @@
+MD5 4880ecf3d4207ab0a4f2a2f017383b65 surf-1.0.4.tar.gz 460776
diff --git a/media-gfx/surf/files/surf-1.0.4-gcc33.patch b/media-gfx/surf/files/surf-1.0.4-gcc33.patch
new file mode 100644
index 000000000000..22fb311cd18e
--- /dev/null
+++ b/media-gfx/surf/files/surf-1.0.4-gcc33.patch
@@ -0,0 +1,67 @@
+diff -Naur surf-1.0.4.orig/gtkgui/MainWindowController.cc surf-1.0.4/gtkgui/MainWindowController.cc
+--- surf-1.0.4.orig/gtkgui/MainWindowController.cc	2000-07-22 06:04:44.000000000 +0900
++++ surf-1.0.4/gtkgui/MainWindowController.cc	2004-06-30 12:40:35.406192088 +0900
+@@ -28,7 +28,7 @@
+ 
+ #include <gtk/gtkitemfactory.h>
+ 
+-#include <strstream.h>
++#include <strstream>
+ 
+ // #define DEBUG
+ #include "debug.h"
+diff -Naur surf-1.0.4.orig/gtkgui/Requester.cc surf-1.0.4/gtkgui/Requester.cc
+--- surf-1.0.4.orig/gtkgui/Requester.cc	2000-03-13 02:02:00.000000000 +0900
++++ surf-1.0.4/gtkgui/Requester.cc	2004-06-30 12:40:21.682104294 +0900
+@@ -25,7 +25,7 @@
+ 
+ #include <assert.h>
+ #include <iostream.h>
+-#include <strstream.h>
++#include <strstream>
+ 
+ #include <gtk/gtk.h>
+ 
+diff -Naur surf-1.0.4.orig/gtkgui/SaveImageDialog.cc surf-1.0.4/gtkgui/SaveImageDialog.cc
+--- surf-1.0.4.orig/gtkgui/SaveImageDialog.cc	2000-03-13 02:02:00.000000000 +0900
++++ surf-1.0.4/gtkgui/SaveImageDialog.cc	2004-06-30 12:39:59.337217644 +0900
+@@ -23,10 +23,12 @@
+  */
+ 
+ 
+-#include <strstream.h>
++#include <strstream>
+ 
+ #include "SaveImageDialog.h"
+ 
++using std::ostrstream;
++
+ void SaveImageDialog::toggled_dither_method (GtkWidget *w, gpointer data)
+ {
+ 	SaveImageDialog *sid = (SaveImageDialog *)data;
+diff -Naur surf-1.0.4.orig/gtkgui/mycolor.cc surf-1.0.4/gtkgui/mycolor.cc
+--- surf-1.0.4.orig/gtkgui/mycolor.cc	2000-06-14 21:32:52.000000000 +0900
++++ surf-1.0.4/gtkgui/mycolor.cc	2004-06-30 12:39:24.224109990 +0900
+@@ -26,7 +26,7 @@
+ #include <assert.h>
+ #include <iostream.h>
+ #include <stdlib.h>
+-#include <strstream.h>
++#include <strstream>
+ 
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+diff -Naur surf-1.0.4.orig/misc/Misc.h surf-1.0.4/misc/Misc.h
+--- surf-1.0.4.orig/misc/Misc.h	2000-03-13 02:02:00.000000000 +0900
++++ surf-1.0.4/misc/Misc.h	2004-06-30 12:38:58.375711455 +0900
+@@ -26,7 +26,9 @@
+ #ifndef MISC_H
+ #define MISC_H
+ 
+-#include <strstream.h>
++#include <strstream>
++
++using std::ostrstream;
+ 
+ class Misc
+ {
diff --git a/media-gfx/surf/surf-1.0.4-r1.ebuild b/media-gfx/surf/surf-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..249b548ac240
--- /dev/null
+++ b/media-gfx/surf/surf-1.0.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/surf-1.0.4-r1.ebuild,v 1.1 2004/06/30 03:55:58 matsuu Exp $
+
+DESCRIPTION="a tool to visualize algebraic curves and algebraic surfaces"
+HOMEPAGE="http://surf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/surf/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE="gtk"
+
+RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
+	>=dev-libs/gmp-2
+	media-libs/tiff
+	media-libs/jpeg"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc33.patch
+}
+
+src_compile() {
+	econf `use_enable gtk gui` || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install install-man || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	for d in examples/*
+	do
+		docinto ${d}
+		dodoc ${d}/*
+	done
+}