Update gtk2 to 2.24.31

Overview of Changes from GTK+ 2.24.30 to 2.24.31
================================================

* File chooser:
 - backport many file chooser entry fixes and cleanups
 - don't crash if invisible files are deleted

* Bug fixes:
 555087 Shouldn't the return type of gtk_entry_completion_get_model be Gtk...
 586367 In local_only mode, file chooser should return native paths for fi...
 635287 Specify packages when generating GIR
 640698 Incompatibility in 'matched-selected' signal invocation
 648419 crash in remove_capslock_feedback at gtkentry.c line 10127
 672271 File chooser seems over-enthusiastic about using subdirectories
 679333 unable to filter folders in folder select mode
 687196 filesystemmodel: invalidate nodes on file remove
 703220 (CVE-2013-7447) Memory allocation integer overflow in gdk_cairo_se...
 720330 Gtk-CRITICAL **: gtk_entry_completion_set_model: assertion 'GTK_IS...
 729927 impossible to create a directory if the contents of the current on...
 737777 Applications crash randomly while printing with a password-secured...
 752707 Location bar navigation to parent directories
 756450 GTK file chooser completion dropdown sets cursor in wrong position
 765120 Configure notify does not always reflect window size enforced by (...
 765193 Add introspection support for Visual Studio builds
 768163 improved fullscreen behaviour
 764996 GDK: Incorrect window size when creating window with position spec...
 769126 Can't type astral plane characters into a GtkEntry using the Windo...

3 files changed, 8 insertions, 25 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 477f7d50ff1..9effaf09919 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.280 2016/08/03 10:22:22 adam Exp $
+# $NetBSD: Makefile,v 1.281 2016/09/13 13:45:52 prlw1 Exp $
 
-DISTNAME=	gtk+-2.24.30
+DISTNAME=	gtk+-2.24.31
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=	2
-CATEGORIES=	x11
+CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
 EXTRACT_SUFX=	.tar.xz
 
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index c977073d793..76c75c718f7 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.160 2016/03/13 03:32:59 tnn Exp $
+$NetBSD: distinfo,v 1.161 2016/09/13 13:45:52 prlw1 Exp $
 
-SHA1 (gtk+-2.24.30.tar.xz) = aa5bc6dca583cf2bff137606dc2014f6ea559da7
-RMD160 (gtk+-2.24.30.tar.xz) = 2b93f5dd100059d4047c3368a6b771963ed306e0
-SHA512 (gtk+-2.24.30.tar.xz) = 13373e4809b48acefdbf09f18f0f18b562f05b3ce2e3169c5aa80722a262405b3b4a220ecee54c59ef03ef89be9850dc659f6da9251abaf7c577599b7a4319b1
-Size (gtk+-2.24.30.tar.xz) = 12800276 bytes
+SHA1 (gtk+-2.24.31.tar.xz) = c3d828135994a52cc9428a60175bd2b294656611
+RMD160 (gtk+-2.24.31.tar.xz) = 71feedd14b1a52eaa070a6cbf26d00e64d41de42
+SHA512 (gtk+-2.24.31.tar.xz) = 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
+Size (gtk+-2.24.31.tar.xz) = 12805344 bytes
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
-SHA1 (patch-gdk_gdkcairo.c) = f4bd03706fcb94155f360ae0faf14be141cf9409
 SHA1 (patch-gdk_x11_gdkwindow-x11.c) = 08c05b31da38e16727a2941cdec4c855f2fc7d77
 SHA1 (patch-gtk_gtktooltips.c) = 593e43bb0aacc0b07c24959f2ac6d84dfd04a780
diff --git a/x11/gtk2/patches/patch-gdk_gdkcairo.c b/x11/gtk2/patches/patch-gdk_gdkcairo.c
deleted file mode 100644
index 09cc55e3c64..00000000000
--- a/x11/gtk2/patches/patch-gdk_gdkcairo.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gdk_gdkcairo.c,v 1.1 2016/03/02 14:32:31 nros Exp $
-Fix CVE-2013-7447.
-Taken from gtk3.
-https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-7447
---- gdk/gdkcairo.c.orig	2016-03-02 14:09:03.000000000 +0000
-+++ gdk/gdkcairo.c
-@@ -211,7 +211,7 @@ gdk_cairo_set_source_pixbuf (cairo_t    
-     format = CAIRO_FORMAT_ARGB32;
- 
-   cairo_stride = cairo_format_stride_for_width (format, width);
--  cairo_pixels = g_malloc (height * cairo_stride);
-+  cairo_pixels = g_malloc_n (height, cairo_stride);
-   surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
-                                                  format,
-                                                  width, height, cairo_stride);