- rely on xwayland.pc for Xwayland features detection

diff --git a/mutter-no-xwayland.patch b/mutter-no-xwayland.patch
deleted file mode 100644 (file)
index 18d61f7..0000000
--- a/mutter-no-xwayland.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- mutter-40.0/meson.build.orig       2021-04-04 18:15:31.375227070 +0200
-+++ mutter-40.0/meson.build    2021-04-04 18:55:31.768889688 +0200
-@@ -426,20 +426,17 @@
- 
-   # For Xwayland -initfd usage
-   use_initfd = get_option('xwayland_initfd')
--  if xwayland_dep.found()
--    xwayland_supports_initfd = xwayland_dep.get_pkgconfig_variable('have_initfd') == 'true'
--  else
--    xwayland_options = run_command(xwayland_path, '-help')
--    xwayland_supports_initfd = xwayland_options.stderr().contains('-initfd')
--  endif
--
-   if use_initfd.auto()
-+    if xwayland_dep.found()
-+      xwayland_supports_initfd = xwayland_dep.get_pkgconfig_variable('have_initfd') == 'true'
-+    else
-+      xwayland_options = run_command(xwayland_path, '-help')
-+      xwayland_supports_initfd = xwayland_options.stderr().contains('-initfd')
-+    endif
-+
-     have_xwayland_initfd = xwayland_supports_initfd
-   else
-     have_xwayland_initfd = use_initfd.enabled()
--    if have_xwayland_initfd and not xwayland_supports_initfd
--      error('XWayland -initfd support requested but not available')
--    endif
-   endif
- 
-   if (have_xwayland_initfd)

diff --git a/mutter.spec b/mutter.spec
index 890139310ebd86b05cfe9d0d9f176267b9104f85..7a7546acb67e128a167cd5cf04e82cc5e369783c 100644 (file)
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,4 +1,3 @@
-# TODO: use xorg-xserver-Xwayland-devel >= 21.1 instead of no-xwayland patch after finishing xorg-xserver-Xwayland.spec
 #
 # Conditional build
 %bcond_with    eglstream       # Wayland EGLStream support
@@ -15,8 +14,7 @@ License:      GPL v2+
 Group:         X11/Window Managers
 Source0:       https://download.gnome.org/sources/mutter/40/%{name}-%{version}.tar.xz
 # Source0-md5: 84beb760caa91baad7838260593e488a
-Patch0:                %{name}-no-xwayland.patch
-Patch1:                %{name}-deps.patch
+Patch0:                %{name}-deps.patch
 URL:           https://gitlab.gnome.org/GNOME/mutter
 BuildRequires: EGL-devel
 BuildRequires: OpenGL-GLX-devel
@@ -78,6 +76,7 @@ BuildRequires:        xorg-lib-libXtst-devel
 BuildRequires: xorg-lib-libxkbcommon-devel >= 0.4.3
 BuildRequires: xorg-lib-libxkbcommon-x11-devel >= 0.4.3
 BuildRequires: xorg-lib-libxkbfile-devel
+BuildRequires: xorg-xserver-Xwayland-devel >= 21.1
 BuildRequires: xz
 Requires(post,postun): glib2 >= 1:2.67.3
 Requires:      %{name}-libs = %{version}-%{release}
@@ -182,7 +181,6 @@ Mutter.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %meson build \
@@ -192,7 +190,6 @@ Mutter.
        -Dprofiler=%{__true_false sysprof} \
        %{!?with_pipewire:-Dremote_desktop=false} \
        -Dtests=%{__true_false tests} \
-       -Dxwayland_initfd=disabled \
        -Dxwayland_path=/usr/bin/Xwayland
 
 %ninja_build -C build