# ChangeLog for gnome-extra/guppi
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/ChangeLog,v 1.19 2005/10/17 12:59:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/ChangeLog,v 1.20 2005/11/20 01:22:33 allanonjl Exp $
+
+*guppi-0.40.3-r3 (20 Nov 2005)
+
+ 20 Nov 2005; John N. Laliberte <allanonjl@gentoo.org>
+ +files/guppi-0.40.3-gcc4.patch, -guppi-0.40.3-r1.ebuild,
+ +guppi-0.40.3-r3.ebuild:
+ remove -r1 (old version). add gcc4 patch (Thanks to Halcy0n)
17 Oct 2005; Aron Griffis <agriffis@gentoo.org> guppi-0.40.3-r2.ebuild:
Mark 0.40.3-r2 stable on ia64
-MD5 2b62b31120f51df0a6d8fbe73b0e6874 guppi-0.40.3-r1.ebuild 2025
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 05b2b1bf114daf205787b5c77f394d0a ChangeLog 2270
+MD5 34d287312b264dbaa89ccca92bcccb62 guppi-0.40.3-r3.ebuild 2427
MD5 44d3175f76c41f2fde6e1dea1d046cb1 guppi-0.40.3-r2.ebuild 2376
-MD5 e2925d484e8a148a091ba2e4103e9d73 files/digest-guppi-0.40.3-r1 66
-MD5 e2925d484e8a148a091ba2e4103e9d73 files/digest-guppi-0.40.3-r2 66
+MD5 cd1b1b48f2723543f41de16aabc36f84 ChangeLog 2509
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 f8a4dee52fe87e0ce5c0694741074cbb files/guppi-0.40.3-gcc4.patch 2794
MD5 2ae6cfb52cae2b086dd468f05c207dc1 files/guppi-0.40.3-gcc34.patch 3044
+MD5 e2925d484e8a148a091ba2e4103e9d73 files/digest-guppi-0.40.3-r2 66
+MD5 e2925d484e8a148a091ba2e4103e9d73 files/digest-guppi-0.40.3-r3 66
--- /dev/null
+--- 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);
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/guppi-0.40.3-r1.ebuild,v 1.16 2004/06/24 22:07:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/guppi-0.40.3-r3.ebuild,v 1.1 2005/11/20 01:22:33 allanonjl Exp $
+
+inherit toolchain-funcs eutils
IUSE="python nls readline"
HOMEPAGE="http://www.gnome.org/guppi/"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
RDEPEND="=x11-libs/gtk+-1.2*
>=dev-util/intltool-0.11 )
python? ( >=dev-lang/python-2.0 )"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ #remove default: since we have none for gcc3.4, gcc3.3 safe closing bug #55228
+ epatch ${FILESDIR}/${P}-gcc34.patch
+
+ # gcc-4
+ epatch ${FILESDIR}/${P}-gcc4.patch
+}
src_compile() {
local myconf
myconf="${myconf} --disable-guile-readline"
fi
+ # We need this for gnumeric support. Note that you do
+ # not need gnumeric installed for this to work.
+ myconf="${myconf} --enable-gnumeric"
+
# to compile with guile-1.5
# CFLAGS="${CFLAGS} -DGUPPI_USING_NEWER_GUILE `gnome-config --cflags libglade`"