summaryrefslogtreecommitdiff
path: root/math/guppi
diff options
context:
space:
mode:
authordbj <dbj@pkgsrc.org>2006-06-13 07:23:58 +0000
committerdbj <dbj@pkgsrc.org>2006-06-13 07:23:58 +0000
commit0733d92a3854412595c910c6b2f0132a4e4c9ae7 (patch)
tree9cce6eaaa01e7ba9bf946a0438ccc72e138d3992 /math/guppi
parent2ec9928f029bf868751d2895cd023e6e797766b0 (diff)
downloadpkgsrc-0733d92a3854412595c910c6b2f0132a4e4c9ae7.tar.gz
move static function declarations from inside functions to toplevel
remove static from merror definition to match header declartion bump PKGREVISION for merror change this fixes compile problems on darwin
Diffstat (limited to 'math/guppi')
-rw-r--r--math/guppi/Makefile4
-rw-r--r--math/guppi/distinfo8
-rw-r--r--math/guppi/patches/patch-ag25
-rw-r--r--math/guppi/patches/patch-ai13
-rw-r--r--math/guppi/patches/patch-aj20
-rw-r--r--math/guppi/patches/patch-ak21
-rw-r--r--math/guppi/patches/patch-al17
7 files changed, 100 insertions, 8 deletions
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 3c45c382373..23b208edc24 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2006/04/17 13:46:02 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2006/06/13 07:23:58 dbj Exp $
DISTNAME= Guppi-0.40.3
PKGNAME= ${DISTNAME:S/G/g/}
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= math graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/Guppi/0.40/}
EXTRACT_SUFX= .tar.bz2
diff --git a/math/guppi/distinfo b/math/guppi/distinfo
index 0f48f553942..400a2951a9f 100644
--- a/math/guppi/distinfo
+++ b/math/guppi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2005/12/06 16:12:43 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/06/13 07:23:58 dbj Exp $
SHA1 (Guppi-0.40.3.tar.bz2) = 7435bddddca9e3347efb006ad33198fbbe593ea7
RMD160 (Guppi-0.40.3.tar.bz2) = c1e5575a992e40966749a8a18b2143ed69329495
@@ -9,5 +9,9 @@ SHA1 (patch-ac) = a27baf7234758c39cea310dc89d95a5eb6f60955
SHA1 (patch-ad) = 9898eea095e2e33d1505905ea7404c2c811b870f
SHA1 (patch-ae) = 48edb2dbd2f511a4b78498e7dbde57bbd6b3efa2
SHA1 (patch-af) = 3554dd0cfa4966f858ccb24b4c641583e0384e1e
-SHA1 (patch-ag) = 5dbe0826e4a6219f80578e7f7128efe3f1214b41
+SHA1 (patch-ag) = 21fee7379cb354f4ff82c7eafd916552b75c5460
SHA1 (patch-ah) = 32c6d45db774aad296765397be919dae4e5fc645
+SHA1 (patch-ai) = 922c6a651662743e4ae4e4f2e3fe78a6ab86a296
+SHA1 (patch-aj) = 867143c21e4aede1ca50d7ec5afa783c77bad391
+SHA1 (patch-ak) = 5a45f1f3091eaa01c37b9b26fa7805939885be09
+SHA1 (patch-al) = 39dbd475986807e93e1b2116e8d68265371f5e1a
diff --git a/math/guppi/patches/patch-ag b/math/guppi/patches/patch-ag
index a6948202937..a21efd83080 100644
--- a/math/guppi/patches/patch-ag
+++ b/math/guppi/patches/patch-ag
@@ -1,8 +1,25 @@
-$NetBSD: patch-ag,v 1.1 2005/12/06 16:12:43 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2006/06/13 07:23:58 dbj Exp $
---- src/libguppiplot/guppi-root-group-item.c.orig 2005-12-06 15:12:26.000000000 +0000
+--- src/libguppiplot/guppi-root-group-item.c.orig 2002-01-08 01:31:08.000000000 -0500
+++ src/libguppiplot/guppi-root-group-item.c
-@@ -548,6 +548,7 @@ event (GnomeCanvasItem *gnoitem, GdkEven
+@@ -41,6 +41,8 @@
+
+ #include "guppi-root-group-tools.h"
+
++static void canv_size_allocate (GtkWidget *, GtkAllocation *, gpointer);
++
+ static GtkObjectClass *parent_class = NULL;
+
+ static void
+@@ -156,7 +158,6 @@ set_canvas_size (GuppiRootGroupItem *rg)
+ 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)
+@@ -548,6 +549,7 @@ event (GnomeCanvasItem *gnoitem, GdkEven
return motion_notify_event (root, &(ev->motion));
default:
@@ -10,7 +27,7 @@ $NetBSD: patch-ag,v 1.1 2005/12/06 16:12:43 joerg Exp $
}
return FALSE;
-@@ -777,6 +778,7 @@ canv_size_allocate (GtkWidget *widget,
+@@ -777,6 +779,7 @@ canv_size_allocate (GtkWidget *widget,
case ROOT_GROUP_RESIZE_NONE:
default:
/* insure we do nothing */
diff --git a/math/guppi/patches/patch-ai b/math/guppi/patches/patch-ai
new file mode 100644
index 00000000000..80d1ae49c76
--- /dev/null
+++ b/math/guppi/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/06/13 07:23:58 dbj Exp $
+
+--- src/libguppispecfns/mtherr.c.orig 2000-10-19 21:21:48.000000000 -0400
++++ src/libguppispecfns/mtherr.c
+@@ -58,7 +58,7 @@ Direct inquiries to 30 Frost Street, Cam
+ #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
diff --git a/math/guppi/patches/patch-aj b/math/guppi/patches/patch-aj
new file mode 100644
index 00000000000..c4235ff899a
--- /dev/null
+++ b/math/guppi/patches/patch-aj
@@ -0,0 +1,20 @@
+$NetBSD: patch-aj,v 1.1 2006/06/13 07:23:58 dbj Exp $
+
+--- src/libguppidata/guppi-data.c.orig 2001-11-19 00:40:40.000000000 -0500
++++ src/libguppidata/guppi-data.c
+@@ -58,6 +58,7 @@
+ #include "guppi-data-transform.h"
+ #endif
+
++static void build_menu (GuppiData *, GtkMenu *, gpointer);
+
+ static GtkObjectClass *parent_class = NULL;
+
+@@ -1079,7 +1080,6 @@ validate_class (GuppiDataClass *klass)
+ static void
+ guppi_data_class_init (GuppiDataClass *klass)
+ {
+- static void build_menu (GuppiData *, GtkMenu *, gpointer);
+
+ GtkObjectClass *object_class = (GtkObjectClass *) klass;
+
diff --git a/math/guppi/patches/patch-ak b/math/guppi/patches/patch-ak
new file mode 100644
index 00000000000..3de410529ff
--- /dev/null
+++ b/math/guppi/patches/patch-ak
@@ -0,0 +1,21 @@
+$NetBSD: patch-ak,v 1.1 2006/06/13 07:23:58 dbj Exp $
+
+--- src/libguppidata/guppi-seq-scalar.c.orig 2002-01-14 00:01:17.000000000 -0500
++++ src/libguppidata/guppi-seq-scalar.c
+@@ -65,6 +65,8 @@ struct _GuppiSeqScalarPrivate {
+ guint save_sum_abs : 1;
+ };
+
++static GtkWidget *info_display (GuppiData *);
++
+ static GtkObjectClass *parent_class = NULL;
+
+ static void
+@@ -1775,7 +1777,6 @@ import_xml_element (GuppiSeq *seq, Guppi
+ 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);
diff --git a/math/guppi/patches/patch-al b/math/guppi/patches/patch-al
new file mode 100644
index 00000000000..af7ece52d62
--- /dev/null
+++ b/math/guppi/patches/patch-al
@@ -0,0 +1,17 @@
+$NetBSD: patch-al,v 1.1 2006/06/13 07:23:58 dbj Exp $
+
+--- src/libguppiplot/guppi-axis-markers.c.orig 2002-01-20 22:19:05.000000000 -0500
++++ src/libguppiplot/guppi-axis-markers.c
+@@ -47,10 +47,11 @@ enum {
+
+ 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);