Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7077
Modified Files:
guppi16.info guppi16.patch
Log Message:
now works with gcc4
Index: guppi16.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/guppi16.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- guppi16.info 15 Feb 2006 00:17:17 -0000 1.2
+++ guppi16.info 20 Mar 2006 06:03:50 -0000 1.3
@@ -1,19 +1,16 @@
Package: guppi16
Version: 0.40.3
-Revision: 1014
-Architecture: powerpc
+Revision: 1015
Source: mirror:gnome:sources/Guppi/0.40/Guppi-%v.tar.gz
Patch: %n.patch
Depends: %N-shlibs (= %v-%r)
-BuildDepends: libglade, gal21 (>= 0.22-1014), gdk-pixbuf, libjpeg, libtiff,
netpbm, audiofile, glib, gtk+, orbit-dev, giflib, imlib, bonobo-dev,
control-center-dev (>= 1.4.0.5-6), gconf-dev, glibwww, gnome-core-dev (>=
1.4.1-4), gnome-libs-dev, gnome-print-dev, gtkhtml1.1-dev, oaf-dev, expat,
libole2, libwww, libxml, gettext-dev, gettext-bin, gettext-tools, libiconv-dev,
esound, gcc3.3
+BuildDepends: libglade, gal21 (>= 0.22-1014), gdk-pixbuf, libjpeg, libtiff,
netpbm, audiofile, glib, gtk+, orbit-dev, giflib, imlib, bonobo-dev,
control-center-dev (>= 1.4.0.5-6), gconf-dev, glibwww, gnome-core-dev (>=
1.4.1-4), gnome-libs-dev, gnome-print-dev, gtkhtml1.1-dev, oaf-dev, expat,
libole2, libwww, libxml, gettext-dev, gettext-bin, gettext-tools, libiconv-dev,
esound
Conflicts: guppi
Replaces: guppi
SetCPPFLAGS: -no-cpp-precomp
NoSetLDFlags: true
NoSetCXXFLAGS: true
ConfigureParams: --mandir='${prefix}/share/man'
--infodir='${prefix}/share/info' --disable-gnumeric
-SetCC: gcc-3.3
-SetCXX: g++-3.3
SplitOff: <<
Package: %N-shlibs
Depends: audiofile-shlibs, bonobo-shlibs, esound-shlibs, gdk-pixbuf-shlibs,
glib-shlibs, gnome-libs-shlibs, gnome-print-shlibs, gtk+-shlibs, imlib-shlibs,
libglade-shlibs, libxml-shlibs, oaf-shlibs, orbit-shlibs
@@ -41,6 +38,11 @@
<<
Docfiles: README TODO INSTALL NEWS COPYING
License: GPL
+DescPackaging: <<
+ Patches for gcc4 issues from
+
http://www.linuxfromscratch.org/patches/downloads/Guppi/Guppi-0.40.3-gcc4-1.patch
+ http://lists.debian.org/debian-qa-packages/2004/07/msg00134.html
+<<
DescPort: <<
-flat_namespace LDFLAG needed to link indirectly referenced symbols.
Patch to configure to get flags right for dynamic linking.
Index: guppi16.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/guppi16.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- guppi16.patch 20 Jan 2006 20:25:02 -0000 1.1
+++ guppi16.patch 20 Mar 2006 06:03:50 -0000 1.2
@@ -48,3 +48,165 @@
#ifdef UNK
#if 1
double MACHEP = 1.11022302462515654042E-16; /* 2**-53 */
+--- 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);
+
+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;
+
+
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
