Merge pull request #1086 from wingtk/cairo-1.18.0

Update Cairo to version 1.18.0

gvsbuild/patches/cairo/0001-fix-alloca-unresolved.patch

@@ -0,0 +1,21 @@
+Subject: [PATCH] Fix alloca unresolved
+---
+Index: src/cairo-colr-glyph-render.c
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/cairo-colr-glyph-render.c b/src/cairo-colr-glyph-render.c
+--- a/src/cairo-colr-glyph-render.c (revision 459d19ef1520d39078038ecaa840efca0194e053)
++++ b/src/cairo-colr-glyph-render.c (date 1696094155649)
+@@ -43,6 +43,10 @@
+ #include <stdio.h>
+ #include <string.h>
+
++#ifdef _MSC_VER
++#include <malloc.h>
++#endif
++
+ #if HAVE_FT_COLR_V1
+
+ #include <ft2build.h>

gvsbuild/projects/cairo.py

@@ -24,10 +24,12 @@ def __init__(self):
  Meson.__init__(
  self,
  "cairo",
- version="1.17.8",
+ version="1.18.0",
+ lastversion_even=True,
  archive_url="https://gitlab.freedesktop.org/cairo/cairo/-/archive/{version}/cairo-{version}.tar.gz",
- hash="b4ed6d33037171d4c6594345b42d81796f335a6995fdf5638db0d306c17a0d3e",
+ hash="39a78afdc33a435c0f2ab53a5ec2a693c3c9b6d2ec9783ceecb2b94d54d942b0",
  dependencies=["fontconfig", "freetype", "glib", "pixman", "libpng"],
+ patches=["0001-fix-alloca-unresolved.patch"],
  )
 
  def build(self):

gvsbuild/projects/harfbuzz.py

@@ -27,7 +27,7 @@ def __init__(self):
  version="8.2.1",
  archive_url="https://github.com/harfbuzz/harfbuzz/releases/download/{version}/harfbuzz-{version}.tar.xz",
  hash="0fec78f98c9c8faf228957a201c8846f809452c20f8445eb092a1ba6f22dbea5",
- dependencies=["meson", "cmake", "freetype", "pkgconf", "glib"],
+ dependencies=["meson", "cmake", "freetype", "cairo", "pkgconf", "glib"],
  )
 
  if Project.opts.enable_gi: