[glib/wip/hadess/update-docker-packages: 3/5] ci: Install build deps for extra modules in Docker image

[Philip Withnall <pwithnall src gnome org>]

commit 0c3df0a7f89765fd9658b666a61b75c99dde8d50
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Dec 11 17:48:24 2019 +0100

    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 | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d51be9241..19e485c93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,9 +104,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
@@ -129,7 +126,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 35190b06a..84095b043 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -53,6 +53,10 @@ RUN dnf -y install \
     xdg-desktop-portal \
     xz \
     zlib-devel \
+ && dnf -y install 'dnf-command(builddep)' \
+ && dnf -y builddep \
+    xdg-desktop-portal \
+    gobject-introspection \
  && dnf clean all
 
 RUN pip3 install meson==0.49.2