From e89dc3ed4cac753eeff25335af9b5f387e5b33e2 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Wed, 12 Dec 2018 16:12:40 -0500 Subject: [PATCH] Drop patches applied in new release: - wayland-Avoid-crashes-inside-wl_proxy_marshal.patch - Force-emoji-presentation.patch - emojichooser-Pass-chooser-to-add_emoji.patch Gbp-Dch: Full --- debian/patches/Force-emoji-presentation.patch | 40 ------------------- ...he-used-cursor-size-if-0-in-Settings.patch | 40 ------------------- ...ojichooser-Pass-chooser-to-add_emoji.patch | 26 ------------ debian/patches/series | 4 -- ...void-crashes-inside-wl_proxy_marshal.patch | 29 -------------- 5 files changed, 139 deletions(-) delete mode 100644 debian/patches/Force-emoji-presentation.patch delete mode 100644 debian/patches/Tooltip-Fix-the-used-cursor-size-if-0-in-Settings.patch delete mode 100644 debian/patches/emojichooser-Pass-chooser-to-add_emoji.patch delete mode 100644 debian/patches/wayland-Avoid-crashes-inside-wl_proxy_marshal.patch diff --git a/debian/patches/Force-emoji-presentation.patch b/debian/patches/Force-emoji-presentation.patch deleted file mode 100644 index fda2536093..0000000000 --- a/debian/patches/Force-emoji-presentation.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Matthias Clasen -Date: Tue, 27 Nov 2018 18:16:43 -0500 -Subject: Force emoji presentation - -Append a variation selector to the Emoji sequences, -to force Emoji presentation. Without this, some -Emoji come out with text presentation by default. - -Closes: Pango #334 -(cherry picked from commit aac38198a3f5636c84033337c16df374f410b1e9 -and commit b74e3209a5af03678ade12bfe6936171ff204b8c) ---- - gtk/gtkemojichooser.c | 1 + - gtk/gtkemojicompletion.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c -index b2c161e..b423f80 100644 ---- a/gtk/gtkemojichooser.c -+++ b/gtk/gtkemojichooser.c -@@ -392,6 +392,7 @@ add_emoji (GtkWidget *box, - p += g_unichar_to_utf8 (code, p); - } - g_variant_unref (codes); -+ p += g_unichar_to_utf8 (0xFE0F, p); /* U+FE0F is the Emoji variation selector */ - p[0] = 0; - - label = gtk_label_new (text); -diff --git a/gtk/gtkemojicompletion.c b/gtk/gtkemojicompletion.c -index 434047f..0a84400 100644 ---- a/gtk/gtkemojicompletion.c -+++ b/gtk/gtkemojicompletion.c -@@ -474,6 +474,7 @@ get_text (GVariant *emoji_data, - p += g_unichar_to_utf8 (code, p); - } - g_variant_unref (codes); -+ p += g_unichar_to_utf8 (0xFE0F, p); /* U+FE0F is the Emoji variation selector */ - p[0] = 0; - } - diff --git a/debian/patches/Tooltip-Fix-the-used-cursor-size-if-0-in-Settings.patch b/debian/patches/Tooltip-Fix-the-used-cursor-size-if-0-in-Settings.patch deleted file mode 100644 index 0d0991b94a..0000000000 --- a/debian/patches/Tooltip-Fix-the-used-cursor-size-if-0-in-Settings.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Daniel Boles -Date: Sun, 7 Oct 2018 18:15:09 +0100 -Subject: Tooltip: Fix the used cursor size if 0 in Settings - -Before the recent rework of positioning in GtkTooltip, the widget always -used the cursor_size of the GdkDisplay. That work redid this to instead -take GtkSettings::gtk-cursor-theme-size. But that property's doc says: - -> Size to use for cursors, or 0 to use the default size. - -and has 0 as its default. This is quite a likely scenario for anyone -whose desktop or settings.ini does not explicitly provide a cursor size, -which is the case for XFCE and win32, to name just two common platforms. - -Then, it seems getting a cursor_size of 0 causes GtkTooltip to freak out -and hide/show itself at a very rapid speed, thus making it unusable. - -So, we should check whether the Settings return 0 and, if so, still use -gdk_display_get_default_cursor_size (display) to ensure we get a size. - -https://gitlab.gnome.org/GNOME/gtk/issues/1371 -(cherry picked from commit 9b7d886b723132eade2e76f3fd179cf81b7601f2) ---- - gtk/gtktooltip.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c -index f915662..e5fc5db 100644 ---- a/gtk/gtktooltip.c -+++ b/gtk/gtktooltip.c -@@ -898,6 +898,9 @@ gtk_tooltip_position (GtkTooltip *tooltip, - "gtk-cursor-theme-size", &cursor_size, - NULL); - -+ if (cursor_size == 0) -+ cursor_size = gdk_display_get_default_cursor_size (display); -+ - if (device) - anchor_rect_padding = MAX (4, cursor_size - 32); - else diff --git a/debian/patches/emojichooser-Pass-chooser-to-add_emoji.patch b/debian/patches/emojichooser-Pass-chooser-to-add_emoji.patch deleted file mode 100644 index cdbd5edfb4..0000000000 --- a/debian/patches/emojichooser-Pass-chooser-to-add_emoji.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: =?utf-8?q?Timm_B=C3=A4der?= -Date: Thu, 11 Oct 2018 12:27:17 +0200 -Subject: emojichooser: Pass chooser to add_emoji - -https://gitlab.gnome.org/GNOME/gtk/issues/1398 -(cherry picked from commit dbbc7b3859f4b5d504cc12a54b2eba40e040c7e8) ---- - gtk/gtkemojichooser.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c -index b423f80..6efb056 100644 ---- a/gtk/gtkemojichooser.c -+++ b/gtk/gtkemojichooser.c -@@ -302,9 +302,9 @@ show_variations (GtkEmojiChooser *chooser, - - g_signal_connect (box, "child-activated", G_CALLBACK (emoji_activated), parent_popover); - -- add_emoji (box, FALSE, emoji_data, 0, NULL); -+ add_emoji (box, FALSE, emoji_data, 0, chooser); - for (modifier = 0x1f3fb; modifier <= 0x1f3ff; modifier++) -- add_emoji (box, FALSE, emoji_data, modifier, NULL); -+ add_emoji (box, FALSE, emoji_data, modifier, chooser); - - gtk_widget_show_all (view); - gtk_popover_popup (GTK_POPOVER (popover)); diff --git a/debian/patches/series b/debian/patches/series index 78845ff162..5377712ea3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -wayland-Avoid-crashes-inside-wl_proxy_marshal.patch 016_no_offscreen_widgets_grabbing.patch 017_no_offscreen_device_grabbing.patch 018_gdkenumtypes.c_location.patch @@ -6,6 +5,3 @@ wayland-Avoid-crashes-inside-wl_proxy_marshal.patch 060_ignore-random-icons.patch reftest-known-fail.patch Don-t-test-default-constructed-GdkPixbuf-properties.patch -Force-emoji-presentation.patch -emojichooser-Pass-chooser-to-add_emoji.patch -Tooltip-Fix-the-used-cursor-size-if-0-in-Settings.patch diff --git a/debian/patches/wayland-Avoid-crashes-inside-wl_proxy_marshal.patch b/debian/patches/wayland-Avoid-crashes-inside-wl_proxy_marshal.patch deleted file mode 100644 index 9cf12e4b0a..0000000000 --- a/debian/patches/wayland-Avoid-crashes-inside-wl_proxy_marshal.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Michael Catanzaro -Date: Mon, 24 Sep 2018 20:19:26 +0000 -Subject: wayland: Avoid crashes inside wl_proxy_marshal() - -Suggested by Garnacho. Hopefully fixes #1349. - -Note: I'm riskily committing this via web UI not because I'm lazy -(though I am :) but because I'm seeing a weird host key when I try to -push or pull from GitLab. - -Origin: upstream, 3.24.2, commit:b4464e12742767a3dc08317371d665854286355f ---- - gdk/wayland/gdkwindow-wayland.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c -index 5f16277..a5f9d44 100644 ---- a/gdk/wayland/gdkwindow-wayland.c -+++ b/gdk/wayland/gdkwindow-wayland.c -@@ -932,6 +932,9 @@ gdk_window_impl_wayland_end_paint (GdkWindow *window) - cairo_rectangle_int_t rect; - int i, n; - -+ if (!GDK_WINDOW_IS_MAPPED (window)) -+ return; -+ - if (impl->staging_cairo_surface && - _gdk_wayland_is_shm_surface (impl->staging_cairo_surface) && - !window->current_paint.use_gl &&