Backport fix to not abort when the Wayland connection is lost
https://bugzilla.redhat.com/show_bug.cgi?id=1258818
This commit is contained in:
parent
844fe95f78
commit
7cac6f273d
@ -0,0 +1,38 @@
|
|||||||
|
From 425e4df1006cf15e91813797932cef462805e50c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Debarshi Ray <debarshir@gnome.org>
|
||||||
|
Date: Wed, 24 May 2017 16:08:07 +0200
|
||||||
|
Subject: [PATCH] wayland: Don't abort when preparing the source if connection
|
||||||
|
is lost
|
||||||
|
|
||||||
|
Aborting the application makes it look like an application bug, when
|
||||||
|
it is the expected thing to do when the Wayland display server goes
|
||||||
|
way. eg., when the user logs out. The log level is also demoted to
|
||||||
|
avoid a storm of warnings in the log from all applications whenever
|
||||||
|
this happens.
|
||||||
|
|
||||||
|
This is also what the X11 backend does (see gdk_x_io_error).
|
||||||
|
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=783047
|
||||||
|
---
|
||||||
|
gdk/wayland/gdkeventsource.c | 5 ++++-
|
||||||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/gdk/wayland/gdkeventsource.c b/gdk/wayland/gdkeventsource.c
|
||||||
|
index 142091733b92..bdb4c80e1eee 100644
|
||||||
|
--- a/gdk/wayland/gdkeventsource.c
|
||||||
|
+++ b/gdk/wayland/gdkeventsource.c
|
||||||
|
@@ -63,7 +63,10 @@ gdk_event_source_prepare (GSource *base,
|
||||||
|
source->reading = TRUE;
|
||||||
|
|
||||||
|
if (wl_display_flush (display->wl_display) < 0)
|
||||||
|
- g_error ("Error flushing display: %s", g_strerror (errno));
|
||||||
|
+ {
|
||||||
|
+ g_message ("Error flushing display: %s", g_strerror (errno));
|
||||||
|
+ _exit (1);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.9.4
|
||||||
|
|
@ -19,13 +19,16 @@
|
|||||||
|
|
||||||
Name: gtk3
|
Name: gtk3
|
||||||
Version: 3.22.15
|
Version: 3.22.15
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
|
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.gtk.org
|
URL: http://www.gtk.org
|
||||||
Source0: http://download.gnome.org/sources/gtk+/3.22/gtk+-%{version}.tar.xz
|
Source0: http://download.gnome.org/sources/gtk+/3.22/gtk+-%{version}.tar.xz
|
||||||
|
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1258818
|
||||||
|
Patch0: gtk3-wayland-Don-t-abort-when-preparing-the-source-if-con.patch
|
||||||
|
|
||||||
BuildRequires: pkgconfig(atk) >= %{atk_version}
|
BuildRequires: pkgconfig(atk) >= %{atk_version}
|
||||||
BuildRequires: pkgconfig(atk-bridge-2.0)
|
BuildRequires: pkgconfig(atk-bridge-2.0)
|
||||||
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
||||||
@ -163,6 +166,7 @@ the functionality of the installed %{name} package.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n gtk+-%{version}
|
%setup -q -n gtk+-%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS='-fno-strict-aliasing %optflags'
|
export CFLAGS='-fno-strict-aliasing %optflags'
|
||||||
@ -335,6 +339,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
|
|||||||
%{_datadir}/installed-tests
|
%{_datadir}/installed-tests
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 25 2017 Debarshi Ray <rishi@fedoraproject.org> - 3.22.15-2
|
||||||
|
- Backport fix to not abort when the Wayland connection is lost (RH #1258818)
|
||||||
|
|
||||||
* Fri May 12 2017 Kalev Lember <klember@redhat.com> - 3.22.15-1
|
* Fri May 12 2017 Kalev Lember <klember@redhat.com> - 3.22.15-1
|
||||||
- Update to 3.22.15
|
- Update to 3.22.15
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user