callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase patch series

Browse Source
This commit is contained in:
Simon McVittie
2018-09-19 10:16:56 +01:00
parent 321430528e
commit 04210faef4
9 changed files with 5 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
debian/changelog vendored
View File

@ -2,15 +2,10 @@ gtk+3.0 (3.24.1-1) UNRELEASED; urgency=medium
* New upstream release
- Bump GLib build-dependency to 2.53.4 as per configure.ac
* d/p/imwayland-Fix-clearing-of-preedit-text.patch,
d/p/imwayland-Fix-clearing-of-preedit-text-in-webkitgtk.patch:
Use the upstream fix for #908120
- d/p/Revert-imwayland-clear-preedit-on-focus-out.patch: Remove
* d/p/modules-Check-current-context-before-retrieving-surroundi.patch:
Cherry-pick 88dc784 to fix warnings in Wayland input method
* d/p/Add-a-missing-include.patch:
Cherry-pick b1d3bee to fix implicit declaration of
gtk_get_portal_request_path()
- d/p/Revert-imwayland-clear-preedit-on-focus-out.patch:
Remove, rely on the upstream fix for #908120 instead
- d/p/GtkApplication-Fix-CRITICAL-on-shutdown-when-register_ses.patch,
d/p/Fix-portal-path-handling.patch: Remove, applied upstream
* Build installed-tests
- Install them in gtk-3-examples for now to avoid the NEW queue
* d/p/no-accessibility-dump.patch: Drop, no longer needed.

2
debian/patches/018_gdkenumtypes.c_location.patch vendored
View File

@ -19,7 +19,7 @@ Forwarded: yes
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 573b197..4b41650 100644
index 9550187..21c1c50 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -243,8 +243,8 @@ if HAVE_INTROSPECTION

22
debian/patches/Add-a-missing-include.patch vendored
View File

@ -1,22 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 12 Sep 2018 23:02:26 -0400
Subject: Add a missing include
Bug: https://gitlab.gnome.org/GNOME/gtk/issues/1325
Origin: upstream, 3.24.1, commit:b1d3beedc3cbabc5050a4292ec398978ca873071
---
gtk/gtkprintoperation-portal.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/gtk/gtkprintoperation-portal.c b/gtk/gtkprintoperation-portal.c
index fb3dad0..9fb0226 100644
--- a/gtk/gtkprintoperation-portal.c
+++ b/gtk/gtkprintoperation-portal.c
@@ -37,6 +37,7 @@
#include "gtkshow.h"
#include "gtkintl.h"
#include "gtkwindowprivate.h"
+#include "gtkprivate.h"
typedef struct {

26
debian/patches/Fix-portal-path-handling.patch vendored
View File

@ -1,26 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 5 Sep 2018 19:54:32 -0400
Subject: Fix portal path handling
This was broken when I recently introduced this helper
function.
Origin: upstream, commit:47122288b82e50b88e3185d960e2ba5ee8a27a36
Applied-Upstream: 3.24.1
---
gtk/gtkprivate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtk/gtkprivate.c b/gtk/gtkprivate.c
index 6428347..a437047 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);

47
debian/patches/GtkApplication-Fix-CRITICAL-on-shutdown-when-register_ses.patch vendored
View File

@ -1,47 +0,0 @@
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 5 Sep 2018 21:46:28 +0200
Subject: GtkApplication: Fix CRITICAL on shutdown when register_session=FALSE
Origin: upstream, commit:3c7d5e749ccafa75718ef00f1d5f6cdc0defacb3
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908070
Applied-Upstream: 3.24.1
---
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 25015eb..0946edf 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);

34
debian/patches/imwayland-Fix-clearing-of-preedit-text-in-webkitgtk.patch vendored
View File

@ -1,34 +0,0 @@
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Tue, 11 Sep 2018 12:12:28 +0000
Subject: imwayland: Fix clearing of preedit text in webkitgtk
Fixes webkitgtk misbehaviour as outlined in
https://gitlab.gnome.org/GNOME/gtk/issues/1316#note_312942 , which was
introduced in 49b17e6c.
The preedit will be cleared on exit only if it is already present.
Origin: upstream, 3.24.1, commit:99669503fbc228fcca0edcf9a739354808c46ddb
Bug: https://gitlab.gnome.org/GNOME/gtk/issues/1316
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908120
---
modules/input/imwayland.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c
index 1fe95f3..25144f3 100644
--- a/modules/input/imwayland.c
+++ b/modules/input/imwayland.c
@@ -654,8 +654,11 @@ gtk_im_context_wayland_focus_out (GtkIMContext *context)
commit_state (context_wayland);
/* after disable, incoming state changes won't take effect anyway */
- text_input_preedit (global, global->text_input, NULL, 0, 0);
- text_input_preedit_apply (global);
+ if (context_wayland->current_preedit.text)
+ {
+ text_input_preedit (global, global->text_input, NULL, 0, 0);
+ text_input_preedit_apply (global);
+ }
global->current = NULL;
}

30
debian/patches/imwayland-Fix-clearing-of-preedit-text.patch vendored
View File

@ -1,30 +0,0 @@
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Mon, 10 Sep 2018 08:32:23 +0000
Subject: imwayland: Fix clearing of preedit text
Fixes terminal emulator misbehaviour as outlined in
https://gitlab.gnome.org/GNOME/gtk/issues/1316, which was introduced
in 49b17e6c. The original commit cleared preedit text by setting it to
an empty string, which still counted as existing preedit. The fix sets
preedit string to null, which is correctly understood as not present.
Origin: upstream, 3.24.1, commit:c22d5ab9f6ae0782c2a472feb58f3b3acd5a03bc
Bug: https://gitlab.gnome.org/GNOME/gtk/issues/1316
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908120
---
modules/input/imwayland.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c
index 11d09d2..1fe95f3 100644
--- a/modules/input/imwayland.c
+++ b/modules/input/imwayland.c
@@ -654,7 +654,7 @@ gtk_im_context_wayland_focus_out (GtkIMContext *context)
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 (global, global->text_input, NULL, 0, 0);
text_input_preedit_apply (global);
global->current = NULL;

28
debian/patches/modules-Check-current-context-before-retrieving-surroundi.patch vendored
View File

@ -1,28 +0,0 @@
From: Carlos Garnacho <carlosg@gnome.org>
Date: Fri, 7 Sep 2018 16:54:13 +0200
Subject: modules: Check current context before retrieving surrounding
There may be situations where this might get called while the
currently focused context just went away (eg. after setting the
text widget unsensitive).
Bug: https://gitlab.gnome.org/GNOME/gtk/issues/1317
Origin: upstream, 3.24.1, commit:88dc784256289820fac148fc5c23d0ad92419881
---
modules/input/imwayland.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c
index 25144f3..7a9a604 100644
--- a/modules/input/imwayland.c
+++ b/modules/input/imwayland.c
@@ -121,6 +121,9 @@ notify_external_change (GtkIMContextWayland *context)
{
gboolean result;
+ if (!global->current)
+ return;
+
context->surrounding_change = ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_OTHER;
g_signal_emit_by_name (global->current, "retrieve-surrounding", &result);
}

6
debian/patches/series vendored
View File

@ -1,9 +1,3 @@
GtkApplication-Fix-CRITICAL-on-shutdown-when-register_ses.patch
Fix-portal-path-handling.patch
imwayland-Fix-clearing-of-preedit-text.patch
imwayland-Fix-clearing-of-preedit-text-in-webkitgtk.patch
modules-Check-current-context-before-retrieving-surroundi.patch
Add-a-missing-include.patch
016_no_offscreen_widgets_grabbing.patch
017_no_offscreen_device_grabbing.patch
018_gdkenumtypes.c_location.patch