Accepting request 587055 from GNOME:Factory

Update to 3.22.29 (forwarded request 587047 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/587055
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=126

gtk+-3.22.28.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f
-size 22157948

gtk+-3.22.29.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a07d64b939fcc034a066b7723fdf9b24e92c9cfb6a8497593f3471fe56fbbbf8
+size 18964852

gtk3-restore-filechooser-click-behavior.patch

@@ -1,79 +0,0 @@
-Index: gtk+-3.22.24/gtk/gtkfilechooserwidget.c
-===================================================================
---- gtk+-3.22.24.orig/gtk/gtkfilechooserwidget.c
-+++ gtk+-3.22.24/gtk/gtkfilechooserwidget.c
-@@ -77,7 +77,6 @@
- #include "gtkseparator.h"
- #include "gtkmodelbutton.h"
- #include "gtkgesturelongpress.h"
--#include "gtkdebug.h"
- 
- #include <cairo-gobject.h>
- 
-@@ -2379,25 +2378,6 @@ list_popup_menu_cb (GtkWidget
-   return TRUE;
- }
- 
--static void
--get_selection_modifiers (GtkWidget       *widget,
--                         GdkEventButton  *event,
--                         gboolean        *modify,
--                         gboolean        *extend)
--{
--  GdkModifierType mask;
--
--  *modify = FALSE;
--  *extend = FALSE;
--
--  mask = gtk_widget_get_modifier_mask (widget, GDK_MODIFIER_INTENT_MODIFY_SELECTION);
--  if ((event->state & mask) == mask)
--    *modify = TRUE;
--  mask = gtk_widget_get_modifier_mask (widget, GDK_MODIFIER_INTENT_EXTEND_SELECTION);
--  if ((event->state & mask) == mask)
--    *extend = TRUE;
--}
--
- /* Callback used when a button is pressed on the file list.  We trap button 3 to
-  * bring up a popup menu.
-  */
-@@ -2408,40 +2388,10 @@ list_button_press_event_cb (GtkWidget
- {
-   GtkFileChooserWidgetPrivate *priv = impl->priv;
-   static gboolean in_press = FALSE;
--  GtkTreePath *path;
--  GtkTreeViewColumn *column;
--  GdkDevice *device;
--  gboolean modify, extend, is_touchscreen;
- 
-   if (in_press)
-     return FALSE;
- 
--  device = gdk_event_get_source_device ((GdkEvent *) event);
--  is_touchscreen = gtk_simulate_touchscreen () ||
--                   gdk_device_get_source (device) == GDK_SOURCE_TOUCHSCREEN;
--
--  get_selection_modifiers (widget, event, &modify, &extend);
--  if (!is_touchscreen &&
--      !modify && !extend &&
--      event->type == GDK_BUTTON_PRESS &&
--      event->button == GDK_BUTTON_PRIMARY &&
--      gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->browse_files_tree_view),
--                                     event->x, event->y,
--                                     &path, &column, NULL, NULL))
--    {
--      GtkTreeSelection *selection;
--
--      selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->browse_files_tree_view));
--      if (gtk_tree_selection_path_is_selected (selection, path))
--        {
--          list_row_activated (GTK_TREE_VIEW (priv->browse_files_tree_view), path, column, impl);
--          gtk_tree_path_free (path);
--          return TRUE;
--        }
--
--      gtk_tree_path_free (path);
--    }
--
-   if (!gdk_event_triggers_context_menu ((GdkEvent *) event))
-     return FALSE;
- 

gtk3.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Mar 13 09:37:37 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 3.22.29:
+  + Wayland: add an input method based on the text protocol.
+  + File chooser: Stop activating without double-click.
+  + Bugs fixed: bgo#710888, bgo#743975, bgo#775546, bgo#794008.
+  + Updated translations.
+- Drop gtk3-restore-filechooser-click-behavior.patch: fixed
+  upstream.
+
 -------------------------------------------------------------------
 Wed Feb 28 16:32:21 UTC 2018 - dimstar@opensuse.org
 

gtk3.spec

@@ -27,7 +27,7 @@
 %define gtk_binary_version 3.0.0
 %define _name gtk+
 Name:           gtk3
-Version:        3.22.28
+Version:        3.22.29
 Release:        0
 Summary:        The GTK+ toolkit library (version 3)
 License:        LGPL-2.1-or-later
@@ -40,8 +40,6 @@ Source3:        macros.gtk3
 Source99:       baselibs.conf
 # PATCH-FIX-OPENSUSE gtk3-GTK_PATH64.patch sbrabec@novell.com - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH
 Patch0:         gtk3-GTK_PATH64.patch
-# PATCH-FIX-OPENSUSE gtk3-restore-filechooser-click-behavior.patch bgo#758065 bsc#1057471 yfjiang@suse.com -- revert upstream commit#fb0a13b to restore the single click behavior
-Patch3:         gtk3-restore-filechooser-click-behavior.patch
 # PATCH-FIX-OPENSUSE revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96
 Patch4:         gtk3-revert-forced-xftdpi.patch
 BuildRequires:  cups-devel >= 1.2
@@ -360,7 +358,6 @@ done
 cp -a %{SOURCE1} .
 %patch0 -p1
 %endif
-%patch3 -p1
 %patch4 -p1
 
 %build
@@ -561,6 +558,7 @@ fi
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-cedilla.so
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-cyrillic-translit.so
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-ipa.so
+%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-wayland.so
 %dir %{_libdir}/gtk-3.0/%{gtk_binary_version}/printbackends/
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/printbackends/libprintbackend-cloudprint.so
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/printbackends/libprintbackend-cups.so