diff options
author | joerg <joerg> | 2005-12-06 16:12:43 +0000 |
---|---|---|
committer | joerg <joerg> | 2005-12-06 16:12:43 +0000 |
commit | 93a1793524371bdaaf446261fdefbb1654f55e5a (patch) | |
tree | 4e81b126c4e15679d73e3df1bbe3c9231f68ea0a | |
parent | d20145dae667e16cf6cd4807789b4c97105a8cc0 (diff) | |
download | pkgsrc-93a1793524371bdaaf446261fdefbb1654f55e5a.tar.gz |
Fix GCC 3.4+: Label at end of compound statement.
-rw-r--r-- | math/guppi/distinfo | 9 | ||||
-rw-r--r-- | math/guppi/patches/patch-ac | 36 | ||||
-rw-r--r-- | math/guppi/patches/patch-ad | 12 | ||||
-rw-r--r-- | math/guppi/patches/patch-ae | 12 | ||||
-rw-r--r-- | math/guppi/patches/patch-af | 12 | ||||
-rw-r--r-- | math/guppi/patches/patch-ag | 20 | ||||
-rw-r--r-- | math/guppi/patches/patch-ah | 12 |
7 files changed, 101 insertions, 12 deletions
diff --git a/math/guppi/distinfo b/math/guppi/distinfo index 32eeba523ff..0f48f553942 100644 --- a/math/guppi/distinfo +++ b/math/guppi/distinfo @@ -1,8 +1,13 @@ -$NetBSD: distinfo,v 1.10 2005/10/22 13:25:18 wiz Exp $ +$NetBSD: distinfo,v 1.11 2005/12/06 16:12:43 joerg Exp $ SHA1 (Guppi-0.40.3.tar.bz2) = 7435bddddca9e3347efb006ad33198fbbe593ea7 RMD160 (Guppi-0.40.3.tar.bz2) = c1e5575a992e40966749a8a18b2143ed69329495 Size (Guppi-0.40.3.tar.bz2) = 1016831 bytes SHA1 (patch-aa) = 74b82a9fbf545d1c606f9b91c54259229f718c7d SHA1 (patch-ab) = 2ff86d16e39c9c3f842dbdcd2d85134f123511c4 -SHA1 (patch-ac) = 08b2c492981e25fa074280a41b0758a572b313b7 +SHA1 (patch-ac) = a27baf7234758c39cea310dc89d95a5eb6f60955 +SHA1 (patch-ad) = 9898eea095e2e33d1505905ea7404c2c811b870f +SHA1 (patch-ae) = 48edb2dbd2f511a4b78498e7dbde57bbd6b3efa2 +SHA1 (patch-af) = 3554dd0cfa4966f858ccb24b4c641583e0384e1e +SHA1 (patch-ag) = 5dbe0826e4a6219f80578e7f7128efe3f1214b41 +SHA1 (patch-ah) = 32c6d45db774aad296765397be919dae4e5fc645 diff --git a/math/guppi/patches/patch-ac b/math/guppi/patches/patch-ac index b16cff7f47e..31c8cbed3b1 100644 --- a/math/guppi/patches/patch-ac +++ b/math/guppi/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $ +$NetBSD: patch-ac,v 1.4 2005/12/06 16:12:43 joerg Exp $ --- libguppitank/guppi-object-barchart.c 2003-05-30 21:21:16.000000000 +0200 +++ libguppitank/guppi-object-barchart.c 2003-05-30 21:21:26.000000000 +0200 -@@ -410,6 +410,7 @@ +@@ -410,6 +410,7 @@ update (GuppiObject *obj) GuppiElementState *left_axis_state = NULL; GuppiElementState *frame_state = NULL; GuppiColorPalette *color_palette = NULL; @@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $ GuppiDataTable *data_table; GnomeFont *font; -@@ -446,11 +447,13 @@ +@@ -446,11 +447,13 @@ update (GuppiObject *obj) /* FIXME: check for construction of legends. */ if (obar->legend_view && obar->col_labels) { @@ -25,7 +25,7 @@ $NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $ } guppi_element_state_set (barchart_state, -@@ -497,7 +500,7 @@ +@@ -497,7 +500,7 @@ update (GuppiObject *obj) guppi_element_state_set (legend_state, "labels", data_table, @@ -34,7 +34,7 @@ $NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $ "label_font", font, NULL); } -@@ -505,6 +508,8 @@ +@@ -505,6 +508,8 @@ update (GuppiObject *obj) /* clean up */ @@ -43,7 +43,7 @@ $NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $ guppi_unref (barchart_state); guppi_unref (legend_state); guppi_unref (bottom_axis_state); -@@ -525,6 +530,7 @@ +@@ -525,6 +530,7 @@ build (GuppiObject *obj, double hsize, d GuppiDataTable *data_table; GuppiColorPalette *color_palette = NULL; @@ -51,7 +51,7 @@ $NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $ GuppiElementState *barchart_state; GuppiElementState *legend_state = NULL; -@@ -560,7 +566,8 @@ +@@ -560,7 +566,8 @@ build (GuppiObject *obj, double hsize, d } if (obar->col_labels) { @@ -61,7 +61,7 @@ $NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $ } -@@ -568,6 +575,7 @@ +@@ -568,6 +575,7 @@ build (GuppiObject *obj, double hsize, d if (obar->col_colors) { color_palette = build_bar_colors (obar, FALSE); @@ -69,7 +69,7 @@ $NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $ } barchart_state = guppi_element_state_new ("barchart", -@@ -620,7 +628,8 @@ +@@ -620,7 +628,8 @@ build (GuppiObject *obj, double hsize, d legend_state = guppi_element_state_new ("legend", "labels", data_table, @@ -79,7 +79,7 @@ $NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $ "label_font", font, NULL); -@@ -669,6 +678,8 @@ +@@ -669,6 +678,8 @@ build (GuppiObject *obj, double hsize, d /* Clean up after ourselves... */ guppi_unref (data_table); @@ -88,3 +88,19 @@ $NetBSD: patch-ac,v 1.3 2005/10/22 13:25:18 wiz Exp $ guppi_unref (barchart_state); guppi_unref (bottom_axis_state); +@@ -701,6 +712,7 @@ clicked_bar_cb (GuppiCanvasItem *item, + break; + + default: ++ break; + } + } + +@@ -733,6 +745,7 @@ clicked_box_cb (GuppiCanvasItem *item, + break; + + default: ++ break; + } + } + diff --git a/math/guppi/patches/patch-ad b/math/guppi/patches/patch-ad new file mode 100644 index 00000000000..7beb6184d4c --- /dev/null +++ b/math/guppi/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.3 2005/12/06 16:12:43 joerg Exp $ + +--- src/libguppiplot/guppi-view-interval.c.orig 2005-12-06 14:49:37.000000000 +0000 ++++ src/libguppiplot/guppi-view-interval.c +@@ -227,6 +227,7 @@ gboolean guppi_view_interval_valid_fn (G + #endif + + default: ++ break; + } + + return TRUE; diff --git a/math/guppi/patches/patch-ae b/math/guppi/patches/patch-ae new file mode 100644 index 00000000000..0cef176380c --- /dev/null +++ b/math/guppi/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.1 2005/12/06 16:12:43 joerg Exp $ + +--- src/libguppiplot/guppi-text-block.c.orig 2005-12-06 15:05:54.000000000 +0000 ++++ src/libguppiplot/guppi-text-block.c +@@ -900,6 +900,7 @@ guppi_text_block_foreach_word (GuppiText + + default: + /* Do nothing. */ ++ break; + } + + render_stack_evolve (stack, tt); diff --git a/math/guppi/patches/patch-af b/math/guppi/patches/patch-af new file mode 100644 index 00000000000..155c5bbfbe4 --- /dev/null +++ b/math/guppi/patches/patch-af @@ -0,0 +1,12 @@ +$NetBSD: patch-af,v 1.1 2005/12/06 16:12:43 joerg Exp $ + +--- src/libguppiplot/guppi-layout-constraint.c.orig 2005-12-06 15:10:05.000000000 +0000 ++++ src/libguppiplot/guppi-layout-constraint.c +@@ -165,6 +165,7 @@ guppi_layout_constraint_add_term (GuppiL + + default: + /* Fall through, do nothing. */ ++ break; + } + + ti = term_info_new (type, factor, geom); diff --git a/math/guppi/patches/patch-ag b/math/guppi/patches/patch-ag new file mode 100644 index 00000000000..a6948202937 --- /dev/null +++ b/math/guppi/patches/patch-ag @@ -0,0 +1,20 @@ +$NetBSD: patch-ag,v 1.1 2005/12/06 16:12:43 joerg Exp $ + +--- src/libguppiplot/guppi-root-group-item.c.orig 2005-12-06 15:12:26.000000000 +0000 ++++ src/libguppiplot/guppi-root-group-item.c +@@ -548,6 +548,7 @@ event (GnomeCanvasItem *gnoitem, GdkEven + return motion_notify_event (root, &(ev->motion)); + + default: ++ break; + } + + return FALSE; +@@ -777,6 +778,7 @@ canv_size_allocate (GtkWidget *widget, + case ROOT_GROUP_RESIZE_NONE: + default: + /* insure we do nothing */ ++ break; + } + + if (please_resize_canvas) diff --git a/math/guppi/patches/patch-ah b/math/guppi/patches/patch-ah new file mode 100644 index 00000000000..1a9a45ca3e9 --- /dev/null +++ b/math/guppi/patches/patch-ah @@ -0,0 +1,12 @@ +$NetBSD: patch-ah,v 1.1 2005/12/06 16:12:43 joerg Exp $ + +--- src/demo.c.orig 2005-12-06 15:16:28.000000000 +0000 ++++ src/demo.c +@@ -451,6 +451,7 @@ compass_cb (gpointer closure) + compass_pos = GUPPI_NORTH; + break; + default: ++ break; + } + + guppi_element_state_set (state, |