From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 12 Sep 2024 14:21:43 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1soipT-003n4y-1Y for lore@lore.pengutronix.de; Thu, 12 Sep 2024 14:21:43 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1soipS-00059g-NO; Thu, 12 Sep 2024 14:21:42 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1soigM-0002w7-Cc; Thu, 12 Sep 2024 14:12:18 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1soigL-007NTZ-RK; Thu, 12 Sep 2024 14:12:17 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1soigL-00BHWY-2b; Thu, 12 Sep 2024 14:12:17 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 12 Sep 2024 14:12:17 +0200 Message-Id: <20240912121217.2688963-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240904175439.2596722-1-christian.melki@t2data.com> References: <20240904175439.2596722-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] cairo: Version bump. 1.18.0 -> 1.18.2 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as f434123a300317cfc944afe04dee7483ab7be16d. Michael [sent from post-receive hook] On Thu, 12 Sep 2024 14:12:17 +0200, Christian Melki 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 > Message-Id: <20240904175439.2596722-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > 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 > 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)