Rebase patches

Drop 022_disable-viqr-im-for-vi-locale.patch, upstream

debian/patches/016_no_offscreen_widgets_grabbing.patch

@@ -11,10 +11,10 @@ Forwarded: yes
  1 file changed, 5 insertions(+)
 
 diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
-index 12b5d66..61d15e8 100644
+index ca56f94..6f7c951 100644
 --- a/gtk/gtkmain.c
 +++ b/gtk/gtkmain.c
-@@ -2228,9 +2228,14 @@ gtk_grab_add (GtkWidget *widget)
+@@ -2230,9 +2230,14 @@ gtk_grab_add (GtkWidget *widget)
  {
    GtkWindowGroup *group;
    GtkWidget *old_grab_widget;

debian/patches/017_no_offscreen_device_grabbing.patch

@@ -10,10 +10,10 @@ Forwarded: yes
  1 file changed, 5 insertions(+)
 
 diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
-index 61d15e8..3ee7a80 100644
+index 6f7c951..7f60cf4 100644
 --- a/gtk/gtkmain.c
 +++ b/gtk/gtkmain.c
-@@ -2321,9 +2321,14 @@ gtk_device_grab_add (GtkWidget *widget,
+@@ -2323,9 +2323,14 @@ gtk_device_grab_add (GtkWidget *widget,
  {
    GtkWindowGroup *group;
    GtkWidget *old_grab_widget;

debian/patches/022_disable-viqr-im-for-vi-locale.patch

@@ -1,40 +0,0 @@
-From: Ming Hua <minghua@ubuntu.com>
-Date: Thu, 13 Mar 2008 18:09:25 -0500
-Subject: Do not use VIQR input method for vi locale by default
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-In the Vietnamese Quoted-Readable input method, punctuation following a
-base letter is converted into diacritical marks, for example a( → ă.
-(See <https://en.wikipedia.org/wiki/Vietnamese_Quoted-Readable>.)
-A 2008 bug report in Ubuntu argued that this is a problematic default,
-particularly when typing passwords, where the effect of the punctuation
-is non-obvious.
-
-According to the bug reporter, VIQR is popular with Vietnamese users
-living elsewhere in the world, where Vietnamese keyboards are unlikely
-to be readily available, but is not a popular choice within Vietnam,
-where the Telex or VNI input modes are preferred.
-
-[smcv: Add a summary of the Ubuntu bug]
-Bug-Debian: https://bugs.debian.org/895043
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gtk+2.0/+bug/191451
-Forwarded: no
----
- modules/input/imviqr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/input/imviqr.c b/modules/input/imviqr.c
-index d9572f5..bfa4462 100644
---- a/modules/input/imviqr.c
-+++ b/modules/input/imviqr.c
-@@ -242,7 +242,7 @@ static const GtkIMContextInfo viqr_info = {
-   NC_("input method menu", "Vietnamese (VIQR)"), /* Human readable name */
-   GETTEXT_PACKAGE,	   /* Translation domain */
-    GTK_LOCALEDIR,	   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
--  "vi"			   /* Languages for which this module is the default */
-+  ""			   /* Languages for which this module is the default */
- };
- 
- static const GtkIMContextInfo *info_list[] = {

debian/patches/demos-examples-tests-Don-t-distribute-built-files.patch

@@ -351,7 +351,7 @@ index 2ef0e55..57c54b2 100644
  resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/test-css-style.gresource.xml)
  
 diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
-index 859f674..a5bef27 100644
+index 843a515..b2ef0cf 100644
 --- a/testsuite/gtk/Makefile.am
 +++ b/testsuite/gtk/Makefile.am
 @@ -150,9 +150,11 @@ keyhash_CFLAGS =					\

debian/patches/gdk-Don-t-distribute-generated-files-in-tarballs.patch

@@ -17,7 +17,7 @@ Bug: https://gitlab.gnome.org/GNOME/gtk/issues/357
  1 file changed, 6 insertions(+), 23 deletions(-)
 
 diff --git a/gdk/Makefile.am b/gdk/Makefile.am
-index 6373e26..41af56d 100644
+index 479d6a1..bcaf272 100644
 --- a/gdk/Makefile.am
 +++ b/gdk/Makefile.am
 @@ -203,16 +203,8 @@ nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h
@@ -39,7 +39,7 @@ index 6373e26..41af56d 100644
  libgdk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
  libgdk_3_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
  libgdk_3_la_LDFLAGS = $(LDADD)
-@@ -417,10 +409,8 @@ endif
+@@ -412,10 +404,8 @@ endif
  
  lib_LTLIBRARIES = libgdk-3.la
  
@@ -52,7 +52,7 @@ index 6373e26..41af56d 100644
  
  install-exec-hook:
  if DISABLE_EXPLICIT_DEPS
-@@ -504,7 +494,7 @@ gdkresources.c: gdk.gresource.xml $(resource_files)
+@@ -499,7 +489,7 @@ gdkresources.c: gdk.gresource.xml $(resource_files)
  # ------------------- MSVC Build Items ----------------
  MSVCPROJS = gdk-3
  
@@ -61,7 +61,7 @@ index 6373e26..41af56d 100644
  gdk_3_EXCLUDES = dummy
  gdk_3_HEADERS_DIR = $(gdkincludedir)
  
-@@ -558,20 +548,13 @@ dist-hook: \
+@@ -553,20 +543,13 @@ dist-hook: \
  	$(top_builddir)/build/win32/vs9/gdk-3.headers	\
  	$(INTROSPECTION_INTERMEDIATE_ITEMS)
  

debian/patches/reftest-known-fail.patch

@@ -8,10 +8,10 @@ Forwarded: no
  1 file changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c
-index 6400b26..22d06c1 100644
+index 585e1c3..497c979 100644
 --- a/testsuite/reftests/gtk-reftest.c
 +++ b/testsuite/reftests/gtk-reftest.c
-@@ -257,6 +257,20 @@ save_image (cairo_surface_t *surface,
+@@ -260,6 +260,20 @@ save_image (cairo_surface_t *surface,
    g_free (filename);
  }
  
@@ -32,7 +32,7 @@ index 6400b26..22d06c1 100644
  static void
  test_ui_file (GFile *file)
  {
-@@ -289,7 +303,13 @@ test_ui_file (GFile *file)
+@@ -292,7 +306,13 @@ test_ui_file (GFile *file)
    if (diff_image)
      {
        save_image (diff_image, ui_file, ".diff.png");

debian/patches/series

@@ -3,7 +3,6 @@ gtk-Really-don-t-distribute-built-files.patch
 demos-examples-tests-Don-t-distribute-built-files.patch
 016_no_offscreen_widgets_grabbing.patch
 017_no_offscreen_device_grabbing.patch
-022_disable-viqr-im-for-vi-locale.patch
 060_ignore-random-icons.patch
 reftest-known-fail.patch
 Don-t-test-default-constructed-GdkPixbuf-properties.patch