Bug#258786: gnome-terminal: FTBFS with gcc-3.4: conflicting types
for 'egg_cell_renderer_keys_set_accelerator'
Andreas Jochens
Andreas Jochens <aj@andaco.de>, 258786@bugs.debian.org
Sun, 11 Jul 2004 14:47:05 +0200
Package: gnome-terminal
Severity: normal
Tags: patch
When building 'gnome-terminal' with gcc-3.4 I get the following error:
cc -DHAVE_CONFIG_H -I. -I. -I.. -DXTHREADS -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/startup-notification-1.0 -DTERM_LOCALEDIR=\"/usr/share/locale\" -DEXECUTABLE_NAME=\"gnome-terminal\" -DTERM_GLADE_DIR=\"/usr/share/gnome-terminal/glade\" -DTERM_GLADE_FILE=\"gnome-terminal.glade2\" -DTERM_DATADIR=\"/usr/share\" -DTERM_LIBDIR=\"/usr/lib\" -DTERM_PREFIX=\"/usr\" -DTERM_SYSCONFDIR=\"/etc\" -DTERM_PKGDATADIR=\"/usr/share/gnome-terminal\" -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DSN_API_NOT_YET_FROZEN -DXTHREADS -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/startup-notification-1.0 -g -Wall -O2 -c simple-x-font-selector.c
cc -DHAVE_CONFIG_H -I. -I. -I.. -DXTHREADS -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/startup-notification-1.0 -DTERM_LOCALEDIR=\"/usr/share/locale\" -DEXECUTABLE_NAME=\"gnome-terminal\" -DTERM_GLADE_DIR=\"/usr/share/gnome-terminal/glade\" -DTERM_GLADE_FILE=\"gnome-terminal.glade2\" -DTERM_DATADIR=\"/usr/share\" -DTERM_LIBDIR=\"/usr/lib\" -DTERM_PREFIX=\"/usr\" -DTERM_SYSCONFDIR=\"/etc\" -DTERM_PKGDATADIR=\"/usr/share/gnome-terminal\" -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DSN_API_NOT_YET_FROZEN -DXTHREADS -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/startup-notification-1.0 -g -Wall -O2 -c eggaccelerators.c
cc -DHAVE_CONFIG_H -I. -I. -I.. -DXTHREADS -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/startup-notification-1.0 -DTERM_LOCALEDIR=\"/usr/share/locale\" -DEXECUTABLE_NAME=\"gnome-terminal\" -DTERM_GLADE_DIR=\"/usr/share/gnome-terminal/glade\" -DTERM_GLADE_FILE=\"gnome-terminal.glade2\" -DTERM_DATADIR=\"/usr/share\" -DTERM_LIBDIR=\"/usr/lib\" -DTERM_PREFIX=\"/usr\" -DTERM_SYSCONFDIR=\"/etc\" -DTERM_PKGDATADIR=\"/usr/share/gnome-terminal\" -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DSN_API_NOT_YET_FROZEN -DXTHREADS -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/startup-notification-1.0 -g -Wall -O2 -c eggcellrendererkeys.c
eggcellrendererkeys.c:588: error: conflicting types for 'egg_cell_renderer_keys_set_accelerator'
eggcellrendererkeys.h:73: error: previous declaration of 'egg_cell_renderer_keys_set_accelerator' was here
eggcellrendererkeys.c:588: error: conflicting types for 'egg_cell_renderer_keys_set_accelerator'
eggcellrendererkeys.h:73: error: previous declaration of 'egg_cell_renderer_keys_set_accelerator' was here
eggcellrendererkeys.c:630: error: conflicting types for 'egg_cell_renderer_keys_get_accelerator'
eggcellrendererkeys.h:76: error: previous declaration of 'egg_cell_renderer_keys_get_accelerator' was here
eggcellrendererkeys.c:630: error: conflicting types for 'egg_cell_renderer_keys_get_accelerator'
eggcellrendererkeys.h:76: error: previous declaration of 'egg_cell_renderer_keys_get_accelerator' was here
make[4]: *** [eggcellrendererkeys.o] Error 1
make[4]: Leaving directory `/gnome-terminal-2.6.1/src'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/gnome-terminal-2.6.1/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/gnome-terminal-2.6.1'
make[1]: *** [all-recursive-am] Error 2
make[1]: Leaving directory `/gnome-terminal-2.6.1'
make: *** [debian/stamp-makefile-build] Error 2
With the attached patch 'gnome-terminal' can be compiled using gcc-3.4.
Regards
Andreas Jochens
diff -urN ../tmp-orig/gnome-terminal-2.6.1/src/eggcellrendererkeys.c ./src/eggcellrendererkeys.c
--- ../tmp-orig/gnome-terminal-2.6.1/src/eggcellrendererkeys.c 2003-07-03 15:31:10.000000000 +0200
+++ ./src/eggcellrendererkeys.c 2004-07-11 14:26:25.451535129 +0200
@@ -584,7 +584,7 @@
void
egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
guint keyval,
- GdkModifierType mask)
+ EggVirtualModifierType mask)
{
char *text;
gboolean changed;
@@ -626,7 +626,7 @@
void
egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
guint *keyval,
- GdkModifierType *mask)
+ EggVirtualModifierType *mask)
{
g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));