ci: Don't use builddep to install Wayland build dependencies

We don't want to bring undefined dependencies into the image.

Additionally, Wayland depends on Meson, and we don't want to use
Fedora's version of Meson.

diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 2f76b4f9d392dbe0a29b175365d5e94d4289e77c..4b61ed0e9ac73dc71948f5867fba6494f2616dda 100644 (file)
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -18,7 +18,9 @@ RUN dnf -y install \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
     diffutils \
+    docbook-style-xsl \
     elfutils-libelf-devel \
+    expat-devel \
     fribidi-devel \
     gcc \
     gcc-c++ \
@@ -31,6 +33,7 @@ RUN dnf -y install \
     glibc-devel \
     glibc-headers \
     gnome-desktop-testing \
+    gnupg2 \
     gobject-introspection-devel \
     graphene-devel \
     graphviz \
@@ -70,7 +73,6 @@ RUN dnf -y install \
     mesa-dri-drivers \
     mesa-libEGL-devel \
     mesa-libGLES-devel \
-    meson \
     ninja-build \
     pango-devel \
     pcre-devel \
@@ -93,8 +95,6 @@ RUN dnf -y install \
     weston-libs \
     which \
     xorg-x11-server-Xvfb \
- && dnf install -y 'dnf-command(builddep)' \
- && dnf builddep -y wayland \
  && dnf clean all
 
 # Enable sudo for wheel users