From 0cef6c1b8787413e481c27e6e5eacc1b69ecc605 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Sun, 4 Nov 2007 22:59:36 +0000
Subject: Added two patches to make the package build with sunpro.

---
 x11/gtk2+extra/distinfo         |  4 +++-
 x11/gtk2+extra/patches/patch-ae | 22 ++++++++++++++++++++++
 x11/gtk2+extra/patches/patch-af | 15 +++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 x11/gtk2+extra/patches/patch-ae
 create mode 100644 x11/gtk2+extra/patches/patch-af

(limited to 'x11/gtk2+extra')

diff --git a/x11/gtk2+extra/distinfo b/x11/gtk2+extra/distinfo
index c1377c51916..b24a81c7cb9 100644
--- a/x11/gtk2+extra/distinfo
+++ b/x11/gtk2+extra/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/09/08 10:21:20 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2007/11/04 22:59:36 rillig Exp $
 
 SHA1 (gtk+extra-2.1.1.tar.gz) = 94d7ae9cb3aef05159cfff148265fc9ce0973980
 RMD160 (gtk+extra-2.1.1.tar.gz) = 7134fe4c5aaaa45ee3a7e651f3c477ba7c477214
 Size (gtk+extra-2.1.1.tar.gz) = 893481 bytes
 SHA1 (patch-ad) = e2c45a044ef08c4e01df8f24ef174dc7d62a95f6
+SHA1 (patch-ae) = a27172a43e2796dff796916773e3f57ed6be30ed
+SHA1 (patch-af) = 4d83e4859aa4377cae55cdccc4b3a2c774d32a9a
diff --git a/x11/gtk2+extra/patches/patch-ae b/x11/gtk2+extra/patches/patch-ae
new file mode 100644
index 00000000000..5c4bd99969e
--- /dev/null
+++ b/x11/gtk2+extra/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2007/11/04 22:59:36 rillig Exp $
+
+--- gtkextra/gtkplot.c.orig	2005-02-25 02:18:46.000000000 +0100
++++ gtkextra/gtkplot.c	2007-11-04 23:53:15.922868000 +0100
+@@ -218,7 +218,7 @@ static void gtk_plot_real_get_point		(Gt
+ 					 	 gdouble *px, gdouble *py);
+ void   gtk_plot_remove_dimension		(GtkPlot *plot, 
+ 						 const gchar *dimension);
+-inline gint roundint				(gdouble x);
++gint roundint					(gdouble x);
+ static void update_datasets			(GtkPlot *plot, gboolean new_range);
+ 
+ static GtkWidgetClass *parent_class = NULL;
+@@ -2934,7 +2934,7 @@ gtk_plot_ticks_inverse(GtkPlotAxis *axis
+     return point;
+ }
+ 
+-inline gint
++gint
+ roundint (gdouble x)
+ {
+  return (x+.50999999471);
diff --git a/x11/gtk2+extra/patches/patch-af b/x11/gtk2+extra/patches/patch-af
new file mode 100644
index 00000000000..173e3d36a7a
--- /dev/null
+++ b/x11/gtk2+extra/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2007/11/04 22:59:36 rillig Exp $
+
+enum and guint are different types.
+
+--- gtkextra/gtkplotsegment.c.orig	2004-12-17 03:05:03.000000000 +0100
++++ gtkextra/gtkplotsegment.c	2007-11-04 23:49:50.438613000 +0100
+@@ -592,7 +592,7 @@ gtk_plot_segment_is_centered (GtkPlotSeg
+ }
+ 
+ void
+-gtk_plot_segment_set_arrow_mask(GtkPlotSegment *segment, guint mask)
++gtk_plot_segment_set_arrow_mask(GtkPlotSegment *segment, GtkPlotArrow mask)
+ {
+   segment->arrow_mask = mask;
+ }
-- 
cgit v1.2.3