[PATCH 1/5] cairo: upgrade 1.18.4 -> 1.18.6

[Richard Purdie <richard.purdie@linuxfoundation.org>]

Release 1.18.6 (2026-09-20 Emmanuele Bassi <ebassi@gnome.org>)
==============================================================

A new stable release.

The XCB surface triggered an UAF warning when building with GCC. [#898]

The clipping code was accessing various fields in a guard value, and
causing a crash inside Inkscape. See: https://gitlab.com/inkscape/inkscape/-/issues/5631

Multiple fixes for the Windows backends, including improvements in the
thread safety of the DirectWrite code. [#897]

The DirectWrite backend now supports COLRv1 fonts. [#903]

Multiple fixes for building with MSVC and ClangCL.

A leak in the PDF surfaces has been fixed. [!644]

Various gaps between abutting rectangles when drawing with ANTIALIAS_NONE
were removed by using absolute coordinates and avoiding rounding
errors. [#976]

Remove an overflow when computing the buffer size in the XRender code. [#950]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff  | 6 +++---
 .../cairo/{cairo_1.18.4.bb => cairo_1.18.6.bb}              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/cairo/{cairo_1.18.4.bb => cairo_1.18.6.bb} (97%)

diff --git a/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff b/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
index 79ef16dfb91..c6c5ba09c62 100644
--- a/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
+++ b/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
@@ -1,4 +1,4 @@
-From 054ad9b65e074899c82e75cfc6623cfe29ab1fea Mon Sep 17 00:00:00 2001
+From e21fd76dc2572061d078a41fd5faa76592483e88 Mon Sep 17 00:00:00 2001
 From: Fan Xin <fan.xin@jp.fujitsu.com>
 Date: Tue, 6 Jun 2017 15:57:52 +0900
 Subject: [PATCH] Cairo: Fix Denial-of-Service Attack due to Logical Problem in
@@ -15,10 +15,10 @@ Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index b5d08ee..5e20ae1 100644
+index b9bdf81..fa9c05d 100644
 --- a/src/cairo-ft-font.c
 +++ b/src/cairo-ft-font.c
-@@ -1220,7 +1220,7 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
+@@ -1231,7 +1231,7 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
      width = bitmap->width;
      height = bitmap->rows;
  
diff --git a/meta/recipes-graphics/cairo/cairo_1.18.4.bb b/meta/recipes-graphics/cairo/cairo_1.18.6.bb
similarity index 97%
rename from meta/recipes-graphics/cairo/cairo_1.18.4.bb
rename to meta/recipes-graphics/cairo/cairo_1.18.6.bb
index ae448101d90..138ad7492b1 100644
--- a/meta/recipes-graphics/cairo/cairo_1.18.4.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.18.6.bb
@@ -31,7 +31,7 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
            file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \
           "
 
-SRC_URI[sha256sum] = "445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb"
+SRC_URI[sha256sum] = "1c767308174337a74694da0f3ec069c271452163a1ef4540964c50c301f157d4"
 
 inherit meson pkgconfig upstream-version-is-even gtk-doc multilib_script