From f78b97ba4aeb5274d7f081d123790806afdf3c2b Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Wed, 12 Jan 2022 22:24:22 +0200
Subject: [PATCH] ci: stop installing gtk4 manually

It's now included in the base image we use.

https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/942
---
 .gitlab-ci.yml     |  7 +++----
 ci/install-gtk4.sh | 10 ----------
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 ci/install-gtk4.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1fe89da..eed4090e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,19 +43,19 @@ stages:
 .debian:11-stable:
   extends: .debian:11
   variables:
-    FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-${GST_RS_IMG_TAG}_2021-10-31.0'
+    FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-${GST_RS_IMG_TAG}_2022-01-12.0'
     FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/bullseye-slim:$GST_RS_STABLE-$GST_RS_IMG_TAG"
 
 .debian:11-msrv:
   extends: .debian:11
   variables:
-    FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-${GST_RS_IMG_TAG}_2021-10-31.0'
+    FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-${GST_RS_IMG_TAG}_2022-01-12.0'
     FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/bullseye-slim:$GST_RS_MSRV-$GST_RS_IMG_TAG"
 
 .debian:11-nightly:
   extends: .debian:11
   variables:
-    FDO_DISTRIBUTION_TAG: 'nightly-${GST_RS_IMG_TAG}_2021-10-31.0'
+    FDO_DISTRIBUTION_TAG: 'nightly-${GST_RS_IMG_TAG}_2022-01-12.0'
     FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/bullseye-slim:nightly-$GST_RS_IMG_TAG"
 
 .build-debian-container:
@@ -66,7 +66,6 @@ stages:
     FDO_DISTRIBUTION_PACKAGES: "libcsound64-dev llvm clang nasm libsodium-dev"
     FDO_DISTRIBUTION_EXEC: >-
       bash ci/install-dav1d.sh &&
-      bash ci/install-gtk4.sh &&
       apt clean &&
       bash ./ci/install-rust-ext.sh
   rules:
diff --git a/ci/install-gtk4.sh b/ci/install-gtk4.sh
deleted file mode 100644
index 0fee20d7..00000000
--- a/ci/install-gtk4.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-set -eux
-
-BRANCH=gtk-4-4
-
-git clone https://gitlab.gnome.org/GNOME/gtk.git --branch $BRANCH --depth=1
-cd gtk
-meson build -D prefix=/usr/local
-ninja -C build
-ninja -C build install
-cd ..