From f8bb992aaf65a641b24b06d0f7171c3792ea40fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Wed, 19 Jul 2023 10:03:37 +0300
Subject: [PATCH] ci: Don't install pango separately on Windows

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1298>
---
 ci/windows-docker/Dockerfile        |  3 +--
 ci/windows-docker/install_pango.ps1 | 27 ---------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 ci/windows-docker/install_pango.ps1

diff --git a/ci/windows-docker/Dockerfile b/ci/windows-docker/Dockerfile
index 2e7ba26d8..c951339a0 100644
--- a/ci/windows-docker/Dockerfile
+++ b/ci/windows-docker/Dockerfile
@@ -15,8 +15,7 @@ RUN choco install -y pkgconfiglite nasm llvm openssl
 RUN setx PATH '%PATH%;C:\Program Files\NASM;C:\gst-install\bin'
 ENV PKG_CONFIG_PATH="C:\gst-install\lib\pkgconfig"
 
-COPY install_pango.ps1 install_gst.ps1 install_gtk.ps1 install_dav1d.ps1 C:\
-RUN C:\install_pango.ps1
+COPY install_gst.ps1 install_gtk.ps1 install_dav1d.ps1 C:\
 RUN C:\install_gst.ps1
 RUN C:\install_gtk.ps1
 RUN C:\install_dav1d.ps1
diff --git a/ci/windows-docker/install_pango.ps1 b/ci/windows-docker/install_pango.ps1
deleted file mode 100644
index 259790e27..000000000
--- a/ci/windows-docker/install_pango.ps1
+++ /dev/null
@@ -1,27 +0,0 @@
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
-
-$env:MESON_ARGS = "--prefix=C:\gst-install\ -Dharfbuzz:freetype=enabled -Dfreetype:harfbuzz=disabled"
-
-# Download pango all its subprojects
-git clone -b main --depth 1 https://gitlab.gnome.org/gnome/pango.git C:\pango
-if (!$?) {
-  Write-Host "Failed to clone pango"
-  Exit 1
-}
-
-Set-Location C:\pango
-
-Write-Output "Building pango"
-cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson _build $env:MESON_ARGS && meson compile -C _build && ninja -C _build install"
-
-if (!$?) {
-  Write-Host "Failed to build and install pango"
-  Exit 1
-}
-
-cd C:\
-cmd /c rmdir /s /q  C:\pango
-if (!$?) {
-  Write-Host "Failed to remove gtk checkout"
-  Exit 1
-}