Date: Wed, 23 Jul 2003 14:55:40 +0200 From: Simon Barner <barner@in.tum.de> To: Kris Kennaway <kris@obsecurity.org> Cc: current@FreeBSD.org Subject: Re: Fixing gcc 3.3 compile failures -- fix for math/surf Message-ID: <20030723125540.GF566@zi025.glhnet.mhn.de> In-Reply-To: <20030718025200.GA36893@rot13.obsecurity.org> References: <20030718025200.GA36893@rot13.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--sdEQJo40s7ofW8iR
Content-Type: multipart/mixed; boundary="8jNwmpfkpox/fiJK"
Content-Disposition: inline
--8jNwmpfkpox/fiJK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
--8jNwmpfkpox/fiJK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.patch"
Content-Transfer-Encoding: quoted-printable
--- Makefile.orig Tue Jul 22 17:13:04 2003
+++ Makefile Tue Jul 22 17:13:15 2003
@@ -7,7 +7,7 @@
#
=20
PORTNAME=3D surf
-PORTVERSION=3D 1.0.3
+PORTVERSION=3D 1.0.4
CATEGORIES=3D math
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=3D ${PORTNAME}
@@ -27,9 +27,5 @@
MAN1=3D surf.1
=20
.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >=3D 500113
-BROKEN=3D "Does not compile (bad C++ code)"
-.endif
=20
.include <bsd.port.post.mk>
--8jNwmpfkpox/fiJK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="distinfo.patch"
--- distinfo.orig Mon Apr 23 18:52:21 2001
+++ distinfo Tue Jul 22 16:03:51 2003
@@ -1 +1 @@
-MD5 (surf-1.0.3.tar.gz) = 4d0cea15d9e771e60920dbb25979d1f3
+MD5 (surf-1.0.4.tar.gz) = 4880ecf3d4207ab0a4f2a2f017383b65
--8jNwmpfkpox/fiJK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
filename="patch-gtkgui::MainWindowController.cc"
Content-Transfer-Encoding: quoted-printable
--- gtkgui/MainWindowController.cc.orig Tue Jul 22 16:23:20 2003
+++ gtkgui/MainWindowController.cc Tue Jul 22 16:23:30 2003
@@ -28,7 +28,7 @@
=20
#include <gtk/gtkitemfactory.h>
=20
-#include <strstream.h>
+#include <strstream>
=20
// #define DEBUG
#include "debug.h"
--8jNwmpfkpox/fiJK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-gtkgui::Requester.cc"
Content-Transfer-Encoding: quoted-printable
--- gtkgui/Requester.cc.orig Tue Jul 22 16:23:45 2003
+++ gtkgui/Requester.cc Tue Jul 22 16:24:01 2003
@@ -25,7 +25,7 @@
=20
#include <assert.h>
#include <iostream.h>
-#include <strstream.h>
+#include <strstream>
=20
#include <gtk/gtk.h>
=20
--8jNwmpfkpox/fiJK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-gtkgui::SaveImageDiaglog.cc"
Content-Transfer-Encoding: quoted-printable
--- gtkgui/SaveImageDialog.cc.orig Tue Jul 22 16:24:13 2003
+++ gtkgui/SaveImageDialog.cc Tue Jul 22 16:26:31 2003
@@ -23,9 +23,11 @@
*/
=20
=20
-#include <strstream.h>
+#include <strstream>
=20
#include "SaveImageDialog.h"
+
+using std::ostrstream;
=20
void SaveImageDialog::toggled_dither_method (GtkWidget *w, gpointer data)
{
--8jNwmpfkpox/fiJK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-gtkgui::mycolor.cc"
Content-Transfer-Encoding: quoted-printable
--- gtkgui/mycolor.cc.orig Tue Jul 22 16:22:12 2003
+++ gtkgui/mycolor.cc Tue Jul 22 16:22:26 2003
@@ -26,7 +26,7 @@
#include <assert.h>
#include <iostream.h>
#include <stdlib.h>
-#include <strstream.h>
+#include <strstream>
=20
#include <gtk/gtk.h>
#include <gdk/gdk.h>
--8jNwmpfkpox/fiJK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-misc::Misc.h"
Content-Transfer-Encoding: quoted-printable
--- misc/Misc.h.orig Tue Jul 22 16:14:35 2003
+++ misc/Misc.h Tue Jul 22 16:14:59 2003
@@ -26,7 +26,9 @@
#ifndef MISC_H
#define MISC_H
=20
-#include <strstream.h>
+#include <strstream>
+
+using std::ostrstream;
=20
class Misc
{
--8jNwmpfkpox/fiJK--
--sdEQJo40s7ofW8iR
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (FreeBSD)
iD8DBQE/HoXMCkn+/eutqCoRAllHAJ9x2f6n1niqC9OgReBGEaLKtWK+AQCgqVQo
R17OA2224iKuQ4u11gWZlnA=
=/Swo
-----END PGP SIGNATURE-----
--sdEQJo40s7ofW8iR--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030723125540.GF566>