From 5d81fc0f1cec0ddece4e083e9befa4c4b429c546 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 23 Mar 2022 06:07:15 +0200 Subject: [PATCH] [meson] Update Cairo subproject MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update to the latest master to get color fonts working. Disable dwrite on Windows builds as it does not compile and we don’t need it. --- .ci/build-win32.sh | 1 + .ci/build-win64.sh | 1 + subprojects/cairo.wrap | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci/build-win32.sh b/.ci/build-win32.sh index 067e2224c..af34f6cbd 100755 --- a/.ci/build-win32.sh +++ b/.ci/build-win32.sh @@ -7,6 +7,7 @@ meson --cross-file=.ci/win32-cross-file.txt \ -Dcairo=enabled \ -Dcairo:fontconfig=disabled \ -Dcairo:freetype=disabled \ + -Dcairo:dwrite=disabled \ -Dglib=enabled \ -Dfreetype=disabled \ -Dgdi=enabled \ diff --git a/.ci/build-win64.sh b/.ci/build-win64.sh index 946d245a6..893ed30c2 100644 --- a/.ci/build-win64.sh +++ b/.ci/build-win64.sh @@ -7,6 +7,7 @@ meson --cross-file=.ci/win64-cross-file.txt \ -Dcairo=enabled \ -Dcairo:fontconfig=disabled \ -Dcairo:freetype=disabled \ + -Dcairo:dwrite=disabled \ -Dglib=enabled \ -Dfreetype=disabled \ -Dgdi=enabled \ diff --git a/subprojects/cairo.wrap b/subprojects/cairo.wrap index afb7e7425..6c55c8023 100644 --- a/subprojects/cairo.wrap +++ b/subprojects/cairo.wrap @@ -2,7 +2,7 @@ directory=cairo url=https://gitlab.freedesktop.org/cairo/cairo.git depth=1 -revision=c90faeb7492b1b778d18a796afe5c2e4b32a6356 +revision=47645dd674d9df4c72a10125abfb7966f59efabc [provide] -dependency_names = cairo, cairo-ft +dependency_names = cairo