From b3b86894e9a8574054ecb0fe8ef32239c8a1e3c8 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Mon, 13 Dec 2021 15:44:53 -0300
Subject: [PATCH] ci: Update image with new GTK4 dependencies

Build gnome-bluetooth, gnome-desktop, and colord-gtk from
their master/main branches, which should include support for
GTK4.
---
 .gitlab-ci.yml | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa8874c04..5af2df165 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 include:
- - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/5888c7388134cbe4661600222fe9befb10441f6e/templates/fedora.yml'
+ - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34f4ade99434043f88e164933f570301fd18b125/templates/fedora.yml'
 
 variables:
   FDO_UPSTREAM_REPO: gnome/gnome-control-center
@@ -47,7 +47,7 @@ stages:
     # stable branch.
     # Could probably also switch away from rawhide,
     # to stable fedora branch as well.
-    FDO_DISTRIBUTION_TAG: '2021-07-22.0-main'
+    FDO_DISTRIBUTION_TAG: '2021-12-14.0-main'
     FDO_DISTRIBUTION_VERSION: rawhide
 
 #############################################
@@ -92,11 +92,14 @@ build.container.fedora@x86_64:
       gsettings-desktop-schemas-devel
       gsound-devel
       gtk3-devel ibus-devel
+      gtk4-devel
       intltool
+      libadwaita-devel
       libcanberra-devel
       libgtop2-devel
       libgudev-devel
       libnma-devel
+      libnotify-devel
       libpwquality-devel
       libsmbclient-devel
       libsoup-devel
@@ -121,6 +124,30 @@ build.container.fedora@x86_64:
         meson . _build --prefix=/usr && \
         ninja -C _build && \
         ninja -C _build install && \
+        cd .. && \
+      git clone https://gitlab.gnome.org/GNOME/gnome-desktop.git && \
+        cd gnome-desktop && \
+        meson . _build --prefix=/usr -Ddesktop_docs=false && \
+        ninja -C _build && \
+        ninja -C _build install && \
+        cd .. && \
+      git clone https://gitlab.gnome.org/GNOME/gnome-bluetooth.git && \
+        cd gnome-bluetooth && \
+        meson . _build --prefix=/usr -Dsendto=false && \
+        ninja -C _build && \
+        ninja -C _build install && \
+        cd .. && \
+      git clone https://gitlab.gnome.org/GNOME/libnma.git && \
+        cd libnma && \
+        meson . _build --prefix=/usr -Dlibnma_gtk4=true -Dmobile_broadband_provider_info=false -Dgcr=false -Dgtk_doc=false && \
+        ninja -C _build && \
+        ninja -C _build install && \
+        cd .. && \
+      git clone https://github.com/hughsie/colord-gtk.git && \
+        cd colord-gtk && \
+        meson . _build --prefix=/usr -Dgtk4=true -Ddocs=false -Dtests=false -Dman=false && \
+        ninja -C _build && \
+        ninja -C _build install && \
         cd ..
 
 ##