Package: guppi
Severity: normal
Tags: patch
When building 'guppi' with gcc-3.4 I get the following error:
gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I../.. -I/usr/include -I../..
-I../../src/libguppiuseful -I../../src/libguppidata -I../../src/libguppiuseful
-I../../src/libguppidata -I../../src/libguppiplot -I/usr/include/gtk-1.2
-I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/gnome-1.0
-DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2
-I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
-I/usr/include/gnome-xml -I/usr/include/libglade-1.0 -I/usr/include/gnome-1.0
-DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2
-I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
-I/usr/include/gnome-1.0 -I/usr/include/freetype2 -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gnome-xml
-I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/inc
lude -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0
-I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include
-I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/include/gdk-pixbuf-1.0 -I/usr/include/freetype2 -I/usr/include/gnome-xml
-I/usr/include -I/usr/include/orbit-1.0
-DGUPPI_PLUGIN_DIR=\"/usr/lib/guppi/plug-ins/0.40.3\"
-DG_LOG_DOMAIN=\"libguppiplot\" -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include -g -O2 -Wall -Wunused
-Wp,-MD,.deps/guppi-view-interval.pp -c guppi-view-interval.c -fPIC -DPIC -o
guppi-view-interval.o
guppi-view-interval.c: In function `guppi_view_interval_valid_fn':
guppi-view-interval.c:230: error: label at end of compound statement
make[4]: *** [guppi-view-interval.lo] Error 1
make[4]: Leaving directory `/guppi-0.40.3/src/libguppiplot'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/guppi-0.40.3/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/guppi-0.40.3'
make[1]: *** [all-recursive-am] Error 2
make[1]: Leaving directory `/guppi-0.40.3'
make: *** [build-stamp] Error 2
With the attached patch 'guppi' can be compiled using gcc-3.4.
Regards
Andreas Jochens
diff -urN ../tmp-orig/guppi-0.40.3/libguppitank/guppi-object-barchart.c
./libguppitank/guppi-object-barchart.c
--- ../tmp-orig/guppi-0.40.3/libguppitank/guppi-object-barchart.c
2002-01-08 07:28:53.000000000 +0100
+++ ./libguppitank/guppi-object-barchart.c 2004-07-18 23:26:34.288620561
+0200
@@ -700,7 +700,6 @@
obar->bar_callback3 (r, c, obar->bar_callback3_data);
break;
- default:
}
}
@@ -732,7 +731,6 @@
obar->legend_callback3_data);
break;
- default:
}
}
diff -urN ../tmp-orig/guppi-0.40.3/src/demo.c ./src/demo.c
--- ../tmp-orig/guppi-0.40.3/src/demo.c 2002-01-08 07:28:57.000000000 +0100
+++ ./src/demo.c 2004-07-18 23:22:03.279195869 +0200
@@ -450,7 +450,6 @@
case GUPPI_EAST:
compass_pos = GUPPI_NORTH;
break;
- default:
}
guppi_element_state_set (state,
diff -urN ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-layout-constraint.c
./src/libguppiplot/guppi-layout-constraint.c
--- ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-layout-constraint.c
2002-01-19 03:45:21.000000000 +0100
+++ ./src/libguppiplot/guppi-layout-constraint.c 2004-07-18
23:18:57.890164355 +0200
@@ -163,8 +163,6 @@
guppi_layout_constraint_add_term (glc, GLC_REGION_BOTTOM, -factor, geom);
return;
- default:
- /* Fall through, do nothing. */
}
ti = term_info_new (type, factor, geom);
diff -urN ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-root-group-item.c
./src/libguppiplot/guppi-root-group-item.c
--- ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-root-group-item.c
2002-01-08 07:31:08.000000000 +0100
+++ ./src/libguppiplot/guppi-root-group-item.c 2004-07-18 23:20:25.093245278
+0200
@@ -547,7 +547,6 @@
case GDK_MOTION_NOTIFY:
return motion_notify_event (root, &(ev->motion));
- default:
}
return FALSE;
@@ -776,7 +775,7 @@
case ROOT_GROUP_RESIZE_NONE:
default:
- /* insure we do nothing */
+ break; /* insure we do nothing */
}
if (please_resize_canvas)
diff -urN ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-text-block.c
./src/libguppiplot/guppi-text-block.c
--- ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-text-block.c
2001-11-26 21:00:17.000000000 +0100
+++ ./src/libguppiplot/guppi-text-block.c 2004-07-18 23:18:30.243528431
+0200
@@ -898,8 +898,6 @@
nothing. */
break;
- default:
- /* Do nothing. */
}
render_stack_evolve (stack, tt);
diff -urN ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-view-interval.c
./src/libguppiplot/guppi-view-interval.c
--- ../tmp-orig/guppi-0.40.3/src/libguppiplot/guppi-view-interval.c
2002-01-19 03:45:21.000000000 +0100
+++ ./src/libguppiplot/guppi-view-interval.c 2004-07-18 23:18:02.052998083
+0200
@@ -226,7 +226,6 @@
return x != 0;
#endif
- default:
}
return TRUE;
