[meson] Update Cairo subproject

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.
pull/4001/head
Khaled Hosny 3 years ago committed by خالد حسني (Khaled Hosny)
parent 55a7d81740
commit 5d81fc0f1c
  1. 1
      .ci/build-win32.sh
  2. 1
      .ci/build-win64.sh
  3. 4
      subprojects/cairo.wrap

@ -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 \

@ -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 \

@ -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

Loading…
Cancel
Save