Update to GTK+ 2.22.5

4 files changed, 13 insertions, 103 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d3b313f6105..926d70199a5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Nov 15 17:43:31 UTC 2016
+# Mon Dec 19 19:24:49 UTC 2016
 pkgbase = gtk3-typeahead
 	pkgdesc = GTK+ 3 with typeahead feature enabled for the file chooser widget
-	pkgver = 3.22.3
+	pkgver = 3.22.5
 	pkgrel = 1
 	url = http://www.gtk.org/
 	install = gtk3.install
@@ -41,18 +41,16 @@ pkgbase = gtk3-typeahead
 	depends = gtk-update-icon-cache
 	optdepends = libcanberra: gtk3-widget-factory demo
 	optdepends = gtk3-print-backends: Printing
-	provides = gtk3=3.22.3
+	provides = gtk3=3.22.5
 	conflicts = gtk3
-	source = git://git.gnome.org/gtk+#commit=99fed96b4470cf02f8fa522551d2a05e01a1bf8a
-	source = 0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch
+	source = git://git.gnome.org/gtk+#commit=a8991a6bea0023c6d5bec8b2ab704b7ae067d7a6
 	source = settings.ini
 	source = gtk-query-immodules-3.0.hook
 	source = typeahead.patch
 	sha256sums = SKIP
-	sha256sums = f722a70cb1affac8bd054a43b726f57aba21d664144fcaf6d58f18e5bef78189
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845
-	sha256sums = fc10c2ddef67e75cb83e64db1f6b9a8a127b3aaba931909a08f28b9d6ea415d0
+	sha256sums = 0919abc9b6849cda2fa2941854193b5df0372c566d35ce90ced2cac7701c3167
 
 pkgname = gtk3-typeahead
 	install = gtk3.install
diff --git a/0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch b/0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch
deleted file mode 100644
index 5d6210e54529..000000000000
--- a/0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 0d945f06faee49788191e3e28f797f72959b3583 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Mon, 10 Oct 2016 16:34:28 +0200
-Subject: [PATCH] gdkscreen-x11: Fix screen and monitor size calculation
-
-The monitors are already in scaled pixels, so scaling again when retrieving
-the screen size is wrong.
-
-With GDK_SCALE unset, the initial monitor sizes are unscaled, and when the
-xsettings client sets a scale > 1, the monitor sizes should be updated.
-
-The end result is that the monitor sizes start out wrong, and get
-corrected on the first xrandr event, while the screen size starts out
-right and becomes wrong after the event.
-
-This patch fixes Firefox misplacing menus and popovers when the xrandr
-configuration changes while it is running.
-
-Fix for the X11 side of
-
-https://bugzilla.gnome.org/show_bug.cgi?id=772202
----
- gdk/x11/gdkscreen-x11.c | 16 ++++------------
- 1 file changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
-index 7738a47adfed1484..28a43a69bedbe955 100644
---- a/gdk/x11/gdkscreen-x11.c
-+++ b/gdk/x11/gdkscreen-x11.c
-@@ -49,6 +49,7 @@
- static void         gdk_x11_screen_dispose     (GObject		  *object);
- static void         gdk_x11_screen_finalize    (GObject		  *object);
- static void	    init_randr_support	       (GdkScreen	  *screen);
-+static void         process_monitors_change    (GdkScreen         *screen);
- 
- enum
- {
-@@ -82,13 +83,13 @@ gdk_x11_screen_get_display (GdkScreen *screen)
- gint
- gdk_x11_screen_get_width (GdkScreen *screen)
- {
--  return GDK_X11_SCREEN (screen)->width / GDK_X11_SCREEN (screen)->window_scale;
-+  return GDK_X11_SCREEN (screen)->width;
- }
- 
- gint
- gdk_x11_screen_get_height (GdkScreen *screen)
- {
--  return GDK_X11_SCREEN (screen)->height / GDK_X11_SCREEN (screen)->window_scale;
-+  return GDK_X11_SCREEN (screen)->height;
- }
- 
- static gint
-@@ -906,10 +907,8 @@ void
- _gdk_x11_screen_set_window_scale (GdkX11Screen *x11_screen,
- 				  gint          scale)
- {
--  GdkX11Display *x11_display = GDK_X11_DISPLAY (x11_screen->display);
-   GList *toplevels, *l;
-   GdkWindow *root;
--  int i;
- 
-   if (x11_screen->window_scale == scale)
-     return;
-@@ -928,14 +927,7 @@ _gdk_x11_screen_set_window_scale (GdkX11Screen *x11_screen,
-       _gdk_x11_window_set_window_scale (window, scale);
-     }
- 
--  for (i = 0; i < x11_display->monitors->len; i++)
--    {
--      GdkMonitor *monitor = GDK_MONITOR (x11_display->monitors->pdata[i]);
--
--      gdk_monitor_set_scale_factor (monitor, scale);
--    }
--
--  g_signal_emit_by_name (GDK_SCREEN (x11_screen), "monitors-changed");
-+  process_monitors_change (GDK_SCREEN (x11_screen));
- }
- 
- /*
--- 
-2.10.1
-
diff --git a/PKGBUILD b/PKGBUILD
index fafd557aedca..c02bb2590e7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: twilinx <twilinx@mesecons.net>
 
 pkgname=gtk3-typeahead
-pkgver=3.22.3
+pkgver=3.22.5
 pkgrel=1
 conflicts=(gtk3)
 provides=("gtk3=$pkgver")
@@ -16,24 +16,19 @@ optdepends=('libcanberra: gtk3-widget-factory demo'
             'gtk3-print-backends: Printing')
 makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups)
 license=(LGPL)
-_commit=99fed96b4470cf02f8fa522551d2a05e01a1bf8a  # tags/3.22.3^0
+_commit=a8991a6bea0023c6d5bec8b2ab704b7ae067d7a6  # tags/3.22.5^0
 source=("git://git.gnome.org/gtk+#commit=$_commit"
-        0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch
         settings.ini
         gtk-query-immodules-3.0.hook
         typeahead.patch)
 sha256sums=('SKIP'
-            'f722a70cb1affac8bd054a43b726f57aba21d664144fcaf6d58f18e5bef78189'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
-            'fc10c2ddef67e75cb83e64db1f6b9a8a127b3aaba931909a08f28b9d6ea415d0')
+            '0919abc9b6849cda2fa2941854193b5df0372c566d35ce90ced2cac7701c3167')
 
 prepare() {
     cd gtk+
 
-    # Other patches
-    patch -Np1 -i ../0001-gdkscreen-x11-Fix-screen-and-monitor-size-calculatio.patch
-
     # Typeahead-specific changes
     patch gtk/gtkfilechooserwidget.c -i $srcdir/typeahead.patch
 
diff --git a/typeahead.patch b/typeahead.patch
index db479030ebe3..bf25c3f1bcbd 100644
--- a/typeahead.patch
+++ b/typeahead.patch
@@ -30,7 +30,7 @@
  
    gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME);
    gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME);
-@@ -4388,6 +4385,7 @@
+@@ -4390,6 +4387,7 @@
    gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
                             GTK_TREE_MODEL (priv->browse_files_model));
    update_columns (impl, FALSE, _("Modified"));
@@ -38,7 +38,7 @@
    file_list_set_sort_column_ids (impl);
    set_sort_column (impl);
    profile_msg ("    gtk_tree_view_set_model end", NULL);
-@@ -7148,10 +7146,6 @@
+@@ -7150,10 +7148,6 @@
  {
    GList *l, *files, *files_with_info, *infos;
    GFile *file;
@@ -49,7 +49,7 @@
  
    files = NULL;
    files_with_info = NULL;
-@@ -7179,8 +7173,6 @@
+@@ -7181,8 +7175,6 @@
    g_list_free_full (infos, g_object_unref);
  
    gtk_stack_set_visible_child_name (GTK_STACK (impl->priv->browse_files_stack), "list");
@@ -58,7 +58,7 @@
  }
  
  /* Callback used from GtkSearchEngine when the query is done running */
-@@ -7498,6 +7490,7 @@
+@@ -7500,6 +7492,7 @@
    gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->recent_model),
                                          GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
                                          GTK_SORT_DESCENDING);
@@ -66,7 +66,7 @@
  }
  
  typedef struct
-@@ -7515,7 +7508,7 @@
+@@ -7517,7 +7510,7 @@
  
    gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
                             GTK_TREE_MODEL (priv->recent_model));