[gnome-continuous] Untag the X server

[Emmanuele Bassi <ebassi src gnome org>]

commit afe0a516368d49a1a3059d7e58d6d9ce0e05a91f
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Sep 13 11:27:52 2018 +0100

    Untag the X server
    
    Upstream fix in a56da0ff2814f86af08668610327082b8e2f4308.
    
    Move the Meson as well, while we're at it.

 manifest.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index e5c1f2b..d098d6f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -374,11 +374,8 @@
                 "patches": ["xorg-xcb-util-keysyms-autogen.patch"]},
 
                {"src": "fd:xorg/xserver",
-                 "tag": "ba0f5d854f4db52974ab5cd09191303b01b075ff",
-                 "tag-reason": "Build failure",
-                 "force-autotools": true,
-                "config-opts": ["--enable-xwayland",
-                                "--enable-glamor"]},
+                "config-opts": ["-Dxwayland=true",
+                                "-Dglamor=true"]},
 
                {"src": "fd:xcb/util"},