gtk3: updated to 3.22.25

GTK+ 3.22.25

* The HighContrast theme has received numerous improvements

* Middle-click on scrollbars jumps to the position again

* Wayland:
 - Terminal sizing problems are fixed
 - The Wayland backend now implemented the KDE server-side decorations protocol

* X11:
 - Problems with menus on several X servers are fixed

* Bugs fixed:
 701296 gtkfixed accepts toplevel windows into its children list after gtk_w...
 728452 gtk_tree_view_column_create_button creates button which is leaked
 738387 ComboBox in appears-as-list-mode: popup is not hidden when focus is ...
 763517 Selected then unselected Label in ListBox gets wrong colour until ho...
 769877 [HighContrast(|Inverse)] dual-headerbars broken
 769879 [HighContrast(|Inverse)] tooltips problems
 771279 Segfault due to gtk_event_controller_get_widget() returning NULL but...
 775217 Warning message "gdkcursor-wayland.c:170: Unable to load blank_curso...
 776793 GtkComboBox with appears-as-list doesn't receive mouse events from a...
 777072 window shrinks when restored from maximized
 778811 Enter submenus when activating their parent item
 778930 gtk3-icon-browser: Add scalable icons to icon detail modal window
 780101 Menus do not display over remote X11
 781909 Implement KDE's server-decoration protocol
 782396 Inconsistent deprecation documentation for gtk_paint_spinner
 783995 Monitor API inconsistencies across X11 & Wayland
 784314 entry completion regression on wayland
 784509 wrong coordinates given to at-spi layer from GTK3 entries
 786220 Sometimes the volume icon is replaced with image-missing
 786794 Print dialogue has a printer called "printer"
 787274 ComboBox in appears-as-list-mode: Gtk-CRITICAL when popping down wit...
 787669 Middle mouse click on scrollbar is ignored
 787866 Untranslated key labels in the Keyboard panel of Settings
 788053 Window position wrong in HiDPI mode
 788458 (style) Array index 'i' is used before limits check.
 788496 HighContrast/win32: CSD Windows have missing border and shadows floa...
 788505 ComboBox in appears-as-list mode: Clicking a TreeView expander also ...
 788516 dialogs in gtk+ 3.22.24 have square borders.
 788573 HighContrast: titlebar separator is too wide and joined to buttons, ...
 788574 HighContrast: Ugly solid black corners at bottom of MessageDialog
 788575 HighContrastInverse: Windows lack visible borders, merge into each o...
 788577 Global -GtkComboBox-appears-as-list breaks opening menu-mode CBs by ...
 788580 HighContrast: .flat buttons become non-flat when their window is :ba...
 788614 Trying to reuse a TreeViewColumn causes criticals and a segfault (e....
 788841 Fix gtk_actionable_set_detailed_action_name API inconsistency
 788905 GtkRange horizontal scrolling causes movement in the wrong direction
 789141 Segmentation fault when adding Google online account
 789149 GtkGestureZoom leaks the list of sequences while calculating the dis...
 789327 appchooserwidget: Don't limit application list unconditionally
 789357 Regression in 3.22.23: GDK_WINDOW_STATE_TILED flag is never set

* Translation updates:
 Brazilian Portuguese
 Catalan (Valencian)
 Croatian
 Czech
 German
 Hungarian
 Italian
 Indonesian
 Lithuanian
 Polish
 Slovak
 Slovenian
 Swedish

4 files changed, 9 insertions, 100 deletions

diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index 87b31b46f8f..45f3621f889 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.104 2017/11/06 10:00:57 tnn Exp $
+# $NetBSD: Makefile,v 1.105 2017/11/07 12:05:47 adam Exp $
 
-DISTNAME=	gtk+-3.22.24
-PKGREVISION=	1
+DISTNAME=	gtk+-3.22.25
 PKGNAME=	${DISTNAME:S/gtk/gtk3/}
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
diff --git a/x11/gtk3/PLIST b/x11/gtk3/PLIST
index 6f5a35a1a4b..34aa5229282 100644
--- a/x11/gtk3/PLIST
+++ b/x11/gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2017/08/25 12:39:43 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.23 2017/11/07 12:05:47 adam Exp $
 bin/gtk-builder-tool
 bin/gtk-encode-symbolic-svg
 bin/gtk-launch
@@ -415,10 +415,10 @@ lib/girepository-1.0/Gtk-3.0.typelib
 lib/gtk-3.0/3.0.0/immodules/im-am-et.la
 lib/gtk-3.0/3.0.0/immodules/im-cedilla.la
 lib/gtk-3.0/3.0.0/immodules/im-cyrillic-translit.la
-${PLIST.quartz}lib/gtk-3.0/3.0.0/immodules/im-quartz.la
 lib/gtk-3.0/3.0.0/immodules/im-inuktitut.la
 lib/gtk-3.0/3.0.0/immodules/im-ipa.la
 lib/gtk-3.0/3.0.0/immodules/im-multipress.la
+${PLIST.quartz}lib/gtk-3.0/3.0.0/immodules/im-quartz.la
 lib/gtk-3.0/3.0.0/immodules/im-thai.la
 lib/gtk-3.0/3.0.0/immodules/im-ti-er.la
 lib/gtk-3.0/3.0.0/immodules/im-ti-et.la
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo
index 10ca6bff4a0..dd4e154cd27 100644
--- a/x11/gtk3/distinfo
+++ b/x11/gtk3/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.51 2017/11/06 10:00:57 tnn Exp $
+$NetBSD: distinfo,v 1.52 2017/11/07 12:05:47 adam Exp $
 
-SHA1 (gtk+-3.22.24.tar.xz) = 13f09656af70ab1106fd68309ff84782a5cc74d4
-RMD160 (gtk+-3.22.24.tar.xz) = 028c5d7dc86bdd9be9bc9c1e4cf478f5d39195c6
-SHA512 (gtk+-3.22.24.tar.xz) = fd2f9b99c48581cd0eabdce2593293360e4ee1ffe40ab66237289ad08053a553dbe499115036b81051c0db77423805e232ed4a19490c6b1d790a5185cc193169
-Size (gtk+-3.22.24.tar.xz) = 18866048 bytes
+SHA1 (gtk+-3.22.25.tar.xz) = 3af2c7369014f132a696cca15c756c4e8514c01b
+RMD160 (gtk+-3.22.25.tar.xz) = 420537b13d9882e1c30c51f08be128fdee80951e
+SHA512 (gtk+-3.22.25.tar.xz) = ecb74f9a32a678e6c963a5f145c02672e26a9461cd79625f1a590b8817e8c83ec5aaa79b2d52138c6919d095929073311efe2abe451e8cb981ca54b9b234cd49
+Size (gtk+-3.22.25.tar.xz) = 18909656 bytes
 SHA1 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a
 SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f
 SHA1 (patch-configure) = 1dca87c6a85ee927b85d4edc14b0985c5130c0d9
 SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5
-SHA1 (patch-gdk_x11_gdkscreen-x11.c) = 2a656cf89ab3cdeac30852c35385a9c97154c1e6
 SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78
 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
 SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8
diff --git a/x11/gtk3/patches/patch-gdk_x11_gdkscreen-x11.c b/x11/gtk3/patches/patch-gdk_x11_gdkscreen-x11.c
deleted file mode 100644
index 9e41af681cb..00000000000
--- a/x11/gtk3/patches/patch-gdk_x11_gdkscreen-x11.c
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-gdk_x11_gdkscreen-x11.c,v 1.1 2017/11/06 10:00:57 tnn Exp $
-
-From 74720117c9f12b01099ab55043d80c9fa21f44a5 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 28 Oct 2017 10:22:30 -0400
-Subject: Revert "gdkscreen-x11: Enable RandR on VirtualBox"
-
-This reverts commit f2ba6ca47322a17b37fb92662fc9552b4f106f10.
-
-This change was causing problems with several X servers,
-see https://bugzilla.gnome.org/show_bug.cgi?id=780101
-
---- gdk/x11/gdkscreen-x11.c.orig	2017-10-02 16:00:49.000000000 +0000
-+++ gdk/x11/gdkscreen-x11.c
-@@ -408,6 +408,7 @@ init_randr15 (GdkScreen *screen, gboolea
-   RROutput primary_output = None;
-   RROutput first_output = None;
-   int i;
-+  gboolean randr12_compat = FALSE;
-   XRRMonitorInfo *rr_monitors;
-   int num_rr_monitors;
-   int old_primary;
-@@ -452,6 +453,9 @@ init_randr15 (GdkScreen *screen, gboolea
-       if (output_info == NULL)
-         continue;
- 
-+      /* Non RandR1.2+ X driver have output name "default" */
-+      randr12_compat |= !g_strcmp0 (output_info->name, "default");
-+
-       if (output_info->connection == RR_Disconnected)
-         {
-           XRRFreeOutputInfo (output_info);
-@@ -531,6 +535,19 @@ init_randr15 (GdkScreen *screen, gboolea
-   XRRFreeMonitors (rr_monitors);
-   XRRFreeScreenResources (resources);
- 
-+  /* non RandR 1.2+ X driver doesn't return any usable multihead data */
-+  if (randr12_compat)
-+    {
-+      for (i = 0; i < x11_display->monitors->len; i++)
-+        {
-+          GdkX11Monitor *monitor = x11_display->monitors->pdata[i];
-+          if (monitor->remove)
-+            gdk_display_monitor_removed (display, GDK_MONITOR (monitor));
-+        }
-+      g_ptr_array_remove_range (x11_display->monitors, 0, x11_display->monitors->len);
-+      return FALSE;
-+    }
-+
-   for (i = x11_display->monitors->len - 1; i >= 0; i--)
-     {
-       GdkX11Monitor *monitor = x11_display->monitors->pdata[i];
-@@ -593,6 +610,7 @@ init_randr13 (GdkScreen *screen, gboolea
-   RROutput primary_output = None;
-   RROutput first_output = None;
-   int i;
-+  gboolean randr12_compat = FALSE;
-   int old_primary;
- 
-   if (!x11_display->have_randr13)
-@@ -616,6 +634,9 @@ init_randr13 (GdkScreen *screen, gboolea
-       XRROutputInfo *output_info =
-         XRRGetOutputInfo (x11_screen->xdisplay, resources, output);
- 
-+      /* Non RandR1.2+ X driver have output name "default" */
-+      randr12_compat |= !g_strcmp0 (output_info->name, "default");
-+
-       if (output_info->connection == RR_Disconnected)
-         {
-           XRRFreeOutputInfo (output_info);
-@@ -696,7 +717,17 @@ init_randr13 (GdkScreen *screen, gboolea
- 
-   XRRFreeScreenResources (resources);
- 
--  /* Which usable multihead data is not returned in non RandR 1.2+ X driver? */
-+  if (randr12_compat)
-+    {
-+      for (i = 0; i < x11_display->monitors->len; i++)
-+        {
-+          GdkX11Monitor *monitor = x11_display->monitors->pdata[i];
-+          if (monitor->remove)
-+            gdk_display_monitor_removed (display, GDK_MONITOR (monitor));
-+        }
-+      g_ptr_array_remove_range (x11_display->monitors, 0, x11_display->monitors->len);
-+      return FALSE;
-+    }
- 
-   for (i = x11_display->monitors->len - 1; i >= 0; i--)
-     {