diff options
author | rillig <rillig@pkgsrc.org> | 2008-01-15 10:54:25 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2008-01-15 10:54:25 +0000 |
commit | 77719fe5a79c16bad0f5a183ff08cdc17d5d571a (patch) | |
tree | f0a730c54e5f2af693b6bad40f6720ce7c3bdc98 | |
parent | ddfd4115444cbce992363c7319b9a912b80bf16d (diff) | |
download | pkgsrc-77719fe5a79c16bad0f5a183ff08cdc17d5d571a.tar.gz |
sunpro needs some patches.
-rw-r--r-- | misc/goffice0.2/distinfo | 7 | ||||
-rw-r--r-- | misc/goffice0.2/patches/patch-aa | 16 | ||||
-rw-r--r-- | misc/goffice0.2/patches/patch-ab | 27 | ||||
-rw-r--r-- | misc/goffice0.2/patches/patch-ac | 15 | ||||
-rw-r--r-- | misc/goffice0.2/patches/patch-ad | 15 | ||||
-rw-r--r-- | misc/goffice0.2/patches/patch-ae | 19 |
6 files changed, 98 insertions, 1 deletions
diff --git a/misc/goffice0.2/distinfo b/misc/goffice0.2/distinfo index 58368e68f40..cf51e3be35b 100644 --- a/misc/goffice0.2/distinfo +++ b/misc/goffice0.2/distinfo @@ -1,5 +1,10 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/05/05 00:17:44 wiz Exp $ +$NetBSD: distinfo,v 1.2 2008/01/15 10:54:25 rillig Exp $ SHA1 (goffice-0.2.2.tar.gz) = 1a037163bd5bb0cfb4f2510fed68b54aeeb845c2 RMD160 (goffice-0.2.2.tar.gz) = e176be07473395ff449e31e782cdf19a812f6518 Size (goffice-0.2.2.tar.gz) = 2359979 bytes +SHA1 (patch-aa) = 972702c46d059a4d95dc1bbd77a435ada84d3b96 +SHA1 (patch-ab) = 1bda7f31ebb85e5214692c4b1c291fb5303b4605 +SHA1 (patch-ac) = fe60dcf6994247b86404f3d33a6f062b262b69a3 +SHA1 (patch-ad) = b75928c7b3e0ce6a529d8856633770e3db42cf28 +SHA1 (patch-ae) = 7a3f2b6a91d09224fe4e1177576dfbee40f5f268 diff --git a/misc/goffice0.2/patches/patch-aa b/misc/goffice0.2/patches/patch-aa new file mode 100644 index 00000000000..b7fc6141596 --- /dev/null +++ b/misc/goffice0.2/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.1 2008/01/15 10:54:25 rillig Exp $ + +sunpro doesn't like empty structs, and the name doesn't seem to be used +by anyone. + +--- goffice/app/go-doc-control-impl.h.orig 2005-08-08 10:56:57.000000000 +0200 ++++ goffice/app/go-doc-control-impl.h 2007-11-20 15:20:26.330848000 +0100 +@@ -28,8 +28,6 @@ G_BEGIN_DECLS + struct _GODocControl { + GObject base; + +- struct { +- } state[GO_DOC_CONTROL_STATE_MAX]; + }; + + typedef struct { diff --git a/misc/goffice0.2/patches/patch-ab b/misc/goffice0.2/patches/patch-ab new file mode 100644 index 00000000000..7bf34562d9a --- /dev/null +++ b/misc/goffice0.2/patches/patch-ab @@ -0,0 +1,27 @@ +$NetBSD: patch-ab,v 1.1 2008/01/15 10:54:26 rillig Exp $ + +sunpro says: void functions cannot return a value. + +--- goffice/graph/gog-axis.c.orig 2005-10-05 12:00:23.000000000 +0200 ++++ goffice/graph/gog-axis.c 2007-11-20 15:24:51.231826000 +0100 +@@ -873,9 +873,9 @@ void + gog_axis_map_get_extents (GogAxisMap *map, double *start, double *stop) + { + if (map->axis->inverted) +- return map->desc->map_bounds (map, stop, start); ++ map->desc->map_bounds (map, stop, start); + else +- return map->desc->map_bounds (map, start, stop); ++ map->desc->map_bounds (map, start, stop); + } + + /** +@@ -894,7 +894,7 @@ gog_axis_map_get_extents (GogAxisMap *ma + void + gog_axis_map_get_bounds (GogAxisMap *map, double *minimum, double *maximum) + { +- return map->desc->map_bounds (map, minimum, maximum); ++ map->desc->map_bounds (map, minimum, maximum); + } + /** + * gog_axis_map_free : diff --git a/misc/goffice0.2/patches/patch-ac b/misc/goffice0.2/patches/patch-ac new file mode 100644 index 00000000000..9158ce71b42 --- /dev/null +++ b/misc/goffice0.2/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2008/01/15 10:54:26 rillig Exp $ + +sunpro says: void functions cannot return a value. + +--- goffice/graph/gog-chart.c.orig 2005-10-30 15:35:37.000000000 +0100 ++++ goffice/graph/gog-chart.c 2007-11-20 15:22:57.563151000 +0100 +@@ -295,7 +295,7 @@ gog_chart_map_new (GogChart *chart, GogV + void + gog_chart_map_2D_to_view (GogChartMap *map, double x, double y, double *u, double *v) + { +- return (map->map_2D_to_view) (map, x, y, u, v); ++ (map->map_2D_to_view) (map, x, y, u, v); + } + + GogAxisMap * diff --git a/misc/goffice0.2/patches/patch-ad b/misc/goffice0.2/patches/patch-ad new file mode 100644 index 00000000000..3935678deb3 --- /dev/null +++ b/misc/goffice0.2/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2008/01/15 10:54:26 rillig Exp $ + +sunpro says: void functions cannot return a value. + +--- goffice/graph/gog-data-set.c.orig 2006-03-23 05:28:41.000000000 +0100 ++++ goffice/graph/gog-data-set.c 2007-11-20 15:26:28.173752000 +0100 +@@ -61,7 +61,7 @@ gog_dataset_dims (GogDataset const *set, + g_return_if_fail (klass != NULL); + g_return_if_fail (first != NULL); + g_return_if_fail (last != NULL); +- return (klass->dims) (set, first, last); ++ (klass->dims) (set, first, last); + } + + /** diff --git a/misc/goffice0.2/patches/patch-ae b/misc/goffice0.2/patches/patch-ae new file mode 100644 index 00000000000..216eb64a8d6 --- /dev/null +++ b/misc/goffice0.2/patches/patch-ae @@ -0,0 +1,19 @@ +$NetBSD: patch-ae,v 1.1 2008/01/15 10:54:26 rillig Exp $ + +sunpro says: void functions cannot return a value. + +--- goffice/graph/gog-object.c.orig 2005-10-17 14:59:21.000000000 +0200 ++++ goffice/graph/gog-object.c 2007-11-20 15:21:10.637817000 +0100 +@@ -787,8 +787,10 @@ gog_object_set_id (GogObject *obj, unsig + + g_return_if_fail (GOG_OBJECT (obj) != NULL); + +- if (id == 0) +- return gog_object_generate_id (obj); ++ if (id == 0) { ++ gog_object_generate_id (obj); ++ return; ++ } + + g_return_if_fail (GOG_OBJECT (obj)->parent != NULL); + |