pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/math/guppi Fix GCC 3.4+: Label at end of compound stat...
details: https://anonhg.NetBSD.org/pkgsrc/rev/08d30616f558
branches: trunk
changeset: 504181:08d30616f558
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Dec 06 16:12:43 2005 +0000
description:
Fix GCC 3.4+: Label at end of compound statement.
diffstat:
math/guppi/distinfo | 9 +++++++--
math/guppi/patches/patch-ac | 36 ++++++++++++++++++++++++++----------
math/guppi/patches/patch-ad | 12 ++++++++++++
math/guppi/patches/patch-ae | 12 ++++++++++++
math/guppi/patches/patch-af | 12 ++++++++++++
math/guppi/patches/patch-ag | 20 ++++++++++++++++++++
math/guppi/patches/patch-ah | 12 ++++++++++++
7 files changed, 101 insertions(+), 12 deletions(-)
diffs (213 lines):
diff -r 5ca7e028b7fa -r 08d30616f558 math/guppi/distinfo
--- a/math/guppi/distinfo Tue Dec 06 15:57:22 2005 +0000
+++ b/math/guppi/distinfo Tue Dec 06 16:12:43 2005 +0000
@@ -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 -r 5ca7e028b7fa -r 08d30616f558 math/guppi/patches/patch-ac
--- a/math/guppi/patches/patch-ac Tue Dec 06 15:57:22 2005 +0000
+++ b/math/guppi/patches/patch-ac Tue Dec 06 16:12:43 2005 +0000
@@ -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 @@
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 @@
}
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 @@
"label_font", font,
NULL);
}
-@@ -505,6 +508,8 @@
+@@ -505,6 +508,8 @@ update (GuppiObject *obj)
/* clean up */
@@ -43,7 +43,7 @@
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 @@
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 @@
}
-@@ -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 @@
}
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 @@
"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 @@
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 -r 5ca7e028b7fa -r 08d30616f558 math/guppi/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/math/guppi/patches/patch-ad Tue Dec 06 16:12:43 2005 +0000
@@ -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 -r 5ca7e028b7fa -r 08d30616f558 math/guppi/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/math/guppi/patches/patch-ae Tue Dec 06 16:12:43 2005 +0000
@@ -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 -r 5ca7e028b7fa -r 08d30616f558 math/guppi/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/math/guppi/patches/patch-af Tue Dec 06 16:12:43 2005 +0000
@@ -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 -r 5ca7e028b7fa -r 08d30616f558 math/guppi/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/math/guppi/patches/patch-ag Tue Dec 06 16:12:43 2005 +0000
@@ -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 -r 5ca7e028b7fa -r 08d30616f558 math/guppi/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/math/guppi/patches/patch-ah Tue Dec 06 16:12:43 2005 +0000
@@ -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,
Home |
Main Index |
Thread Index |
Old Index