Package: guikachu
Severity: normal
Tags: patch
guikachu_1.4.0-2.1 fails to build from source using gcc-3.4/gcc-4.0.
The following patch allows guikachu to compile under gcc-3.4.
--- src/property.h.orig 2005-07-21 14:43:34.821714251 -0700
+++ src/property.h 2005-07-21 14:44:26.586957825 -0700
@@ -26,6 +26,9 @@
namespace Guikachu
{
+ template <class T> class Property;
+ template <class T> std::ostream & operator<< (std::ostream &ostr, const
Property<T> &prop);
+
template <class T>
class Property
{
@@ -78,7 +81,7 @@
inline value_t operator-= (const value_t &other) { set_val (value -
other); return value; };
inline value_t operator-= (const self_t &other) { set_val (value -
other.value); return value; };
- friend std::ostream & operator<<<value_t> (std::ostream &ostr, const
Property<value_t> &prop);
+ friend std::ostream & operator<< <> (std::ostream &ostr, const
Property<value_t> & prop);
};
template<class T>
--- src/property-ops-widget.h.orig 2005-07-21 16:48:01.000000000 -0700
+++ src/property-ops-widget.h 2005-07-21 16:48:11.000000000 -0700
@@ -80,8 +80,8 @@
property_t &prop = prop_holder.get_member (*widget);
PropChangeOp<value_t> *new_op = new PropChangeOp<value_t> (
- label, widget, prop, op->new_val, true);
- new_op->old_val = old_val;
+ this->label, widget, prop, op->new_val, true);
+ new_op->old_val = this->old_val;
return new_op;
}
--- src/property-ops-resource.h.orig 2005-07-21 16:49:43.000000000 -0700
+++ src/property-ops-resource.h 2005-07-21 16:50:07.000000000 -0700
@@ -80,8 +80,8 @@
property_t &prop = prop_holder.get_member (*resource);
PropChangeOp<value_t> *new_op = new PropChangeOp<value_t> (
- label, resource, prop, op->new_val, true);
- new_op->old_val = old_val;
+ this->label, resource, prop, op->new_val, true);
+ new_op->old_val = this->old_val;
return new_op;
}
--- src/top-treeitem.cc.orig 2005-07-21 17:04:00.000000000 -0700
+++ src/top-treeitem.cc 2005-07-21 17:05:19.000000000 -0700
@@ -38,13 +38,11 @@
res->changed.connect (slot (this,
&GUI::TopTreeItem::application_changed_cb));
- using Gnome::UI;
-
- std::list <UI::Info> popup_menu_list;
+ std::list <Gnome::UI::Info> popup_menu_list;
popup_menu_list.push_back (
- UI::Item (UI::Icon (GNOME_STOCK_MENU_PROP),
+ Gnome::UI::Item (Gnome::UI::Icon (GNOME_STOCK_MENU_PROP),
_("_Edit"), SigC::slot (this,
&GUI::TopTreeItem::menu_edit_cb)));
- UI::fill (popup_menu, popup_menu_list, *(popup_menu.get_accel_group ()));
+ Gnome::UI::fill (popup_menu, popup_menu_list, *(popup_menu.get_accel_group
()));
application_changed_cb ();
}
--- src/app-win.cc.orig 2005-07-21 17:06:12.000000000 -0700
+++ src/app-win.cc 2005-07-21 17:06:15.000000000 -0700
@@ -75,8 +75,8 @@
return 0;
AppPropChangeOp<value_t> *new_op =
- new AppPropChangeOp<value_t> (label, prop, op->new_val, true);
- new_op->old_val = old_val;
+ new AppPropChangeOp<value_t> (this->label, prop, op->new_val,
true);
+ new_op->old_val = this->old_val;
return new_op;
}
--- src/Makefile.in.orig 2005-07-21 20:14:41.000000000 -0700
+++ src/Makefile.in 2005-07-21 20:14:51.000000000 -0700
@@ -228,8 +228,8 @@
GUI_DEPLIBS = $(GTKMM_LIBS) $(GCONF_LIBS) $(GNOMEMM_LIBS) $(GLADE_LIBS)
$(PIXBUF_LIBS)
SUBLIBS = libguikachu.a \
- form-editor/libformeditor.a
\
io/libio.a io/xml/libio-xml.a io/libio.a io/rcp/libio-rcp.a
\
+ form-editor/libformeditor.a
\
libguikachu.a
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.11-perfctr-2.6.13-bmc
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
