From 81b251055e39cb49fbf7645171abc51ef23fe6c5 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Fri, 22 May 2015 11:48:09 +0000 Subject: [PATCH] * debian/patches: + Refreshed. * debian/patches/notify-test-Don-t-test-object-relying-on-dbus-connec.patch: + Dropped, included upstream. --- debian/changelog | 4 +++ .../015_default-fallback-icon-theme.patch | 8 ++---- .../016_no_offscreen_widgets_grabbing.patch | 2 +- .../017_no_offscreen_device_grabbing.patch | 2 +- .../patches/018_gdkenumtypes.c_location.patch | 12 ++++---- ...t-test-object-relying-on-dbus-connec.patch | 28 ------------------- debian/patches/series | 1 - 7 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 debian/patches/notify-test-Don-t-test-object-relying-on-dbus-connec.patch diff --git a/debian/changelog b/debian/changelog index 4b3ca3b607..13b9d6b781 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,10 @@ gtk+3.0 (3.16.3-1) UNRELEASED; urgency=medium [ Emilio Pozuelo Monfort ] * New upstream release 3.16.3. + * debian/patches: + + Refreshed. + * debian/patches/notify-test-Don-t-test-object-relying-on-dbus-connec.patch: + + Dropped, included upstream. -- Sjoerd Simons Mon, 11 May 2015 16:45:40 +0200 diff --git a/debian/patches/015_default-fallback-icon-theme.patch b/debian/patches/015_default-fallback-icon-theme.patch index 653ec9719e..1a8fd78b19 100644 --- a/debian/patches/015_default-fallback-icon-theme.patch +++ b/debian/patches/015_default-fallback-icon-theme.patch @@ -1,8 +1,6 @@ -Index: gtk+-3.14.1/gtk/gtksettings.c -=================================================================== ---- gtk+-3.14.1.orig/gtk/gtksettings.c 2014-10-02 01:53:10.669684152 +0200 -+++ gtk+-3.14.1/gtk/gtksettings.c 2014-10-02 01:53:10.665684097 +0200 -@@ -456,7 +456,7 @@ +--- a/gtk/gtksettings.c ++++ b/gtk/gtksettings.c +@@ -460,7 +460,7 @@ g_param_spec_string ("gtk-fallback-icon-theme", P_("Fallback Icon Theme Name"), P_("Name of a icon theme to fall back to"), diff --git a/debian/patches/016_no_offscreen_widgets_grabbing.patch b/debian/patches/016_no_offscreen_widgets_grabbing.patch index 134cf07b44..f5011dfc55 100644 --- a/debian/patches/016_no_offscreen_widgets_grabbing.patch +++ b/debian/patches/016_no_offscreen_widgets_grabbing.patch @@ -5,7 +5,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c -@@ -2060,9 +2060,14 @@ +@@ -2068,9 +2068,14 @@ { 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 e7c5298fe8..415d9725f1 100644 --- a/debian/patches/017_no_offscreen_device_grabbing.patch +++ b/debian/patches/017_no_offscreen_device_grabbing.patch @@ -5,7 +5,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/804009 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c -@@ -2153,9 +2153,14 @@ +@@ -2161,9 +2161,14 @@ { 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 8e0751424d..e223f550fd 100644 --- a/debian/patches/018_gdkenumtypes.c_location.patch +++ b/debian/patches/018_gdkenumtypes.c_location.patch @@ -18,11 +18,9 @@ Bug-Ubuntu: https://launchpad.net/bugs/769256 gdk/Makefile.am | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) -Index: gtk+-3.14.0/gdk/Makefile.am -=================================================================== ---- gtk+-3.14.0.orig/gdk/Makefile.am 2014-09-23 19:07:27.472374097 +0200 -+++ gtk+-3.14.0/gdk/Makefile.am 2014-09-23 19:07:27.468374036 +0200 -@@ -206,8 +206,8 @@ +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am +@@ -217,8 +217,8 @@ introspection_files = \ $(filter-out gdkkeysyms-compat.h, $(gdk_h_sources)) \ $(gdk_c_sources) \ @@ -33,7 +31,7 @@ Index: gtk+-3.14.0/gdk/Makefile.am Gdk-3.0.gir: libgdk-3.la Makefile Gdk_3_0_gir_SCANNERFLAGS = \ -@@ -374,7 +374,7 @@ +@@ -385,7 +385,7 @@ lib_LTLIBRARIES = libgdk-3.la @@ -42,7 +40,7 @@ Index: gtk+-3.14.0/gdk/Makefile.am EXTRA_DIST += \ $(gdk_built_sources) \ fallback-c89.c -@@ -388,18 +388,15 @@ +@@ -399,18 +399,15 @@ $(gdk_built_sources) \ gdkconfig.h diff --git a/debian/patches/notify-test-Don-t-test-object-relying-on-dbus-connec.patch b/debian/patches/notify-test-Don-t-test-object-relying-on-dbus-connec.patch deleted file mode 100644 index e8168a06c9..0000000000 --- a/debian/patches/notify-test-Don-t-test-object-relying-on-dbus-connec.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dc2a33a0e3eaea4c8b5baca80ab5bcddadf19636 Mon Sep 17 00:00:00 2001 -From: Sjoerd Simons -Date: Wed, 6 May 2015 12:39:14 +0200 -Subject: [PATCH] notify test: Don't test object relying on dbus connections - -Don't test types that rely on a pre-existing dbus session bus. ---- - testsuite/gtk/notify.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c -index 002c207..1ae3ab6 100644 ---- a/testsuite/gtk/notify.c -+++ b/testsuite/gtk/notify.c -@@ -403,6 +403,10 @@ test_type (gconstpointer data) - g_type_is_a (type, GTK_TYPE_FILE_CHOOSER_WIDGET) || - g_type_is_a (type, GTK_TYPE_PLACES_SIDEBAR)) - return; -+ -+ /* These rely on a d-bus session bus */ -+ if (g_type_is_a (type, GTK_TYPE_MOUNT_OPERATION)) -+ return; - - klass = g_type_class_ref (type); - --- -2.1.4 - diff --git a/debian/patches/series b/debian/patches/series index 44ba4f4ea9..e1ccd47284 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,4 +11,3 @@ 061_multiarch_module_fallback.patch 071_fix-installation-of-HTML-images.patch reftest-known-fail.patch -notify-test-Don-t-test-object-relying-on-dbus-connec.patch