gcc-3.4 fixes

3 files changed, 69 insertions, 2 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index a1af7fda7430..afd058fd4f43 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.29 2004/05/21 14:23:01 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.30 2004/05/23 15:57:25 lu_zero Exp $
+
+  23 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/gtkmm-1.2.9-gcc3.4-gentoo.patch, gtkmm-1.2.9-r2.ebuild:
+  Fixes for gcc-3.4
 
   21 May 2004; Danny van Dyk <kugelfang@gentoo.org> gtkmm-2.4.1.ebuild:
   Added aclocal/automake/autoconf before gnome2_src_compile; necessary on amd64.
diff --git a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc3.4-gentoo.patch b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc3.4-gentoo.patch
new file mode 100644
index 000000000000..1e9ac1f8159a
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc3.4-gentoo.patch
@@ -0,0 +1,62 @@
+diff -ruN gtkmm-1.2.9.orig/src/build_sources/proxy.h.m4 gtkmm-1.2.9/src/build_sources/proxy.h.m4
+--- gtkmm-1.2.9.orig/src/build_sources/proxy.h.m4	2004-05-23 16:31:57.125073328 +0200
++++ gtkmm-1.2.9/src/build_sources/proxy.h.m4	2004-05-23 16:38:47.675660152 +0200
+@@ -174,20 +174,20 @@
+           data.callback=&callback;
+           data.obj=this;
+           SigC::ScopeNode* node=tmp->receiver();
+-          obj->register_data(node);
++          this->obj->register_data(node);
+           return tmp;
+         }
+ 
+       RType emit(ARG_BOTH($1))
+         {
+           return reinterpret_cast<RType (*)(LIST(gObj*,1,ARG_TYPE($1),[$1]))>
+-            (emit_func) (LIST(obj->gtkobj(),1,ARG_NAME($1),[$1]));
++            (emit_func) (LIST(this->obj->gtkobj(),1,ARG_NAME($1),[$1]));
+         }
+ 
+       RType operator()(ARG_BOTH($1))
+         {
+           return reinterpret_cast<RType (*)(LIST(gObj*,1,ARG_TYPE($1),[$1]))>
+-            (emit_func) (LIST(obj->gtkobj(),1,ARG_NAME($1),[$1]));
++            (emit_func) (LIST(this->obj->gtkobj(),1,ARG_NAME($1),[$1]));
+         }
+ 
+   };
+diff -ruN gtkmm-1.2.9.orig/src/curve.gen_h gtkmm-1.2.9/src/curve.gen_h
+--- gtkmm-1.2.9.orig/src/curve.gen_h	2004-05-23 16:31:57.111075456 +0200
++++ gtkmm-1.2.9/src/curve.gen_h	2004-05-23 16:41:01.224357664 +0200
+@@ -143,8 +143,8 @@
+       int i;
+       Iterator iter;
+       for (iter=b,i=0;iter!=e;++iter,i++);
+-      gfloat data[]=new gfloat[i];
+-      get_vector(n,data);
++      gfloat *data=new gfloat[i];
++      get_vector(i,data);
+       for (iter=b,i=0;iter!=e;++iter,i++)
+         (*iter)=data[i];
+       delete [] data;
+diff -ruN gtkmm-1.2.9.orig/src/gtk--/base.h gtkmm-1.2.9/src/gtk--/base.h
+--- gtkmm-1.2.9.orig/src/gtk--/base.h	2004-05-23 16:31:57.121073936 +0200
++++ gtkmm-1.2.9/src/gtk--/base.h	2004-05-23 16:35:27.421103472 +0200
+@@ -90,6 +90,8 @@
+ 
+ struct _GtkObject;
+ 
++namespace Gtk { Gtk::Object *wrap (GtkObject *o); }
++
+ namespace Gtk
+ {
+ 
+@@ -482,7 +484,7 @@
+   value_type operator*() const
+   {
+     if (node && node->data)
+-      return Gtk::wrap(static_cast<impl*>((*node).data));
++    	return static_cast<value_type>(Gtk::wrap(static_cast<GtkObject*>((*node).data)));
+     return 0;
+   }
+ 
diff --git a/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild b/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
index 29f18daf91e9..d455c053f8d0 100644
--- a/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild,v 1.8 2004/01/29 04:29:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild,v 1.9 2004/05/23 15:57:25 lu_zero Exp $
 
 inherit eutils
 
@@ -25,6 +25,7 @@ src_unpack() {
 	# in CVS. It fixes a build problem with gcc3.1.
 	# (http://marc.theaimsgroup.com/?l=gtkmm&m=101879848701486&w=2)
 	epatch ${FILESDIR}/gtkmm-1.2.9-gcc3.1-gentoo.patch
+	epatch ${FILESDIR}/gtkmm-1.2.9-gcc3.4-gentoo.patch
 }
 
 src_compile() {