[packages/mutter] - added no-xwayland patch (don't require Xwayland binary at configure time)

qboosh qboosh at pld-linux.org
Thu Dec 3 21:34:17 CET 2020


commit 586b5247312c9fe4d09cd00fd9bd7b4732916038
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Dec 3 21:34:39 2020 +0100

    - added no-xwayland patch (don't require Xwayland binary at configure time)

 mutter-no-xwayland.patch | 18 ++++++++++++++++++
 mutter.spec              |  2 ++
 2 files changed, 20 insertions(+)
---
diff --git a/mutter.spec b/mutter.spec
index 52bda4d..3af74f3 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -14,6 +14,7 @@ License:	GPL v2+
 Group:		X11/Window Managers
 Source0:	https://download.gnome.org/sources/mutter/3.38/%{name}-%{version}.tar.xz
 # Source0-md5:	07307571f9f2bdb433894741222773e1
+Patch0:		%{name}-no-xwayland.patch
 URL:		https://gitlab.gnome.org/GNOME/mutter
 BuildRequires:	EGL-devel
 BuildRequires:	OpenGL-GLX-devel
@@ -177,6 +178,7 @@ Mutter.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson build \
diff --git a/mutter-no-xwayland.patch b/mutter-no-xwayland.patch
new file mode 100644
index 0000000..3d7ead0
--- /dev/null
+++ b/mutter-no-xwayland.patch
@@ -0,0 +1,18 @@
+--- mutter-3.38.2/meson.build.orig	2020-12-02 22:42:53.975304000 +0100
++++ mutter-3.38.2/meson.build	2020-12-03 21:29:37.119893722 +0100
+@@ -411,14 +411,11 @@
+ 
+   # For Xwayland -initfd usage
+   use_initfd = get_option('xwayland_initfd')
+-  xwayland_options = run_command(xwayland_path, '-help')
+   if use_initfd.auto()
++    xwayland_options = run_command(xwayland_path, '-help')
+     have_xwayland_initfd = xwayland_options.stderr().contains('-initfd')
+   else
+     have_xwayland_initfd = use_initfd.enabled()
+-    if have_xwayland_initfd and not xwayland_options.stderr().contains('-initfd')
+-      error('XWayland -initfd support requested but not available')
+-    endif
+   endif
+ 
+   if (have_xwayland_initfd)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mutter.git/commitdiff/586b5247312c9fe4d09cd00fd9bd7b4732916038



More information about the pld-cvs-commit mailing list