From 895acdf7c7ac128cc1540fa251f772323f0042e8 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaled@aliftype.com>
Date: Wed, 23 Jun 2021 14:53:28 +0200
Subject: [PATCH] =?UTF-8?q?[ci]=20Don=E2=80=99t=20build=20Cairo=20subproje?=
 =?UTF-8?q?ct=20with=20FontConfig=20on=20win32=20cross-build?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don’t need it and it breaks the build because FontConfig renamed its
master branch and the released version of Cairo wants to build
FontConfig from master branch.
---
 .ci/build-win32.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.ci/build-win32.sh b/.ci/build-win32.sh
index 65265ec9a..39ed42cb3 100755
--- a/.ci/build-win32.sh
+++ b/.ci/build-win32.sh
@@ -1,8 +1,20 @@
 #!/bin/bash
 set -e
 
-meson --cross-file=.ci/win32-cross-file.txt win32build --wrap-mode=forcefallback -Dtests=disabled \
-	-Dglib=enabled -Dfreetype=enabled -Dgdi=enabled -Ddirectwrite=enabled -Dcairo=enabled --buildtype=release $@
+meson 	--cross-file=.ci/win32-cross-file.txt \
+	--wrap-mode=forcefallback \
+	--buildtype=release \
+	-Dtests=disabled \
+	-Dcairo=enabled \
+	-Dcairo:fontconfig=disabled \
+	-Dglib=enabled \
+	-Dfreetype=enabled \
+	-Dgdi=enabled \
+	-Ddirectwrite=enabled \
+	-Dcairo=enabled \
+	win32build \
+	$@
+
 ninja -Cwin32build -j3 # building with all the cores won't work fine with CricleCI for some reason
 
 rm -rf win32build/harfbuzz-win32