Update to 2.24.6.

5 files changed, 7 insertions, 58 deletions

diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index bb5c8e41c1cb..13d1d965de7d 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gtk-update-icon-cache
-PORTVERSION=	2.24.5
+PORTVERSION=	2.24.6
 PORTREVISION?=	0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
diff --git a/graphics/gtk-update-icon-cache/distinfo b/graphics/gtk-update-icon-cache/distinfo
index 53e9d1c878f5..164f01198946 100644
--- a/graphics/gtk-update-icon-cache/distinfo
+++ b/graphics/gtk-update-icon-cache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtk+-2.24.5.tar.xz) = d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3
-SIZE (gnome2/gtk+-2.24.5.tar.xz) = 13252580
+SHA256 (gnome2/gtk+-2.24.6.tar.xz) = 8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca
+SIZE (gnome2/gtk+-2.24.6.tar.xz) = 13173032
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 46dfef30af99..a78a7746c30c 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,8 +8,8 @@
 # Remember to update graphics/gtk-update-icon-cache too.
 
 PORTNAME=	gtk
-PORTVERSION=	2.24.5
-PORTREVISION?=	1
+PORTVERSION=	2.24.6
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 53e9d1c878f5..164f01198946 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtk+-2.24.5.tar.xz) = d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3
-SIZE (gnome2/gtk+-2.24.5.tar.xz) = 13252580
+SHA256 (gnome2/gtk+-2.24.6.tar.xz) = 8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca
+SIZE (gnome2/gtk+-2.24.6.tar.xz) = 13173032
diff --git a/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c b/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c
deleted file mode 100644
index 5e5ac7cc35f2..000000000000
--- a/x11-toolkits/gtk20/files/patch-gdk_gdkwindow.c
+++ /dev/null
@@ -1,51 +0,0 @@
-From d7ac9cd71c43689672a9796e518ef3b970197bf2 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 20 Jun 2011 12:10:36 +0000
-Subject: Revert "gdk: Make background changes queue a repaint"
-
-This reverts commit 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973.
----
-diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index 10d83ab..f058570 100644
---- gdk/gdkwindow.c
-+++ gdk/gdkwindow.c
-@@ -8004,15 +8004,11 @@ gdk_window_set_background (GdkWindow      *window,
-     }
- 
-   if (!GDK_WINDOW_DESTROYED (window) &&
-+      gdk_window_has_impl (private) &&
-       !private->input_only)
-     {
--      if (gdk_window_has_impl (private))
--        {
--          impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
--          impl_iface->set_background (window, &private->bg_color);
--        }
--      else
--        gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
-+      impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-+      impl_iface->set_background (window, &private->bg_color);
-     }
- }
- 
-@@ -8081,15 +8077,11 @@ gdk_window_set_back_pixmap (GdkWindow *window,
-     private->bg_pixmap = GDK_NO_BG;
- 
-   if (!GDK_WINDOW_DESTROYED (window) &&
-+      gdk_window_has_impl (private) &&
-       !private->input_only)
-     {
--      if (gdk_window_has_impl (private))
--        {
--          impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
--          impl_iface->set_back_pixmap (window, private->bg_pixmap);
--        }
--      else
--        gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
-+      impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-+      impl_iface->set_back_pixmap (window, private->bg_pixmap);
-     }
- }
- 
---
-cgit v0.9