From 0dabcdec0fb1ae78258bb73b8af36f9184e281523d25eb5984f88ab44a702ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Wed, 16 Oct 2013 14:34:58 +0000
Subject: [PATCH] Accepting request 203459 from
 home:dimstar:branches:GNOME:Factory

Update to 3.10.1 - GNOME Stable branch - Bugfixes only

OBS-URL: https://build.opensuse.org/request/show/203459
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=138
---
 gtk+-3.10.1.tar.xz          |  3 --
 gtk+-3.10.2.tar.xz          |  3 ++
 gtk3-enable-mnemonics.patch | 58 -------------------------------------
 gtk3.changes                | 10 +++++++
 gtk3.spec                   |  5 +---
 5 files changed, 14 insertions(+), 65 deletions(-)
 delete mode 100644 gtk+-3.10.1.tar.xz
 create mode 100644 gtk+-3.10.2.tar.xz
 delete mode 100644 gtk3-enable-mnemonics.patch

diff --git a/gtk+-3.10.1.tar.xz b/gtk+-3.10.1.tar.xz
deleted file mode 100644
index 95b81e5..0000000
--- a/gtk+-3.10.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c12e6897fb1ec8d8f1a6de6cd0ac1372fee6fd63ee3a5a63813dc5f3473e6ab8
-size 14232772
diff --git a/gtk+-3.10.2.tar.xz b/gtk+-3.10.2.tar.xz
new file mode 100644
index 0000000..abfffee
--- /dev/null
+++ b/gtk+-3.10.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93af12d28e5f6ccc373ea59f31147e2884c9b3c15dc4841ce3b5cee45b13814c
+size 14376840
diff --git a/gtk3-enable-mnemonics.patch b/gtk3-enable-mnemonics.patch
deleted file mode 100644
index 100f49a..0000000
--- a/gtk3-enable-mnemonics.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From ebe152f1557fa413eec39892728306afbba74a75 Mon Sep 17 00:00:00 2001
-From: Johannes Wellhöfer <j dot wellhoefer at gmx dot de>
-Date: Sun, 13 Oct 2013 16:15:18 +0200
-Subject: [PATCH] Also revert enable-mnemonics code in gtkwindow, which was
- forgotten in commit 34cf40e95cb1f0bc4bb98bb14edb03dd86f1dab3.
-
----
- gtk/gtkwindow.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
-index 5374d3f..a1a2896 100644
---- a/gtk/gtkwindow.c
-+++ b/gtk/gtkwindow.c
-@@ -11110,6 +11110,7 @@ gtk_window_activate_key (GtkWindow   *window,
-   GtkKeyHash *key_hash;
-   GtkWindowKeyEntry *found_entry = NULL;
-   gboolean enable_accels;
-+  gboolean enable_mnemonics;
- 
-   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
-   g_return_val_if_fail (event != NULL, FALSE);
-@@ -11126,6 +11127,7 @@ gtk_window_activate_key (GtkWindow   *window,
- 					      event->group);
- 
-       g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)),
-+                    "gtk-enable-mnemonics", &enable_mnemonics,
-                     "gtk-enable-accels", &enable_accels,
-                     NULL);
- 
-@@ -11134,8 +11136,11 @@ gtk_window_activate_key (GtkWindow   *window,
- 	  GtkWindowKeyEntry *entry = tmp_list->data;
- 	  if (entry->is_mnemonic)
-             {
--              found_entry = entry;
--              break;
-+              if( enable_mnemonics)
-+              {
-+                found_entry = entry;
-+                break;
-+              }
-             }
-           else 
-             {
-@@ -11153,7 +11158,8 @@ gtk_window_activate_key (GtkWindow   *window,
-     {
-       if (found_entry->is_mnemonic)
-         {
--          return gtk_window_mnemonic_activate (window, found_entry->keyval,
-+          if( enable_mnemonics)
-+            return gtk_window_mnemonic_activate (window, found_entry->keyval,
-                                                found_entry->modifiers);
-         }
-       else
--- 
-1.8.4
-
-
diff --git a/gtk3.changes b/gtk3.changes
index 7023f0d..bdd62a4 100644
--- a/gtk3.changes
+++ b/gtk3.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Oct 16 06:49:45 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.10.2:
+  + Bugs fixed: bgo#168530, bgo#698730, bgo#708163, bgo#708346,
+    bgo#709621, bgo#709697, bgo#709854, bgo#709939, bgo#709967,
+    bgo#710073, bgo#710096, bgo#710141.
+  + Updated translations.
+- Drop gtk3-enable-mnemonics.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Mon Oct 14 21:01:04 UTC 2013 - dimstar@opensuse.org
 
diff --git a/gtk3.spec b/gtk3.spec
index c4afdaf..a99c7e2 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -25,7 +25,7 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        3.10.1
+Version:        3.10.2
 Release:        0
 Summary:        The GTK+ toolkit library (version 3)
 License:        LGPL-2.1+
@@ -44,8 +44,6 @@ Patch1:         gtk3-path-local.patch
 Patch3:         gtk3-bnc130159-bgo319483-async-font-selection.patch
 # PATCH-FIX-UPSTREAM gtk3-find-wayland-includedir.patch bgo#696507 zaitor@opensuse.org -- Make configure find wayland include files.
 Patch4:         gtk3-find-wayland-includedir.patch
-# PATCH-FIX-UPSTREAM gtk3-enable-mnemonics.patch bgo#709764 bgo#708346 bnc#844929 dimstar@opensuse.org -- Revert missing parts to allow apps to override disabling mnemonics (like gnome-terminal does)
-Patch5:         gtk3-enable-mnemonics.patch
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -317,7 +315,6 @@ cp -a %{S:1} .
 %if %{build_wayland_backend}
 %patch4 -p1
 %endif
-%patch5 -p1
 
 %build
 # Needed for patch1 and patch4