From 28a5935b710cd2e138e5145747c071d82b8d583d Mon Sep 17 00:00:00 2001
From: David McKinney <mckinney@subgraph.com>
Date: Fri, 12 Feb 2021 10:23:10 -0500
Subject: [PATCH] Fixed mutter builds in Docker

- Fixed a dependency sourcing problem in meson build libmutter_dep
- Added xwayland to Dockerfile to pass mutter initfd meson checks
---
 ...ep-in-meson.build-for-Citadel-builds.patch | 21 +++++++++++++++++++
 .../recipes-gnome/mutter/mutter_3.38.3.bb     |  1 +
 scripts/docker/Dockerfile                     |  3 ++-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-Fix-libmutter_dep-in-meson.build-for-Citadel-builds.patch

diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-Fix-libmutter_dep-in-meson.build-for-Citadel-builds.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-Fix-libmutter_dep-in-meson.build-for-Citadel-builds.patch
new file mode 100644
index 0000000..20b0c88
--- /dev/null
+++ b/meta-gnome/recipes-gnome/mutter/mutter/0001-Fix-libmutter_dep-in-meson.build-for-Citadel-builds.patch
@@ -0,0 +1,21 @@
+From fa052377263464109035564b17cfa2aa76e35016 Mon Sep 17 00:00:00 2001
+From: David McKinney <mckinney@subgraph.com>
+Date: Fri, 12 Feb 2021 13:53:31 +0000
+Subject: [PATCH] Fix libmutter_dep in meson.build for Citadel builds
+
+---
+ src/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/meson.build b/src/meson.build
+index e7c99ca..8fe484e 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -955,6 +955,7 @@ libmutter = shared_library(libmutter_name,
+ libmutter_dep = declare_dependency(
+   link_with: libmutter,
+   include_directories: mutter_includes,
++  sources: mutter_built_sources,
+   dependencies: [
+     libmutter_cogl_dep,
+     libmutter_clutter_dep,
diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.38.3.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.38.3.bb
index 1a86705..8655cb5 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_3.38.3.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_3.38.3.bb
@@ -35,6 +35,7 @@ DEPENDS = " \
     gobject-introspection-native \
 "
 
+SRC_URI += " file://0001-Fix-libmutter_dep-in-meson.build-for-Citadel-builds.patch"
 RDEPENDS_${PN} += " xserver-xorg-xwayland zenity"
 
 GNOMEBASEBUILDCLASS = "meson"
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 5aab4f9..e2e8e4a 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -28,7 +28,8 @@ RUN apt update && apt install -y gawk \
     nano \
     sudo \
     debootstrap \
-    inkscape
+    inkscape \
+    xwayland
 
 # python
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen