Fix multiple useless C99isms. Should fix the build with GCC 2.95.

Spotted by latest NetBSD 1.6.2/i386 kristerw@'s bulk build.

While here, commit an update that has been laying here for a while.
This should depend on the latest gtk2 to avoid a deadlock when using
SVG themes.  So bump PKGREVISION to 1.

5 files changed, 54 insertions, 3 deletions

diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 41744047771..58cdb86957c 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2004/12/28 22:41:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2005/01/13 19:51:19 jmmv Exp $
 
 DISTNAME=		gtk-engines-2.6.0
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.6/}
 EXTRACT_SUFX=		.tar.bz2
@@ -14,7 +15,7 @@ CONFLICTS+=		gtk-engines-*
 CONFLICTS+=		gtk2-engines-industrial-*
 CONFLICTS+=		gnome-themes-extras<0.8
 
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.0
+BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.0nb2
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/x11/gtk2-engines/distinfo b/x11/gtk2-engines/distinfo
index 05f57319b6c..c8cb50bd1f3 100644
--- a/x11/gtk2-engines/distinfo
+++ b/x11/gtk2-engines/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.5 2004/12/24 10:07:23 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2005/01/13 19:51:19 jmmv Exp $
 
 SHA1 (gtk-engines-2.6.0.tar.bz2) = afcfa78e32cbd0801dd04abf1c88524d825521da
 Size (gtk-engines-2.6.0.tar.bz2) = 453089 bytes
+SHA1 (patch-aa) = 5a87077d7311ad78626213f3947cdef43789bcbf
+SHA1 (patch-ab) = 8e401adfd63fffa9eca84b10128319989526eb2b
+SHA1 (patch-ac) = 2266402328c8bc86987d8786845f3375ed75ee14
diff --git a/x11/gtk2-engines/patches/patch-aa b/x11/gtk2-engines/patches/patch-aa
new file mode 100644
index 00000000000..de45d9e312c
--- /dev/null
+++ b/x11/gtk2-engines/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.3 2005/01/13 19:51:19 jmmv Exp $
+
+--- engines/crux/src/crux-pixmaps.c.orig	2004-12-01 13:55:55.000000000 +0100
++++ engines/crux/src/crux-pixmaps.c
+@@ -329,8 +329,8 @@ recolor_pixbuf (GdkPixbuf *pixbuf, eazel
+ static GdkPixbuf *
+ load_image (const char *file)
+ {
+-	printf("%s\n", file);	
+     GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
++	printf("%s\n", file);	
+     if (pixbuf != 0)
+       return pixbuf;
+       
diff --git a/x11/gtk2-engines/patches/patch-ab b/x11/gtk2-engines/patches/patch-ab
new file mode 100644
index 00000000000..4e09da77372
--- /dev/null
+++ b/x11/gtk2-engines/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2005/01/13 19:51:19 jmmv Exp $
+
+--- engines/crux/src/crux-rc-style.c.orig	2004-12-01 13:55:55.000000000 +0100
++++ engines/crux/src/crux-rc-style.c
+@@ -20,9 +20,10 @@ GtkRcStyleClass *rc_parent_class;
+ static void
+ crux_rc_style_init (CruxRcStyle *style)
+ {
++  gchar *path;
+   style->theme_data = NULL;
+   
+-  gchar *path = g_malloc (strlen (DATADIR) + 15);
++  path = g_malloc (strlen (DATADIR) + 15);
+   sprintf (path, "pixmap_path \"%s\"", DATADIR);
+ 
+   gtk_rc_parse_string (path);
diff --git a/x11/gtk2-engines/patches/patch-ac b/x11/gtk2-engines/patches/patch-ac
new file mode 100644
index 00000000000..56bc1c29a99
--- /dev/null
+++ b/x11/gtk2-engines/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2005/01/13 19:51:19 jmmv Exp $
+
+--- engines/redmond/src/redmond_gtk2_drawing.c.orig	2004-12-15 17:52:56.000000000 +0100
++++ engines/redmond/src/redmond_gtk2_drawing.c
+@@ -1581,10 +1581,10 @@ redmond_draw_handle (GtkStyle * style,
+              gint height, 
+              GtkOrientation orientation)
+ {
+-  g_return_if_fail(sanitize_parameters(style, window, &width, &height));
+-  
+   gboolean left_cutoff = FALSE, right_cutoff = FALSE, top_cutoff = FALSE, bottom_cutoff = FALSE;
+   
++  g_return_if_fail(sanitize_parameters(style, window, &width, &height));
++  
+   if (IS_BONOBO_DOCK_ITEM_GRIP(widget) && 
+      (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) && 
+       orientation == (GTK_ORIENTATION_HORIZONTAL))