From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Subject: Re: [ptxdist] [APPLIED] cairo: Version bump. 1.18.0 -> 1.18.2
Date: Thu, 12 Sep 2024 14:12:17 +0200 [thread overview]
Message-ID: <20240912121217.2688963-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20240904175439.2596722-1-christian.melki@t2data.com>
Thanks, applied as f434123a300317cfc944afe04dee7483ab7be16d.
Michael
[sent from post-receive hook]
On Thu, 12 Sep 2024 14:12:17 +0200, Christian Melki <christian.melki@t2data.com> 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 <christian.melki@t2data.com>
> Message-Id: <20240904175439.2596722-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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 <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 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)
prev parent reply other threads:[~2024-09-12 12:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-04 17:54 [ptxdist] [PATCH] " Christian Melki
2024-09-12 12:12 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240912121217.2688963-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox