From 91c075d8848877ebee030d79f9ece3dab6562f27 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 24 Jan 2023 17:10:12 +0000 Subject: [PATCH] d/patches: Add notes on upstream rejection of !5301 --- ...gdk-wayland-save-custom-xdg-activation-startup_id.patch | 6 +++--- ...indow-focus-on-window-show-for-wayland-activation.patch | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/patches/gdk-wayland-save-custom-xdg-activation-startup_id.patch b/debian/patches/gdk-wayland-save-custom-xdg-activation-startup_id.patch index 101157f0d5..0764693706 100644 --- a/debian/patches/gdk-wayland-save-custom-xdg-activation-startup_id.patch +++ b/debian/patches/gdk-wayland-save-custom-xdg-activation-startup_id.patch @@ -9,11 +9,11 @@ later when presenting the window. Needed for activation of gnome-terminal (also needs patches on the application side, see https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7952). -Fixes #5386 - Signed-off-by: Joan Bruguera -https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5301 +Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5386 +Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5301 +Applied-upstream: no, rejected in https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5302#note_1622250 --- gdk/wayland/gdkdisplay-wayland.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/patches/window-focus-on-window-show-for-wayland-activation.patch b/debian/patches/window-focus-on-window-show-for-wayland-activation.patch index de188bea61..b9115b1d96 100644 --- a/debian/patches/window-focus-on-window-show-for-wayland-activation.patch +++ b/debian/patches/window-focus-on-window-show-for-wayland-activation.patch @@ -9,11 +9,10 @@ This supersedes 5dca6dce91b4413064c858ae011ea7b1e33421e2, which misses the case where the window is shown with gtk_widget_show instead of gtk_window_present. Note 5dca6dce91 was also accidentally missing on the xdg-activation GTK3 port. -Fixes #5386 - Signed-off-by: Joan Bruguera - -https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5301 +Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5386 +Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5301 +Applied-upstream: no, rejected in https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5302#note_1622250 --- gtk/gtkwindow.c | 10 ++++++++++ 1 file changed, 10 insertions(+)