From 6ff2a181bdd4fc11ee79ff1a36504d734fc67ae1 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 11 Dec 2019 17:48:24 +0100
Subject: [PATCH] ci: Install build deps for extra modules in Docker image

Rather than bringing build dependencies for gobject-introspection
and xdg-desktop-portal manually, install them in the Docker image.
---
 .gitlab-ci.yml               |  4 ----
 .gitlab-ci/fedora.Dockerfile | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 359c70cb7..fde3989c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,9 +126,6 @@ installed-tests:
   image: $FEDORA_IMAGE
   stage: build
   script:
-    # FIXME Install xdg-desktop-portal build deps before compiling glib,
-    # so it doesn't overwrite our own glib build
-    - sudo dnf install -y autoconf automake gettext-devel libtool diffutils fontconfig-devel json-glib-devel geoclue2-devel pipewire-devel fuse-devel make
     # dtrace is disabled because it breaks the static-link.py test
     - meson ${MESON_COMMON_OPTIONS}
             --werror
@@ -151,7 +148,6 @@ installed-tests:
     # FIXME install newer gobject-introspection
     # with GMemoryMonitor support, see:
     # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193
-    - sudo dnf install -y meson flex bison python3-devel
     - git clone --single-branch https://gitlab.gnome.org/GNOME/gobject-introspection.git
     - cd gobject-introspection
     - /usr/bin/meson _build --prefix=/usr --libdir=/usr/lib64
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index f4e8c5311..58cd224cd 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -54,6 +54,22 @@ RUN dnf -y install \
     xdg-desktop-portal \
     xz \
     zlib-devel \
+ && dnf -y install \
+    meson \
+    flex \
+    bison \
+    python3-devel \
+    autoconf \
+    automake \
+    gettext-devel \
+    libtool \
+    diffutils \
+    fontconfig-devel \
+    json-glib-devel \
+    geoclue2-devel \
+    pipewire-devel \
+    fuse-devel \
+    make \
  && dnf clean all
 
 RUN pip3 install meson==0.52.1