diff -pruN 3.24.0-1/debian/changelog 3.24.0-2/debian/changelog --- 3.24.0-1/debian/changelog 2018-09-04 17:10:53.000000000 +0000 +++ 3.24.0-2/debian/changelog 2018-09-10 00:15:53.000000000 +0000 @@ -1,3 +1,19 @@ +gtk+3.0 (3.24.0-2) unstable; urgency=medium + + * Team upload + * d/p/Revert-imwayland-clear-preedit-on-focus-out.patch: + Revert an upstream change that caused the cursor to disappear on + focus changes in vte terminals like gnome-terminal and lxterminal + under Wayland (Closes: #908120) + * debian/libgtk-3-0.symbols: gtk_color_picker_kwin_new() is new in + 3.24.0, not 3.24.3 which doesn't exist yet + * d/p/Don-t-test-default-constructed-GdkPixbuf-properties.patch: + Work around a gdk-pixbuf bug that caused test failures + (Closes: #908439) + * d/gbp.conf: Don't number patches + + -- Simon McVittie Mon, 10 Sep 2018 01:15:53 +0100 + gtk+3.0 (3.24.0-1) unstable; urgency=medium [ Simon McVittie ] diff -pruN 3.24.0-1/debian/gbp.conf 3.24.0-2/debian/gbp.conf --- 3.24.0-1/debian/gbp.conf 2018-09-04 17:10:53.000000000 +0000 +++ 3.24.0-2/debian/gbp.conf 2018-09-10 00:15:53.000000000 +0000 @@ -3,3 +3,4 @@ pristine-tar = True debian-branch = debian/master upstream-branch = upstream/latest upstream-vcs-tag = %(version)s +patch-numbers = False diff -pruN 3.24.0-1/debian/libgtk-3-0.symbols 3.24.0-2/debian/libgtk-3-0.symbols --- 3.24.0-1/debian/libgtk-3-0.symbols 2018-09-04 17:10:53.000000000 +0000 +++ 3.24.0-2/debian/libgtk-3-0.symbols 2018-09-10 00:15:53.000000000 +0000 @@ -1433,7 +1433,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_color_chooser_widget_get_type@Base 3.3.16 gtk_color_chooser_widget_new@Base 3.3.16 gtk_color_picker_get_type@Base 3.23.2 - gtk_color_picker_kwin_new@Base 3.24.3 + gtk_color_picker_kwin_new@Base 3.24.0 gtk_color_picker_new@Base 3.23.2 gtk_color_picker_pick@Base 3.23.2 gtk_color_picker_pick_finish@Base 3.23.2 diff -pruN 3.24.0-1/debian/patches/Don-t-test-default-constructed-GdkPixbuf-properties.patch 3.24.0-2/debian/patches/Don-t-test-default-constructed-GdkPixbuf-properties.patch --- 3.24.0-1/debian/patches/Don-t-test-default-constructed-GdkPixbuf-properties.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.24.0-2/debian/patches/Don-t-test-default-constructed-GdkPixbuf-properties.patch 2018-09-10 00:15:53.000000000 +0000 @@ -0,0 +1,27 @@ +From: Simon McVittie +Date: Mon, 10 Sep 2018 01:09:35 +0100 +Subject: Don't test default-constructed GdkPixbuf properties + +Workaround for https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues/91 + +Bug: https://bugs.debian.org/908439 +Forwarded: no +--- + testsuite/gtk/defaultvalue.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c +index d3afbb3..835c85e 100644 +--- a/testsuite/gtk/defaultvalue.c ++++ b/testsuite/gtk/defaultvalue.c +@@ -484,6 +484,10 @@ main (int argc, char **argv) + if (otypes[i] == GTK_TYPE_FILE_CHOOSER_NATIVE) + continue; + ++ /* https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues/91 */ ++ if (otypes[i] == GDK_TYPE_PIXBUF) ++ continue; ++ + testname = g_strdup_printf ("/Default Values/%s", + g_type_name (otypes[i])); + g_test_add_data_func (testname, diff -pruN 3.24.0-1/debian/patches/Revert-imwayland-clear-preedit-on-focus-out.patch 3.24.0-2/debian/patches/Revert-imwayland-clear-preedit-on-focus-out.patch --- 3.24.0-1/debian/patches/Revert-imwayland-clear-preedit-on-focus-out.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.24.0-2/debian/patches/Revert-imwayland-clear-preedit-on-focus-out.patch 2018-09-10 00:15:53.000000000 +0000 @@ -0,0 +1,60 @@ +From: Simon McVittie +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 -pruN 3.24.0-1/debian/patches/series 3.24.0-2/debian/patches/series --- 3.24.0-1/debian/patches/series 2018-09-04 17:10:53.000000000 +0000 +++ 3.24.0-2/debian/patches/series 2018-09-10 00:15:53.000000000 +0000 @@ -5,3 +5,5 @@ 060_ignore-random-icons.patch no-accessibility-dump.patch reftest-known-fail.patch +Revert-imwayland-clear-preedit-on-focus-out.patch +Don-t-test-default-constructed-GdkPixbuf-properties.patch