fix gcc-3.3 issues

3 files changed, 65 insertions, 4 deletions

diff --git a/dev-util/rhide/ChangeLog b/dev-util/rhide/ChangeLog
index a4b24b5513ad..8f6afeebe5c5 100644
--- a/dev-util/rhide/ChangeLog
+++ b/dev-util/rhide/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/rhide
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.10 2003/09/20 10:17:25 genone Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.11 2004/01/31 02:50:16 genone Exp $
+
+  31 Jan 2004; Marius Mauch <genone@gentoo.org> rhide-1.5-r1.ebuild:
+  added a patch for gcc-3.3 compatibility, thanks to Jochen Eisinger
 
   20 Sep 2003; Marius Mauch <genone@gentoo.org> rhide-1.5-r1.ebuild:
   added a fix for gettext-0.12, thanks to Brandy (bug 28741). Also replacesd
diff --git a/dev-util/rhide/files/rhide-1.5-gcc-3.3.patch b/dev-util/rhide/files/rhide-1.5-gcc-3.3.patch
new file mode 100644
index 000000000000..ba34a96cb4e4
--- /dev/null
+++ b/dev-util/rhide/files/rhide-1.5-gcc-3.3.patch
@@ -0,0 +1,53 @@
+--- ./rhide-1.5/rhgdb/gdbedit.cc.orig	2004-01-23 17:44:25.000000000 +0100
++++ ./rhide-1.5/rhgdb/gdbedit.cc	2004-01-23 17:44:25.000000000 +0100
+@@ -124,8 +124,8 @@
+ 
+ TGDBEditWindow::TGDBEditWindow(const TRect & bounds,
+ const char *fileName, int aNumber):
+-TCEditWindow(bounds, (const char *) NULL, aNumber),
+-TWindowInit(&TGDBEditWindow::initFrame)
++TWindowInit(&TGDBEditWindow::initFrame),
++TCEditWindow(bounds, (const char *) NULL, aNumber)
+ {
+   TRect r(editor->origin.x, editor->origin.y,
+           editor->origin.x + editor->size.x,
+--- ./rhide-1.5/rhgdb/main.cc.orig	2004-01-23 17:44:25.000000000 +0100
++++ ./rhide-1.5/rhgdb/main.cc	2004-01-23 17:44:25.000000000 +0100
+@@ -172,9 +172,9 @@
+ }
+ 
+ RHGDBApp::RHGDBApp():
+-TApplication(),
+ TProgInit(RHGDBApp::initStatusLine,
+-          RHGDBApp::initMenuBar, RHGDBApp::initDeskTop)
++          RHGDBApp::initMenuBar, RHGDBApp::initDeskTop),
++TApplication()
+ {
+ }
+ 
+--- ./rhide-1.5/rhgdb/options.cc.orig	2004-01-23 17:44:25.000000000 +0100
++++ ./rhide-1.5/rhgdb/options.cc	2004-01-23 17:44:25.000000000 +0100
+@@ -38,8 +38,8 @@
+ };
+ 
+ TEnvironmentDialog::TEnvironmentDialog():
+-TDialog(TRect(0, 0, 65, 17), _("Environment options")),
+-TWindowInit(TEnvironmentDialog::initFrame)
++TWindowInit(TEnvironmentDialog::initFrame),
++TDialog(TRect(0, 0, 65, 17), _("Environment options"))
+ {
+   TRect
+     r;
+--- ./tvision/include/tv/filedlg.h.orig	2004-01-23 17:44:25.000000000 +0100
++++ ./tvision/include/tv/filedlg.h	2004-01-23 17:44:25.000000000 +0100
+@@ -70,8 +70,8 @@
+ 
+ protected:
+ 
+-    TFileDialog( StreamableInit ) : TDialog ( streamableInit ),
+-      TWindowInit( &TFileDialog::initFrame ) {}
++    TFileDialog( StreamableInit ) : 
++      TWindowInit( &TFileDialog::initFrame ),TDialog ( streamableInit ) {}
+     virtual void write( opstream& );
+     virtual void *read( ipstream& );
+ 
diff --git a/dev-util/rhide/rhide-1.5-r1.ebuild b/dev-util/rhide/rhide-1.5-r1.ebuild
index 94e174f21920..18b7173836c6 100644
--- a/dev-util/rhide/rhide-1.5-r1.ebuild
+++ b/dev-util/rhide/rhide-1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.5-r1.ebuild,v 1.7 2003/11/14 20:06:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.5-r1.ebuild,v 1.8 2004/01/31 02:50:16 genone Exp $
 
 #SNAPSHOT="20020825"
 TVISIONVER="2.0.1"
@@ -46,6 +46,11 @@ DEPEND="virtual/glibc
 
 src_unpack() {
 	unpack ${A}
+	cd ${WORKDIR}
+
+	# gcc-3.3 fixes, contributed by <jochen.eisinger@gmx.de>
+	epatch ${FILESDIR}/${P}-gcc-3.3.patch
+
 	cd ${S}
 
 	# Get it to work with rhtvision-2.0