From 0beb901505303d90cb0e09272a08511e88e5dbb7 Mon Sep 17 00:00:00 2001
From: Alexander Nedotsukov <bland@FreeBSD.org>
Date: Sun, 5 Sep 2004 11:15:08 +0000
Subject: Fix build with gcc 3.4

Approved by:	portmgr (krion)
---
 .../files/patch-src::build_sources::proxy.h.m4     | 26 ++++++++++++++++++++++
 x11-toolkits/gtk--/files/patch-src::curve.gen_h    | 13 +++++++++++
 x11-toolkits/gtk--/files/patch-src::gtk--::base.h  | 25 +++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 x11-toolkits/gtk--/files/patch-src::build_sources::proxy.h.m4
 create mode 100644 x11-toolkits/gtk--/files/patch-src::curve.gen_h
 create mode 100644 x11-toolkits/gtk--/files/patch-src::gtk--::base.h

(limited to 'x11-toolkits/gtk--/files')

diff --git a/x11-toolkits/gtk--/files/patch-src::build_sources::proxy.h.m4 b/x11-toolkits/gtk--/files/patch-src::build_sources::proxy.h.m4
new file mode 100644
index 000000000000..5e48974b17e2
--- /dev/null
+++ b/x11-toolkits/gtk--/files/patch-src::build_sources::proxy.h.m4
@@ -0,0 +1,26 @@
+--- src/build_sources/proxy.h.m4.orig	Sun Sep  5 05:45:02 2004
++++ src/build_sources/proxy.h.m4	Sun Sep  5 05:50:18 2004
+@@ -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 --git a/x11-toolkits/gtk--/files/patch-src::curve.gen_h b/x11-toolkits/gtk--/files/patch-src::curve.gen_h
new file mode 100644
index 000000000000..a13e6e23a12b
--- /dev/null
+++ b/x11-toolkits/gtk--/files/patch-src::curve.gen_h
@@ -0,0 +1,13 @@
+--- src/curve.gen_h.orig	Sun Sep  5 05:44:36 2004
++++ src/curve.gen_h	Sun Sep  5 05:51:36 2004
+@@ -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 --git a/x11-toolkits/gtk--/files/patch-src::gtk--::base.h b/x11-toolkits/gtk--/files/patch-src::gtk--::base.h
new file mode 100644
index 000000000000..287102e51103
--- /dev/null
+++ b/x11-toolkits/gtk--/files/patch-src::gtk--::base.h
@@ -0,0 +1,25 @@
+--- src/gtk--/base.h.orig	Tue Nov 14 21:23:11 2000
++++ src/gtk--/base.h	Sun Sep  5 06:11:48 2004
+@@ -454,6 +454,13 @@
+   pointer operator -> () const { return &operator*(); }
+ };
+ 
++namespace Gtk {
++
++template <class impl, class interf>
++interf* wrap(impl*);
++
++}
++
+ // this iterator variation returns interf (wrapped from impl)
+ //  Equivelency  G_List_Cpp_Iterator<GtkWidget,Gtk_Widget>
+ //     => list<Gtk_Widget*>::iterator
+@@ -482,7 +489,7 @@
+   value_type operator*() const
+   {
+     if (node && node->data)
+-      return Gtk::wrap(static_cast<impl*>((*node).data));
++      return Gtk::wrap<impl, interf>(static_cast<impl*>((*node).data));
+     return 0;
+   }
+ 
-- 
cgit v1.2.3