[arch-commits] CVS update of extra/lib/gtkmm1 (2 files)
Eric Belanger
eric at archlinux.org
Mon Nov 26 07:28:21 UTC 2007
Date: Monday, November 26, 2007 @ 02:28:21
Author: eric
Path: /home/cvs-extra/extra/lib/gtkmm1
Removed: gtkmm-1.2.10-c++fixes.patch (1.1) gtkmm-1.2.9-gcc3.4.patch (1.1)
removed old patches
-----------------------------+
gtkmm-1.2.10-c++fixes.patch | 33 ----------------------
gtkmm-1.2.9-gcc3.4.patch | 62 ------------------------------------------
2 files changed, 95 deletions(-)
Index: extra/lib/gtkmm1/gtkmm-1.2.10-c++fixes.patch
diff -u extra/lib/gtkmm1/gtkmm-1.2.10-c++fixes.patch:1.1 extra/lib/gtkmm1/gtkmm-1.2.10-c++fixes.patch:removed
--- extra/lib/gtkmm1/gtkmm-1.2.10-c++fixes.patch:1.1 Thu Mar 22 17:07:08 2007
+++ extra/lib/gtkmm1/gtkmm-1.2.10-c++fixes.patch Mon Nov 26 02:28:21 2007
@@ -1,33 +0,0 @@
---- gtkmm-1.2.10/src/radiobutton.gen_h.c++fixes 2001-08-04 13:36:51.000000000 -0400
-+++ gtkmm-1.2.10/src/radiobutton.gen_h 2005-08-22 19:06:05.000000000 -0400
-@@ -36,7 +36,7 @@ namespace RadioButton_Helpers {
- //- It should not be called with new.
- class Group
- {
-- friend class RadioButton;
-+ friend class Gtk::RadioButton;
- GSList *group_;
- void* operator new(size_t);
- void add(RadioButton& item);
---- gtkmm-1.2.10/src/clist.gen_h.c++fixes 2001-08-16 13:56:49.000000000 -0400
-+++ gtkmm-1.2.10/src/clist.gen_h 2005-08-22 19:04:06.000000000 -0400
-@@ -60,7 +60,7 @@ class CellIterator;
- class Cell
- {
- protected:
-- friend class CList;
-+ friend class Gtk::CList;
- friend class Row;
-
- GtkCList *parent_;
---- gtkmm-1.2.10/src/radiomenuitem.gen_h.c++fixes 2001-08-04 13:36:51.000000000 -0400
-+++ gtkmm-1.2.10/src/radiomenuitem.gen_h 2005-08-22 19:06:34.000000000 -0400
-@@ -34,7 +34,7 @@ namespace RadioMenuItem_Helpers {
- //- It should not be called with new.
- class Group
- {
-- friend class RadioMenuItem;
-+ friend class Gtk::RadioMenuItem;
- GSList *group_;
- void* operator new(size_t);
- void add(RadioMenuItem& item);
Index: extra/lib/gtkmm1/gtkmm-1.2.9-gcc3.4.patch
diff -u extra/lib/gtkmm1/gtkmm-1.2.9-gcc3.4.patch:1.1 extra/lib/gtkmm1/gtkmm-1.2.9-gcc3.4.patch:removed
--- extra/lib/gtkmm1/gtkmm-1.2.9-gcc3.4.patch:1.1 Thu Mar 22 17:07:08 2007
+++ extra/lib/gtkmm1/gtkmm-1.2.9-gcc3.4.patch Mon Nov 26 02:28:21 2007
@@ -1,62 +0,0 @@
-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;
- }
-
More information about the arch-commits
mailing list