Update to 2.6.7.

5 files changed, 4 insertions, 100 deletions

diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index ed24b722fb82..d95d85894557 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gtk-engines2
-PORTVERSION=	2.6.6
-PORTREVISION=	1
+PORTVERSION=	2.6.7
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index 6b4d636eca69..4d463eecae95 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk-engines-2.6.6.tar.bz2) = 218417d5eb6fd4cfda49d6a65041a8a0
-SHA256 (gnome2/gtk-engines-2.6.6.tar.bz2) = 7444c9709dd95ec054e7803f113ffa480a6fb84bd69e3e8457a6719c2524160f
-SIZE (gnome2/gtk-engines-2.6.6.tar.bz2) = 479351
+MD5 (gnome2/gtk-engines-2.6.7.tar.bz2) = 5ca8718d5ecacb9b7ab8ff9cfb244655
+SHA256 (gnome2/gtk-engines-2.6.7.tar.bz2) = f72a2b15588c36f4d01b48b54cedc6e171e17179dc0321e3aeada5d7f66b3c2d
+SIZE (gnome2/gtk-engines-2.6.7.tar.bz2) = 479242
diff --git a/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict b/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict
deleted file mode 100644
index 0d742c2ec86f..000000000000
--- a/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict
+++ /dev/null
@@ -1,54 +0,0 @@
---- engines/clearlooks/src/clearlooks_style.c.orig	Wed Sep  7 01:41:42 2005
-+++ engines/clearlooks/src/clearlooks_style.c	Wed Sep  7 01:41:49 2005
-@@ -178,7 +178,7 @@ clearlooks_draw_arrow (GtkStyle      *st
- 	
- 	sanitize_size (window, &width, &height);
- 	
--	if (is_combo_box (widget))
-+	if (is_combo_box_cl (widget))
- 	{
- 		width = 7;
- 		height = 5;
---- engines/clearlooks/src/support.c.orig	Wed Sep  7 01:40:25 2005
-+++ engines/clearlooks/src/support.c	Wed Sep  7 01:40:59 2005
-@@ -959,7 +959,7 @@ GdkColor *get_parent_bgcolor (GtkWidget 
- }
- 
- GtkWidget *
--find_combo_box_widget (GtkWidget * widget)
-+find_combo_box_widget_cl (GtkWidget * widget)
- {
- 	GtkWidget *result = NULL;
- 	
-@@ -968,14 +968,14 @@ find_combo_box_widget (GtkWidget * widge
- 		if (GTK_IS_COMBO_BOX (widget))
- 			result = widget;
- 		else
--			result = find_combo_box_widget(widget->parent);
-+			result = find_combo_box_widget_cl(widget->parent);
- 	}
- 	
- 	return result;
- }
- 
- gboolean
--is_combo_box (GtkWidget * widget)
-+is_combo_box_cl (GtkWidget * widget)
- {
--	return (find_combo_box_widget(widget) != NULL);
-+	return (find_combo_box_widget_cl(widget) != NULL);
- }
---- engines/clearlooks/src/support.h.orig	Wed Sep  7 01:41:03 2005
-+++ engines/clearlooks/src/support.h	Wed Sep  7 01:41:17 2005
-@@ -102,9 +102,9 @@ GtkWidget *get_parent_window (GtkWidget 
- 
- GdkColor *get_parent_bgcolor (GtkWidget *widget);
- 
--gboolean is_combo_box (GtkWidget * widget);
-+gboolean is_combo_box_cl (GtkWidget * widget);
- 
--GtkWidget *find_combo_box_widget (GtkWidget * widget);
-+GtkWidget *find_combo_box_widget_cl (GtkWidget * widget);
- 
- void gtk_clist_get_header_index (GtkCList *clist, GtkWidget *button,
-                                  gint *column_index, gint *columns);
diff --git a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c
deleted file mode 100644
index ec5a85340f62..000000000000
--- a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- engines/crux/src/crux-gradient.c.orig	Thu Oct 16 20:57:05 2003
-+++ engines/crux/src/crux-gradient.c	Thu Oct 16 21:01:18 2003
-@@ -207,7 +207,7 @@
- 			const eazel_engine_gradient *gradient)
- {
-     int rgb_size = clip_rect->height;
--    guchar *rgb = alloca (rgb_size * 3), *ptr;
-+    guchar *rgb = g_malloc (rgb_size * 3), *ptr;
- 
-     eazel_engine_fill_gradient_rgb_buffer (gradient, full_rect->height, rgb,
- 					   clip_rect->y - full_rect->y,
-@@ -239,7 +239,7 @@
-     }
-     else
-     {
--	guchar *xrgb = alloca (clip_rect->width * clip_rect->height * 3);
-+	guchar *xrgb = g_malloc (clip_rect->width * clip_rect->height * 3);
- 	int x, y;
- 	guchar *ptr_in = rgb, *ptr_out = xrgb;
- 	for (y = 0; y < clip_rect->height; y++)
-@@ -257,7 +257,10 @@
- 	gdk_draw_rgb_image (drawable, gc, clip_rect->x, clip_rect->y,
- 			    clip_rect->width, clip_rect->height,
- 			    dither_mode, xrgb, clip_rect->width * 3);
-+	g_free (xrgb);
-     }
-+
-+    g_free (rgb);
- }
- 
- static void
diff --git a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-main.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-main.c
deleted file mode 100644
index db57b1bbd4ae..000000000000
--- a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-main.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- engines/crux/src/crux-main.c.orig	Tue Dec 20 13:02:45 2005
-+++ engines/crux/src/crux-main.c	Tue Dec 20 13:02:49 2005
-@@ -23,7 +23,6 @@
- G_MODULE_EXPORT void
- theme_exit(void)
- {
--  uninstall_all_focus_hooks();
- }
-     
- G_MODULE_EXPORT GtkRcStyle *