[libadwaita/wip/exalm/bump-gtk: 2/5] ci: Refresh the abi checker image

[Alexander Mikhaylenko <alexm src gnome org>]

commit b445cdefb2648a36e4e7453fd6c6abc291eb065b
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Sep 27 18:32:30 2021 +0500

    ci: Refresh the abi checker image
    
    Same way as docs, also remove the libabigail override.

 .gitlab-ci.yml                    |  2 +-
 .gitlab-ci/abi-checker.Dockerfile | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 568b2000..e11fb24a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
   MANIFEST_PATH: 'examples/org.gnome.Adwaita.Demo.json'
   FLATPAK_MODULE: 'libadwaita'
   FLATPAK_BUILD_DIR: build
-  ABI_CHECKER_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/abi-checker:v1"
+  ABI_CHECKER_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/abi-checker:v2"
   DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/docs:v2"
 
 stages:
diff --git a/.gitlab-ci/abi-checker.Dockerfile b/.gitlab-ci/abi-checker.Dockerfile
index 589f3e02..feef7570 100644
--- a/.gitlab-ci/abi-checker.Dockerfile
+++ b/.gitlab-ci/abi-checker.Dockerfile
@@ -1,19 +1,21 @@
-# See https://sourceware.org/bugzilla/show_bug.cgi?id=27267
-FROM fedora:33
+FROM fedora:34
 
 RUN dnf -y update \
  && dnf -y install \
-    @development-tools \
-    dnf-plugins-core \
-    gcc \
+    "dnf-command(builddep)" \
     git \
-    gobject-introspection \
-    gtk4-devel \
     libabigail \
-    meson \
-    redhat-rpm-config \
+    libjpeg-turbo-devel \
+    sassc \
     vala \
+ && sudo dnf -y build-dep gtk4 \
  && dnf clean all
 
-# See https://sourceware.org/bugzilla/show_bug.cgi?id=27269
-RUN rpm -Uvh --oldpackage 
https://kojipkgs.fedoraproject.org//packages/libabigail/1.7/2.fc33/x86_64/libabigail-1.7-2.fc33.x86_64.rpm
+RUN git clone https://gitlab.gnome.org/GNOME/gtk.git --depth=1 \
+ && cd gtk \
+ && meson build --prefix=/usr \
+ && cd build \
+ && ninja \
+ && sudo ninja install \
+ && cd ../.. \
+ && rm -rf gtk