diff --git a/debian/changelog b/debian/changelog index acef412177..96c50e8c55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gtk+3.0 (3.22.29-2) UNRELEASED; urgency=medium + + * Refresh patch series through gbp-pq + - Harvest date and authorship information from debian/changelog + + -- Simon McVittie Wed, 21 Mar 2018 10:32:43 +0000 + gtk+3.0 (3.22.29-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/016_no_offscreen_widgets_grabbing.patch b/debian/patches/016_no_offscreen_widgets_grabbing.patch index 11148dfe88..fadc8c931f 100644 --- a/debian/patches/016_no_offscreen_widgets_grabbing.patch +++ b/debian/patches/016_no_offscreen_widgets_grabbing.patch @@ -1,13 +1,18 @@ -Description: Don't let offscreen widget do grabbing -Author: Cody Russell +From: Cody Russell +Date: Wed, 30 Nov 2011 00:25:29 +0100 +Subject: Don't let offscreen widget do grabbing + Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607668 Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427 +--- + gtk/gtkmain.c | 5 +++++ + 1 file changed, 5 insertions(+) -Index: b/gtk/gtkmain.c -=================================================================== +diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c +index 12b5d66..61d15e8 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c -@@ -2224,9 +2224,14 @@ +@@ -2228,9 +2228,14 @@ gtk_grab_add (GtkWidget *widget) { GtkWindowGroup *group; GtkWidget *old_grab_widget; diff --git a/debian/patches/017_no_offscreen_device_grabbing.patch b/debian/patches/017_no_offscreen_device_grabbing.patch index 79637271e2..82c8f124ce 100644 --- a/debian/patches/017_no_offscreen_device_grabbing.patch +++ b/debian/patches/017_no_offscreen_device_grabbing.patch @@ -1,13 +1,18 @@ -Description: Do not allow devices in an offscreen hierarchy to take grabs. -Author: Robert Carr +From: Robert Carr +Date: Wed, 30 Nov 2011 00:25:29 +0100 +Subject: Do not allow devices in an offscreen hierarchy to take grabs. + Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563 Bug-Ubuntu: https://launchpad.net/bugs/804009 +--- + gtk/gtkmain.c | 5 +++++ + 1 file changed, 5 insertions(+) -Index: b/gtk/gtkmain.c -=================================================================== +diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c +index 61d15e8..3ee7a80 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c -@@ -2317,9 +2317,14 @@ +@@ -2321,9 +2321,14 @@ gtk_device_grab_add (GtkWidget *widget, { GtkWindowGroup *group; GtkWidget *old_grab_widget; diff --git a/debian/patches/018_gdkenumtypes.c_location.patch b/debian/patches/018_gdkenumtypes.c_location.patch index 2a1c7379f8..90ec084519 100644 --- a/debian/patches/018_gdkenumtypes.c_location.patch +++ b/debian/patches/018_gdkenumtypes.c_location.patch @@ -1,7 +1,6 @@ -From 7785c99603e754d6c20a7923450d7a19eed0cd07 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 8 Sep 2011 09:14:02 +0200 -Subject: [PATCH] Consistently treat gdkenumtypes.[hc] as source files +Subject: Consistently treat gdkenumtypes.[hc] as source files Always generate gdk/gdkenumtypes.c in the source tree, and fix path in the introspection sources. With this, gdkenumtypes.c is correctly included with @@ -15,14 +14,14 @@ in the source tree. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=647729 Bug-Ubuntu: https://launchpad.net/bugs/769256 --- - gdk/Makefile.am | 17 +++++++---------- - 1 files changed, 7 insertions(+), 10 deletions(-) + gdk/Makefile.am | 17 +++++++---------- + 1 file changed, 7 insertions(+), 10 deletions(-) -Index: gtk+-3.21.6/gdk/Makefile.am -=================================================================== ---- gtk+-3.21.6.orig/gdk/Makefile.am 2016-09-14 04:19:48.808467198 +0200 -+++ gtk+-3.21.6/gdk/Makefile.am 2016-09-14 04:19:48.804467138 +0200 -@@ -243,8 +243,8 @@ +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index 573b197..4b41650 100644 +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am +@@ -243,8 +243,8 @@ if HAVE_INTROSPECTION introspection_files = \ $(filter-out gdkkeysyms-compat.h, $(gdk_h_sources)) \ $(gdk_c_sources) \ @@ -33,7 +32,7 @@ Index: gtk+-3.21.6/gdk/Makefile.am Gdk-3.0.gir: libgdk-3.la Makefile Gdk_3_0_gir_SCANNERFLAGS = \ -@@ -408,7 +408,7 @@ +@@ -408,7 +408,7 @@ endif lib_LTLIBRARIES = libgdk-3.la @@ -42,7 +41,7 @@ Index: gtk+-3.21.6/gdk/Makefile.am EXTRA_DIST += \ $(gdk_built_sources) \ fallback-c89.c -@@ -422,18 +422,15 @@ +@@ -422,18 +422,15 @@ BUILT_SOURCES = \ $(gdk_built_sources) \ gdkconfig.h diff --git a/debian/patches/022_disable-viqr-im-for-vi-locale.patch b/debian/patches/022_disable-viqr-im-for-vi-locale.patch index c9f1dab29c..3646684513 100644 --- a/debian/patches/022_disable-viqr-im-for-vi-locale.patch +++ b/debian/patches/022_disable-viqr-im-for-vi-locale.patch @@ -1,6 +1,16 @@ +From: Ubuntu Core Developers +Date: Tue, 3 Mar 2009 21:58:20 -0300 +Subject: Disable VIQR IM for vi locale + +--- + 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 @@ +@@ -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+") */ diff --git a/debian/patches/060_ignore-random-icons.patch b/debian/patches/060_ignore-random-icons.patch index f10686c39c..3b85054c64 100644 --- a/debian/patches/060_ignore-random-icons.patch +++ b/debian/patches/060_ignore-random-icons.patch @@ -1,8 +1,16 @@ -Index: b/gtk/updateiconcache.c -=================================================================== +From: Loic Minier +Date: Sun, 21 Oct 2007 22:05:42 +0200 +Subject: Don't list images from unknown directories in icon cache + +--- + gtk/updateiconcache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c +index b48eaca..6f76b6a 100644 --- a/gtk/updateiconcache.c +++ b/gtk/updateiconcache.c -@@ -676,7 +676,7 @@ +@@ -676,7 +676,7 @@ scan_directory (const gchar *base_path, directories = g_list_append (directories, g_strdup (subdir)); } else diff --git a/debian/patches/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch b/debian/patches/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch index 6562031507..8953713fa2 100644 --- a/debian/patches/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch +++ b/debian/patches/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch @@ -1,7 +1,6 @@ -From 1fb5f0aed9976437d8c9c82071efe9a447d73de1 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 20 Jan 2017 18:07:01 +0000 -Subject: [PATCH] gdk/x11: Check if we have access to GL before using GLX API +Subject: gdk/x11: Check if we have access to GL before using GLX API If the platform does not have access to libGL then any call to GL and GLX API through libepoxy will fail with an assertion. Until such time @@ -17,7 +16,7 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=847366 1 file changed, 26 insertions(+) diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c -index 0819f89648..d8ddf0fe19 100644 +index 0819f89..d8ddf0f 100644 --- a/gdk/x11/gdkglcontext-x11.c +++ b/gdk/x11/gdkglcontext-x11.c @@ -854,6 +854,32 @@ gdk_x11_screen_init_gl (GdkScreen *screen) @@ -53,6 +52,3 @@ index 0819f89648..d8ddf0fe19 100644 dpy = gdk_x11_display_get_xdisplay (display); if (!glXQueryExtension (dpy, &error_base, &event_base)) --- -2.11.0 - diff --git a/debian/patches/no-accessibility-dump.patch b/debian/patches/no-accessibility-dump.patch index 74e4f7c986..36e92c1674 100644 --- a/debian/patches/no-accessibility-dump.patch +++ b/debian/patches/no-accessibility-dump.patch @@ -1,16 +1,20 @@ From: Andreas Henriksson +Date: Wed, 23 Mar 2016 14:10:27 +0100 Subject: disable a11y test accessibility-dump Temporarily disable this test until someone figures out how to make it run with GTK_CSD=1 properly so it gives output matching the expected test data in all cases, not just for installed-tests. +--- + testsuite/a11y/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: gtk+-3.21.6/testsuite/a11y/Makefile.am -=================================================================== ---- gtk+-3.21.6.orig/testsuite/a11y/Makefile.am 2016-09-14 04:19:54.932561342 +0200 -+++ gtk+-3.21.6/testsuite/a11y/Makefile.am 2016-09-14 04:19:54.928561280 +0200 -@@ -28,7 +28,7 @@ +diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am +index c51e55e..fc1fe30 100644 +--- a/testsuite/a11y/Makefile.am ++++ b/testsuite/a11y/Makefile.am +@@ -28,7 +28,7 @@ TESTS_ENVIRONMENT = \ GTK_CSD=1 \ G_ENABLE_DIAGNOSTIC=0 diff --git a/debian/patches/reftest-known-fail.patch b/debian/patches/reftest-known-fail.patch index 9225fecf38..9347c59e35 100644 --- a/debian/patches/reftest-known-fail.patch +++ b/debian/patches/reftest-known-fail.patch @@ -1,8 +1,16 @@ -Index: gtk+-3.21.6/testsuite/reftests/gtk-reftest.c -=================================================================== ---- gtk+-3.21.6.orig/testsuite/reftests/gtk-reftest.c 2016-09-14 04:19:58.524616584 +0200 -+++ gtk+-3.21.6/testsuite/reftests/gtk-reftest.c 2016-09-14 04:19:58.524616584 +0200 -@@ -253,6 +253,20 @@ +From: Michael Biebl +Date: Mon, 2 May 2016 01:18:04 +0200 +Subject: Mark known failing tests as non-fatal + +--- + testsuite/reftests/gtk-reftest.c | 22 +++++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c +index 4930af8..69f906c 100644 +--- a/testsuite/reftests/gtk-reftest.c ++++ b/testsuite/reftests/gtk-reftest.c +@@ -253,6 +253,20 @@ save_image (cairo_surface_t *surface, g_free (filename); } @@ -23,7 +31,7 @@ Index: gtk+-3.21.6/testsuite/reftests/gtk-reftest.c static void test_ui_file (GFile *file) { -@@ -285,7 +299,13 @@ +@@ -285,7 +299,13 @@ test_ui_file (GFile *file) if (diff_image) { save_image (diff_image, ui_file, ".diff.png");