Package: gnubiff
Version: 2.2.6-1
Usertags: ftbfs-gcc-4.3
Tags: patch
Your package fails to build with GCC 4.3. Version 4.3 has not been
released yet but I'm building with a snapshot in order to find errors
and give people an advance warning.
You can reproduce this problem with gcc-snapshot (20070326-1 or higher)
from unstable. (Currently not available for i386, but for amd64, powerpc
and ia64. I hope to have i386 binaries in the archive in the near
future.)
> Automatic build of gnubiff_2.2.6-1 on coconut0 by sbuild/ia64 0.49
...
> Compiling gnubiff.cc... if ia64-linux-gnu-g++ -DHAVE_CONFIG_H
> -I. -I. -I../config -pthread -I/usr/include/gtk-2.0
> -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo
> -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
> -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libglade-2.0
> -I/usr/include/libxml2 -DORBIT2=1 -pthread -I/usr/include/panel-2.0
> -I/usr/include/gtk-2.0 -I/usr/include/libgnomeui-2.0
> -I/usr/include/libbonoboui-2.0 -I/usr/lib/gtk-2.0/include
> -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0
> -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2
> -I/usr/include/libpng12 -I/usr/include/libgnome-2.0
> -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0
> -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0
> -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gnome-keyring-1
> -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0
> -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2
> -DGNUBIFF_LOCALEDIR=\""/usr/share/locale"\"
> -DGNUBIFF_DATADIR=\""/usr/share/gnubiff"\"
> -DGNUBIFF_ICONDIR=\""/usr/share/pixmaps"\"
> -DGNUBIFF_UIDIR=\""/usr/share/gnome-2.0/ui"\" -DREAL_DATADIR=\""/usr/share"\"
> -D_GNU_SOURCE -Wall -ansi -pedantic -g -O2 -MT gnubiff.o -MD -MP -MF
> ".deps/gnubiff.Tpo" -c -o gnubiff.o gnubiff.cc; \
> then mv -f ".deps/gnubiff.Tpo" ".deps/gnubiff.Po"; else rm -f
> ".deps/gnubiff.Tpo"; exit 1; fi
> In file included from ui-applet-gui.h:35,
> from ui-applet-gnome.h:38,
> from gnubiff.cc:40:
> gui.h:75: error: extra ';'
> gui.h:76: error: extra ';'
> gui.h:77: error: extra ';'
> gui.h:78: error: extra ';'
> In file included from ui-applet-gui.h:36,
> from ui-applet-gnome.h:38,
> from gnubiff.cc:40:
> ui-applet.h:67: error: extra ';'
> ui-applet.h:69: error: extra ';'
> In file included from gnubiff.cc:40:
> ui-applet-gnome.h:57: error: extra ';'
> In file included from options.h:44,
> from gnubiff_options.h:39,
> from biff.h:45,
> from gnubiff.cc:43:
> option.h:95: error: extra ';'
> option.h:97: error: extra ';'
> option.h:98: error: extra ';'
> option.h:99: error: extra ';'
> option.h:100: error: extra ';'
> option.h:101: error: extra ';'
> option.h:108: error: extra ';'
> option.h:109: error: extra ';'
> option.h:110: error: extra ';'
> option.h:111: error: extra ';'
> option.h:158: error: extra ';'
> option.h:166: error: extra ';'
> option.h:167: error: extra ';'
> option.h:170: error: extra ';'
> option.h:172: error: extra ';'
> option.h:195: error: extra ';'
> option.h:196: error: extra ';'
> option.h:199: error: extra ';'
> option.h:201: error: extra ';'
> option.h:203: error: extra ';'
> option.h:205: error: extra ';'
> option.h:226: error: extra ';'
> option.h:233: error: extra ';'
> option.h:234: error: extra ';'
> option.h:243: error: extra ';'
> option.h:245: error: extra ';'
> In file included from gnubiff_options.h:39,
> from biff.h:45,
> from gnubiff.cc:43:
> options.h:133: error: extra ';'
> options.h:141: error: extra ';'
> make[2]: *** [gnubiff.o] Error 1
--- src/option.h~ 2007-04-25 14:52:30.000000000 +0000
+++ src/option.h 2007-04-25 14:56:31.000000000 +0000
@@ -92,23 +92,23 @@
guint flags = OPTFLG_NONE, OptionGUI gui = OPTGUI_NONE,
std::string gui_name = std::string(""));
/// Destructor.
- virtual ~Option () {};
+ virtual ~Option () {}
- virtual std::string type_string (void) {return "none";};
- virtual std::string to_string (void) {return std::string("");};
- virtual gboolean from_string (const std::string &value) {return false;};
- virtual void set_gui (std::vector<GtkWidget *> &widgets) {};
- virtual void get_gui (std::vector<GtkWidget *> &widgets) {};
+ virtual std::string type_string (void) {return "none";}
+ virtual std::string to_string (void) {return std::string("");}
+ virtual gboolean from_string (const std::string &value) {return false;}
+ virtual void set_gui (std::vector<GtkWidget *> &widgets) {}
+ virtual void get_gui (std::vector<GtkWidget *> &widgets) {}
/**
* Reset the option to the default value.
*
* Remark: Instead of calling this function directly better call
* Options::reset(). This function handles flags like OPTFLG_CHANGE!
*/
- virtual void reset (void) {};
- virtual gboolean is_default (void) {return false;};
- virtual std::string default_string (void) {return std::string("");};
- virtual Option *copy (void) {return new Option(*this);};
+ virtual void reset (void) {}
+ virtual gboolean is_default (void) {return false;}
+ virtual std::string default_string (void) {return std::string("");}
+ virtual Option *copy (void) {return new Option(*this);}
std::string flags_string (std::string sep = std::string("; "));
/// Access function to Option::flags_
@@ -155,7 +155,7 @@
OptionGUI gui = OPTGUI_NONE,
std::string gui_name = std::string(""));
- std::string type_string (void) {return ((flags_ & OPTFLG_ID_INT_STRICT)
? "enum" : "unsigned int");};
+ std::string type_string (void) {return ((flags_ & OPTFLG_ID_INT_STRICT)
? "enum" : "unsigned int");}
std::string to_string (void);
std::string default_string (void);
gboolean from_string (const std::string &value);
@@ -163,13 +163,13 @@
void set_gui (std::vector<GtkWidget *> &widgets);
void reset (void);
std::string allowed_ids (std::string sep = std::string(" "));
- gboolean is_default (void) {return value_ == default_;};
- Option *copy (void) {return new Option_UInt(*this);};
+ gboolean is_default (void) {return value_ == default_;}
+ Option *copy (void) {return new Option_UInt(*this);}
/// Access function to Option_UInt::value_
- guint value (void) {return value_;};
+ guint value (void) {return value_;}
/// Access function to Option_UInt::value_
- void value (guint val) {value_ = val;};
+ void value (guint val) {value_ = val;}
const std::string value_to_string (guint val);
guint string_to_value (const std::string &str);
@@ -192,17 +192,17 @@
const gchar *gui_sensitive[] = NULL,
const gchar *gui_show[] = NULL);
- Option *copy (void) {return new Option_Bool(*this);};
- std::string type_string (void) {return "bool";};
+ Option *copy (void) {return new Option_Bool(*this);}
+ std::string type_string (void) {return "bool";}
/// Access function to Option_UInt::value_
- gboolean value (void) {return (gboolean)value_;};
+ gboolean value (void) {return (gboolean)value_;}
/// Access function to Option_UInt::value_
- void value (gboolean val) {value_ = (guint)val;};
+ void value (gboolean val) {value_ = (guint)val;}
/// Access function to Option_UInt::gui_sensitive_
- void gui_sensitive (std::set<std::string> &gs) {gs = gui_sensitive_;};
+ void gui_sensitive (std::set<std::string> &gs) {gs = gui_sensitive_;}
/// Access function to Option_UInt::gui_sensitive_neg_
- void gui_show (std::set<std::string> &gs) {gs = gui_show_;};
+ void gui_show (std::set<std::string> &gs) {gs = gui_show_;}
private:
static const gchar *ids_[3];
static const guint ints_[3];
@@ -223,15 +223,15 @@
OptionGUI gui = OPTGUI_NONE,
std::string gui_name = std::string(""));
- std::string type_string (void) {return ((flags_ & OPTFLG_STRINGLIST) ?
"list (strings)" : "string");};
+ std::string type_string (void) {return ((flags_ & OPTFLG_STRINGLIST) ?
"list (strings)" : "string");}
std::string to_string (void);
std::string default_string (void);
gboolean from_string (const std::string &value);
void get_gui (std::vector<GtkWidget *> &widgets);
void set_gui (std::vector<GtkWidget *> &widgets);
void reset (void);
- gboolean is_default (void) {return value_ == default_;};
- Option *copy (void) {return new Option_String(*this);};
+ gboolean is_default (void) {return value_ == default_;}
+ Option *copy (void) {return new Option_String(*this);}
void set_values (const std::set<std::string> &values, gboolean
empty=true);
void get_values (std::set<std::string> &values, gboolean empty = true);
@@ -240,9 +240,9 @@
gboolean empty = true);
/// Access function to Option_UInt::value_
- std::string value (void) {return value_;};
+ std::string value (void) {return value_;}
/// Access function to Option_UInt::value_
- void value (const std::string val) {from_string (val);};
+ void value (const std::string val) {from_string (val);}
protected:
/// Value of the option
std::string value_;
--- src/gui.h~ 2007-04-25 14:54:02.000000000 +0000
+++ src/gui.h 2007-04-25 14:54:11.000000000 +0000
@@ -72,10 +72,10 @@
/* frequent callbacks */
virtual gboolean on_delete (GtkWidget *widget, GdkEvent *event);
virtual gboolean on_destroy (GtkWidget *widget, GdkEvent *event);
- virtual void on_ok (GtkWidget *widget) {};
- virtual void on_apply (GtkWidget *widget) {};
- virtual void on_close (GtkWidget *widget) {};
- virtual void on_cancel (GtkWidget *widget) {};
+ virtual void on_ok (GtkWidget *widget) {}
+ virtual void on_apply (GtkWidget *widget) {}
+ virtual void on_close (GtkWidget *widget) {}
+ virtual void on_cancel (GtkWidget *widget) {}
};
/* "C" bindings */
--- src/ui-applet.h~ 2007-04-25 14:54:15.000000000 +0000
+++ src/ui-applet.h 2007-04-25 14:54:26.000000000 +0000
@@ -64,9 +64,9 @@
/// @see AppletGUI::mailbox_to_be_replaced ()
virtual void mailbox_to_be_replaced (class Mailbox *from,
-
class Mailbox *to) {};
+
class Mailbox *to) {}
/// @see AppletGUI::get_password_for_mailbox ()
- virtual void get_password_for_mailbox (class Mailbox *mb) {};
+ virtual void get_password_for_mailbox (class Mailbox *mb) {}
virtual gboolean can_monitor_mailboxes (void);
virtual void enable_popup (gboolean enable);
};
--- src/ui-applet-gnome.h~ 2007-04-25 14:54:39.000000000 +0000
+++ src/ui-applet-gnome.h 2007-04-25 14:54:44.000000000 +0000
@@ -54,7 +54,7 @@
//
========================================================================
// main
//
========================================================================
- PanelApplet *panelapplet() {return (PANEL_APPLET (applet_));};
+ PanelApplet *panelapplet() {return (PANEL_APPLET (applet_));}
void dock (GtkWidget *applet);
gboolean update (gboolean init = false);
void show (std::string name = "dialog");
--- src/options.h~ 2007-04-25 14:56:53.000000000 +0000
+++ src/options.h 2007-04-25 14:56:55.000000000 +0000
@@ -130,7 +130,7 @@
*
* @param option Pointer to the option that is changed.
*/
- virtual void option_changed (Option *option) {};
+ virtual void option_changed (Option *option) {}
/**
* This function is called when an option is to be read that needs
* updating before. These options have to be marked by the
OPTFLG_UPDATE
@@ -138,7 +138,7 @@
*
* @param option Pointer to the option that is to be updated.
*/
- virtual void option_update (Option *option) {};
+ virtual void option_update (Option *option) {}
private:
/**
* Map of widgets and a set of boolean options. If all boolean
--- src/gtk_image_animation.h~ 2007-04-25 15:07:46.000000000 +0000
+++ src/gtk_image_animation.h 2007-04-25 15:07:57.000000000 +0000
@@ -77,12 +77,12 @@
/**
* Access
**/
- void attach (GtkImage *image) {_image = image;};
- std::string filename (void) {return _filename;};
- guint original_width (void) {return
_original_width;};
- guint original_height (void) {return _original_height;};
- guint scaled_width (void) {return _scaled_width;};
- guint scaled_height (void) {return
_scaled_height;};
+ void attach (GtkImage *image) {_image = image;}
+ std::string filename (void) {return _filename;}
+ guint original_width (void) {return
_original_width;}
+ guint original_height (void) {return _original_height;}
+ guint scaled_width (void) {return _scaled_width;}
+ guint scaled_height (void) {return _scaled_height;}
/**
--
Martin Michlmayr
http://www.cyrius.com/
