Thanks, applied as f434123a300317cfc944afe04dee7483ab7be16d. Michael
[sent from post-receive hook] On Thu, 12 Sep 2024 14:12:17 +0200, Christian Melki <[email protected]> wrote: > https://gitlab.freedesktop.org/cairo/cairo/-/releases/1.18.2 > > * Forward patches. Applies cleanly with a slight rework > of offset. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/cairo-1.18.0/0001-cairo-ft-fx-building-without-SVG-support.patch > b/patches/cairo-1.18.2/0001-cairo-ft-fx-building-without-SVG-support.patch > similarity index 100% > rename from > patches/cairo-1.18.0/0001-cairo-ft-fx-building-without-SVG-support.patch > rename to > patches/cairo-1.18.2/0001-cairo-ft-fx-building-without-SVG-support.patch > diff --git > a/patches/cairo-1.18.0/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch > > b/patches/cairo-1.18.2/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch > similarity index 89% > rename from > patches/cairo-1.18.0/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch > rename to > patches/cairo-1.18.2/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch > index b8a0aa0d7648..0482e48617b9 100644 > --- > a/patches/cairo-1.18.0/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch > +++ > b/patches/cairo-1.18.2/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch > @@ -18,10 +18,10 @@ Signed-off-by: Christian Melki > <[email protected]> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c > -index bf0872e937db..0543c8c011e6 100644 > +index b5d08ee1b393..5e20ae164ff8 100644 > --- a/src/cairo-ft-font.c > +++ b/src/cairo-ft-font.c > -@@ -1233,7 +1233,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap, > +@@ -1220,7 +1220,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap, > width = bitmap->width; > height = bitmap->rows; > > diff --git > a/patches/cairo-1.18.0/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch > > b/patches/cairo-1.18.2/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch > similarity index 100% > rename from > patches/cairo-1.18.0/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch > rename to > patches/cairo-1.18.2/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch > diff --git a/patches/cairo-1.18.0/series b/patches/cairo-1.18.2/series > similarity index 100% > rename from patches/cairo-1.18.0/series > rename to patches/cairo-1.18.2/series > diff --git a/rules/cairo.make b/rules/cairo.make > index 5cdfb2807b02..3bbd5770bb86 100644 > --- a/rules/cairo.make > +++ b/rules/cairo.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo > # > # Paths and names > # > -CAIRO_VERSION := 1.18.0 > -CAIRO_MD5 := 3f0685fbadc530606f965b9645bb51d9 > +CAIRO_VERSION := 1.18.2 > +CAIRO_MD5 := 5ad67c707edd0003f1b91c8bbc0005c1 > CAIRO := cairo-$(CAIRO_VERSION) > CAIRO_SUFFIX := tar.xz > CAIRO_URL := > http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
