Author: randy Date: 2005-10-03 23:44:55 -0600 (Mon, 03 Oct 2005) New Revision: 1166
Added: trunk/Guppi/Guppi-0.40.3-gcc4-1.patch Log: Added Guppi GCC-4 patch Added: trunk/Guppi/Guppi-0.40.3-gcc4-1.patch =================================================================== --- trunk/Guppi/Guppi-0.40.3-gcc4-1.patch 2005-10-04 04:22:10 UTC (rev 1165) +++ trunk/Guppi/Guppi-0.40.3-gcc4-1.patch 2005-10-04 05:44:55 UTC (rev 1166) @@ -0,0 +1,84 @@ +Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> +Date: 2005-10-04 +Initial Package Version: 0.40.3 +Upstream Status: N/A (package is no longer maintained) +Origin: Fedora Development CVS + http://cvs.fedora.redhat.com/viewcvs/devel/Guppi/Guppi-0.40.3-gcc4.patch?rev=1.1&view=markup +Description: Fixes GCC-4.0.x build problems + + +--- Guppi-0.40.3/src/libguppiuseful/guppi-plug-in.c.foo 2005-03-07 16:46:56.000000000 -0500 ++++ Guppi-0.40.3/src/libguppiuseful/guppi-plug-in.c 2005-03-07 16:52:32.000000000 -0500 +@@ -47,7 +47,7 @@ + + guppi_finalized (obj); + +- guppi_free0 ((gpointer)pi->load_path); ++ guppi_free0 (pi->load_path); + + if (parent_class->finalize) + parent_class->finalize (obj); +--- Guppi-0.40.3/src/libguppispecfns/mtherr.c.foo 2005-03-07 17:05:14.000000000 -0500 ++++ Guppi-0.40.3/src/libguppispecfns/mtherr.c 2005-03-07 17:05:22.000000000 -0500 +@@ -58,7 +58,7 @@ + #include <glib.h> + #include "mconf.h" + +-static int merror = 0; ++int merror = 0; + + /* Notice: the order of appearance of the following + * messages is bound to the error codes defined +--- Guppi-0.40.3/src/libguppidata/guppi-data.c.foo 2005-03-07 17:08:27.000000000 -0500 ++++ Guppi-0.40.3/src/libguppidata/guppi-data.c 2005-03-07 17:19:11.000000000 -0500 +@@ -1079,8 +1079,6 @@ + static void + guppi_data_class_init (GuppiDataClass *klass) + { +- static void build_menu (GuppiData *, GtkMenu *, gpointer); +- + GtkObjectClass *object_class = (GtkObjectClass *) klass; + + parent_class = gtk_type_class (GTK_TYPE_OBJECT); +--- Guppi-0.40.3/src/libguppidata/guppi-seq-scalar.c.foo 2005-03-07 17:08:49.000000000 -0500 ++++ Guppi-0.40.3/src/libguppidata/guppi-seq-scalar.c 2005-03-07 17:19:35.000000000 -0500 +@@ -1775,8 +1775,6 @@ + static void + guppi_seq_scalar_class_init (GuppiSeqScalarClass *klass) + { +- static GtkWidget *info_display (GuppiData *); +- + GtkObjectClass *object_class = (GtkObjectClass *) klass; + GuppiDataClass *data_class = GUPPI_DATA_CLASS (klass); + GuppiSeqClass *seq_class = GUPPI_SEQ_CLASS (klass); +--- Guppi-0.40.3/src/libguppiplot/guppi-root-group-item.c.foo 2005-03-07 17:15:25.000000000 -0500 ++++ Guppi-0.40.3/src/libguppiplot/guppi-root-group-item.c 2005-03-07 17:16:21.000000000 -0500 +@@ -153,10 +153,11 @@ + guppi_canvas_item_set_bbox_c (item, 0, 0, xsize, ysize); + } + ++static void canv_size_allocate (GtkWidget *, GtkAllocation *, gpointer); ++ + static void + changed_scale (GuppiCanvasItem *item, double scale) + { +- static void canv_size_allocate (GtkWidget *, GtkAllocation *, gpointer); + GuppiRootGroupItem *root_item = GUPPI_ROOT_GROUP_ITEM (item); + + if (GUPPI_CANVAS_ITEM_CLASS (parent_class)->changed_scale) +--- Guppi-0.40.3/src/libguppiplot/guppi-axis-markers.c.foo 2005-03-07 17:16:35.000000000 -0500 ++++ Guppi-0.40.3/src/libguppiplot/guppi-axis-markers.c 2005-03-07 17:17:12.000000000 -0500 +@@ -47,10 +47,11 @@ + + static guint gam_signals[LAST_SIGNAL] = { 0 }; + ++static void clear (GuppiAxisMarkers *); ++ + static void + guppi_axis_markers_finalize (GtkObject * obj) + { +- static void clear (GuppiAxisMarkers *); + GuppiAxisMarkers *gal = GUPPI_AXIS_MARKERS (obj); + + guppi_finalized (obj); + -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
