walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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.
This commit is contained in:
Khaled Hosny 2022-03-23 06:07:15 +02:00 committed by خالد حسني (Khaled Hosny)
parent 55a7d81740
commit 5d81fc0f1c
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.ci/build-win32.sh
View File

@ -7,6 +7,7 @@ meson --cross-file=.ci/win32-cross-file.txt \
-Dcairo=enabled \ -Dcairo=enabled \
-Dcairo:fontconfig=disabled \ -Dcairo:fontconfig=disabled \
-Dcairo:freetype=disabled \ -Dcairo:freetype=disabled \
-Dcairo:dwrite=disabled \
-Dglib=enabled \ -Dglib=enabled \
-Dfreetype=disabled \ -Dfreetype=disabled \
-Dgdi=enabled \ -Dgdi=enabled \

1
.ci/build-win64.sh
View File

@ -7,6 +7,7 @@ meson --cross-file=.ci/win64-cross-file.txt \
-Dcairo=enabled \ -Dcairo=enabled \
-Dcairo:fontconfig=disabled \ -Dcairo:fontconfig=disabled \
-Dcairo:freetype=disabled \ -Dcairo:freetype=disabled \
-Dcairo:dwrite=disabled \
-Dglib=enabled \ -Dglib=enabled \
-Dfreetype=disabled \ -Dfreetype=disabled \
-Dgdi=enabled \ -Dgdi=enabled \

4
subprojects/cairo.wrap
View File

@ -2,7 +2,7 @@
directory=cairo directory=cairo
url=https://gitlab.freedesktop.org/cairo/cairo.git url=https://gitlab.freedesktop.org/cairo/cairo.git
depth=1 depth=1
revision=c90faeb7492b1b778d18a796afe5c2e4b32a6356 revision=47645dd674d9df4c72a10125abfb7966f59efabc
[provide] [provide]
dependency_names = cairo, cairo-ft dependency_names = cairo