PR#1: Add patch to avoid XWayland crash - rpms/xorg-x11-server

Stephen Gallagher • 5 years ago

d308d41

bz1616269-xwayland-crash.patch

file added

+16

		`@@ -0,0 +1,16 @@`
		`+ diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c`
		`+ index 81e0eb9ce..316e04443 100644`
		`+ --- a/hw/xwayland/xwayland-present.c`
		`+ +++ b/hw/xwayland/xwayland-present.c`
		`+ @@ -147,6 +147,11 @@ xwl_present_cleanup(WindowPtr window)`
		`+ /* Clear timer */`
		`+ xwl_present_free_timer(xwl_present_window);`
		`+`
		`+ + /* Remove from privates so we don't try to access it later */`
		`+ + dixSetPrivate(&window->devPrivates,`
		`+ + &xwl_present_window_private_key,`
		`+ + NULL);`
		`+ +`
		`+ free(xwl_present_window);`
		`+ }`
		`+`

xorg-x11-server.spec

file modified

+8 -1

		`@@ -46,7 +46,7 @@`
		`Summary: X.Org X11 X server`
		`Name: xorg-x11-server`
		`Version: 1.20.1`
		`- Release: 1%{?gitdate:.%{gitdate}}%{dist}`
		`+ Release: 2%{?gitdate:.%{gitdate}}%{dist}`
		`URL: http://www.x.org`
		`License: MIT`
		`Group: User Interface/X`
		`@@ -94,6 +94,10 @@`
		`# because the display-managers are not ready yet, do not upstream`
		`Patch6: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch`

		`+ # Fix crash on window-close in XWayland`
		`+ # BZ #1616269`
		`+ Patch7: bz1616269-xwayland-crash.patch`
		`+`
		`BuildRequires: systemtap-sdt-devel`
		`BuildRequires: git`
		`BuildRequires: automake autoconf libtool pkgconfig`
		`@@ -523,6 +527,9 @@`


		`%changelog`
		`+ * Thu Sep 06 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.20.1-2`
		`+ - Fix XWayland crash on window cleanup`
		`+`
		`* Thu Aug 09 2018 Adam Jackson <ajax@redhat.com> - 1.20.1-1`
		`- xserver 1.20.1`