Update to 3.24.1

6 files changed, 7 insertions, 149 deletions

diff --git a/.gitignore b/.gitignore
index d09a576..f13e696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -172,3 +172,4 @@ gtk+-2.90.5.tar.bz2
 /gtk+-3.22.30.tar.xz
 /gtk+-3.23.2.tar.xz
 /gtk+-3.24.0.tar.xz
+/gtk+-3.24.1.tar.xz
diff --git a/0001-Fix-portal-path-handling.patch b/0001-Fix-portal-path-handling.patch
deleted file mode 100644
index 0092a1f..0000000
--- a/0001-Fix-portal-path-handling.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 47122288b82e50b88e3185d960e2ba5ee8a27a36 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 5 Sep 2018 19:54:32 -0400
-Subject: [PATCH] Fix portal path handling
-
-This was broken when I recently introduced this helper
-function.
----
- gtk/gtkprivate.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtk/gtkprivate.c b/gtk/gtkprivate.c
-index 6428347f04..a437047658 100644
---- a/gtk/gtkprivate.c
-+++ b/gtk/gtkprivate.c
-@@ -307,7 +307,7 @@ get_portal_path (GDBusConnection  *connection,
-     if (sender[i] == '.')
-       sender[i] = '_';
- 
--  path = g_strconcat ("/org/freedesktop/portal/desktop", "/", kind, "/", sender, "/", token, NULL);
-+  path = g_strconcat ("/org/freedesktop/portal/desktop", "/", kind, "/", sender, "/", *token, NULL);
- 
-   g_free (sender);
- 
--- 
-2.19.0.rc0
-
diff --git a/0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch b/0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch
deleted file mode 100644
index 55c3166..0000000
--- a/0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3c7d5e749ccafa75718ef00f1d5f6cdc0defacb3 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Wed, 5 Sep 2018 21:46:28 +0200
-Subject: [PATCH] GtkApplication: Fix CRITICAL on shutdown when
- register_session=FALSE
-
----
- gtk/gtkapplication-dbus.c | 25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c
-index 25015eb68c..0946edf35c 100644
---- a/gtk/gtkapplication-dbus.c
-+++ b/gtk/gtkapplication-dbus.c
-@@ -826,15 +826,22 @@ gtk_application_impl_dbus_finalize (GObject *object)
- {
-   GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) object;
- 
--  g_dbus_connection_call (dbus->session,
--                          "org.freedesktop.portal.Desktop",
--                          dbus->session_id,
--                          "org.freedesktop.portal.Session",
--                          "Close",
--                          NULL, NULL, 0, -1, NULL, NULL, NULL);
--
--  g_free (dbus->session_id);
--  g_dbus_connection_signal_unsubscribe (dbus->session, dbus->state_changed_handler);
-+  if (dbus->session_id)
-+    {
-+      g_dbus_connection_call (dbus->session,
-+                              "org.freedesktop.portal.Desktop",
-+                              dbus->session_id,
-+                              "org.freedesktop.portal.Session",
-+                              "Close",
-+                              NULL, NULL, 0, -1, NULL, NULL, NULL);
-+
-+      g_free (dbus->session_id);
-+    }
-+
-+  if (dbus->state_changed_handler)
-+    g_dbus_connection_signal_unsubscribe (dbus->session,
-+                                          dbus->state_changed_handler);
-+
-   g_clear_object (&dbus->inhibit_proxy);
-   g_slist_free_full (dbus->inhibit_handles, inhibit_handle_free);
-   g_free (dbus->app_menu_path);
--- 
-2.19.0.rc0
-
diff --git a/Revert-imwayland-clear-preedit-on-focus-out.patch b/Revert-imwayland-clear-preedit-on-focus-out.patch
deleted file mode 100644
index a2f1679..0000000
--- a/Revert-imwayland-clear-preedit-on-focus-out.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Sun, 9 Sep 2018 23:06:12 +0100
-Subject: Revert "imwayland: clear preedit on focus out"
-
-This appears to cause the gnome-terminal cursor to disappear on focus
-changes. Revert it for now as a workaround.
-
-This reverts commit 49b17e6c1e853e81e2087a989524d8e0cad08d05.
-
-Bug: https://gitlab.gnome.org/GNOME/gtk/issues/1316
-Bug-Debian: https://bugs.debian.org/908120
-Forwarded: no
----
- modules/input/imwayland.c | 19 +++++++++++++------
- 1 file changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c
-index 11d09d2..3589c4c 100644
---- a/modules/input/imwayland.c
-+++ b/modules/input/imwayland.c
-@@ -135,7 +135,18 @@ static void
- text_input_leave (void                     *data,
-                   struct zwp_text_input_v3 *text_input,
-                   struct wl_surface        *surface)
--{}
-+{
-+  /*
-+  GtkIMContextWayland *context;
-+
-+  if (!global->current)
-+    return;
-+
-+  context = GTK_IM_CONTEXT_WAYLAND (global->current);
-+  TODO: does this clear text input or modify text?
-+  reset_preedit (context);
-+  */
-+}
- 
- static void
- text_input_preedit (void                     *data,
-@@ -158,6 +169,7 @@ text_input_preedit (void                     *data,
-   context->pending_preedit.cursor_end = cursor_end;
- }
- 
-+
- static void
- text_input_preedit_apply (GtkIMContextWaylandGlobal *global)
- {
-@@ -652,11 +664,6 @@ gtk_im_context_wayland_focus_out (GtkIMContext *context)
- 
-   zwp_text_input_v3_disable (global->text_input);
-   commit_state (context_wayland);
--
--  /* after disable, incoming state changes won't take effect anyway */
--  text_input_preedit (global, global->text_input, "", 0, 0);
--  text_input_preedit_apply (global);
--
-   global->current = NULL;
- }
- 
diff --git a/gtk3.spec b/gtk3.spec
index f392dea..83fa2e2 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -20,22 +20,14 @@
 %global __provides_exclude_from ^%{_libdir}/gtk-3.0
 
 Name: gtk3
-Version: 3.24.0
-Release: 4%{?dist}
+Version: 3.24.1
+Release: 1%{?dist}
 Summary: GTK+ graphical user interface library
 
 License: LGPLv2+
 URL: http://www.gtk.org
 Source0: http://download.gnome.org/sources/gtk+/3.24/gtk+-%{version}.tar.xz
 
-# Backported from upstream
-Patch0: 0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch
-Patch1: 0001-Fix-portal-path-handling.patch
-# https://salsa.debian.org/gnome-team/gtk3/blob/debian/master/debian/patches/Revert-imwayland-clear-preedit-on-focus-out.patch
-# revert a problematic commit to fix
-# https://gitlab.gnome.org/GNOME/gtk/issues/1316#note_312942
-Patch2: Revert-imwayland-clear-preedit-on-focus-out.patch
-
 BuildRequires: pkgconfig(atk) >= %{atk_version}
 BuildRequires: pkgconfig(atk-bridge-2.0)
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@@ -170,8 +162,6 @@ the functionality of the installed %{name} package.
 
 %prep
 %autosetup -n gtk+-%{version} -p1
-# Force regeneration with patch1
-rm testsuite/gtk/gtkprivate.c
 
 %build
 export CFLAGS='-fno-strict-aliasing %optflags'
@@ -328,6 +318,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Wed Sep 19 2018 Kalev Lember <klember@redhat.com> - 3.24.1-1
+- Update to 3.24.1
+
 * Mon Sep 10 2018 Adam Williamson <awilliam@redhat.com> - 3.24.0-4
 - Revert a problematic change that breaks several things (GGO #1316)
 
diff --git a/sources b/sources
index 63cee14..8e9ad8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gtk+-3.24.0.tar.xz) = c82228f31a422d7f180b1157de697d941f2826f9a85a44d2a583564130626c88759a62269bb01f54969e00ff7499db4e1b026dbfb060dda1b6e62f36f3267981
+SHA512 (gtk+-3.24.1.tar.xz) = 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d