Re: [ptxdist] [APPLIED] cairo: Version bump. 1.18.4 -> 1.18.6

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 33ffdde95202815406b87e019a050efb8565254b.

Michael

[sent from post-receive hook]

On Tue, 06 Oct 2026 09:01:30 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> A year or so ago since last release.
> https://www.cairographics.org/news/cairo-1.18.6/
> 
> * Forward patchset with slight offset adjustment.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20260924180658.2019115-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/cairo-1.18.4/0001-cairo-ft-fx-building-without-SVG-support.patch b/patches/cairo-1.18.6/0001-cairo-ft-fx-building-without-SVG-support.patch
> similarity index 92%
> rename from patches/cairo-1.18.4/0001-cairo-ft-fx-building-without-SVG-support.patch
> rename to patches/cairo-1.18.6/0001-cairo-ft-fx-building-without-SVG-support.patch
> index 808322966d91..58623cf696d0 100644
> --- a/patches/cairo-1.18.4/0001-cairo-ft-fx-building-without-SVG-support.patch
> +++ b/patches/cairo-1.18.6/0001-cairo-ft-fx-building-without-SVG-support.patch
> @@ -17,10 +17,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>   1 file changed, 2 insertions(+), 2 deletions(-)
>  
>  diff --git a/src/cairo-ft-private.h b/src/cairo-ft-private.h
> -index 836f7e523e59..399d0d046094 100644
> +index 6b0e302233b2..415416f243b6 100644
>  --- a/src/cairo-ft-private.h
>  +++ b/src/cairo-ft-private.h
> -@@ -63,10 +63,10 @@ cairo_private cairo_status_t
> +@@ -65,10 +65,10 @@ cairo_private cairo_status_t
>   _cairo_ft_face_decompose_glyph_outline (FT_Face		     face,
>   					cairo_path_fixed_t **pathp);
>   
> diff --git a/patches/cairo-1.18.4/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch b/patches/cairo-1.18.6/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch
> similarity index 89%
> rename from patches/cairo-1.18.4/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch
> rename to patches/cairo-1.18.6/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch
> index 0482e48617b9..a14aae742af2 100644
> --- a/patches/cairo-1.18.4/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch
> +++ b/patches/cairo-1.18.6/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch
> @@ -18,10 +18,10 @@ Signed-off-by: Christian Melki <christian.melki@t2data.com>
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
>  diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
> -index b5d08ee1b393..5e20ae164ff8 100644
> +index b9bdf81cfcc6..fa9c05d32073 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/patches/cairo-1.18.4/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch b/patches/cairo-1.18.6/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch
> similarity index 100%
> rename from patches/cairo-1.18.4/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch
> rename to patches/cairo-1.18.6/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch
> diff --git a/patches/cairo-1.18.4/series b/patches/cairo-1.18.6/series
> similarity index 100%
> rename from patches/cairo-1.18.4/series
> rename to patches/cairo-1.18.6/series
> diff --git a/rules/cairo.make b/rules/cairo.make
> index d07e499668b5..411b40a196f8 100644
> --- a/rules/cairo.make
> +++ b/rules/cairo.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo
>  #
>  # Paths and names
>  #
> -CAIRO_VERSION	:= 1.18.4
> -CAIRO_SHA256	:= 445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb
> +CAIRO_VERSION	:= 1.18.6
> +CAIRO_SHA256	:= 1c767308174337a74694da0f3ec069c271452163a1ef4540964c50c301f157d4
>  CAIRO		:= cairo-$(CAIRO_VERSION)
>  CAIRO_SUFFIX	:= tar.xz
>  CAIRO_URL	:= http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)