From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 24 Mar 2025 08:45:48 +0100 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 1twcVJ-003Us8-1R for lore@lore.pengutronix.de; Mon, 24 Mar 2025 08:45:48 +0100 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 1twcVI-0003ZR-BU; Mon, 24 Mar 2025 08:45:48 +0100 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 1twcVA-0003TQ-T0; Mon, 24 Mar 2025 08:45:40 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1twcVA-001N81-0n; Mon, 24 Mar 2025 08:45:40 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1twcVA-00ACYu-1z; Mon, 24 Mar 2025 08:45:40 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 24 Mar 2025 08:45:40 +0100 Message-Id: <20250324074540.2431561-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310183450.4038881-1-christian.melki@t2data.com> References: <20250310183450.4038881-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] cairo: Version bump. 1.18.2 -> 1.18.4 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 adaaa742625e5c6d64614104b7cba0321cd39de4. Michael [sent from post-receive hook] On Mon, 24 Mar 2025 08:45:40 +0100, Christian Melki wrote: > Minor changes. > https://gitlab.freedesktop.org/cairo/cairo/-/releases/1.18.4 > > * Forward patches. > > * Make exposed LZO togglable and bind it to scripting (afaict). > > Signed-off-by: Christian Melki > Message-Id: <20250310183450.4038881-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/cairo-1.18.2/0001-cairo-ft-fx-building-without-SVG-support.patch b/patches/cairo-1.18.4/0001-cairo-ft-fx-building-without-SVG-support.patch > similarity index 100% > rename from patches/cairo-1.18.2/0001-cairo-ft-fx-building-without-SVG-support.patch > rename to patches/cairo-1.18.4/0001-cairo-ft-fx-building-without-SVG-support.patch > diff --git a/patches/cairo-1.18.2/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch b/patches/cairo-1.18.4/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch > similarity index 100% > rename from patches/cairo-1.18.2/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch > rename to patches/cairo-1.18.4/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch > diff --git a/patches/cairo-1.18.2/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch b/patches/cairo-1.18.4/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch > similarity index 100% > rename from patches/cairo-1.18.2/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch > rename to patches/cairo-1.18.4/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch > diff --git a/patches/cairo-1.18.2/series b/patches/cairo-1.18.4/series > similarity index 100% > rename from patches/cairo-1.18.2/series > rename to patches/cairo-1.18.4/series > diff --git a/rules/cairo.in b/rules/cairo.in > index a2c678a43aec..7490f6d5bec0 100644 > --- a/rules/cairo.in > +++ b/rules/cairo.in > @@ -6,6 +6,7 @@ menuconfig CAIRO > select GCCLIBS_GCC_S > select XORG_LIB_XEXT if CAIRO_XLIB > select XORG_LIB_XRENDER if CAIRO_XLIB > + select LIBLZO if CAIRO_LZO > select ZLIB if CAIRO_ZLIB > select GLIB if CAIRO_GOBJECT > select FREETYPE if CAIRO_FREETYPE > @@ -26,6 +27,9 @@ if CAIRO > config CAIRO_GOBJECT > bool > > +config CAIRO_LZO > + bool > + > config CAIRO_ZLIB > bool > > @@ -66,6 +70,7 @@ config CAIRO_PNG > > config CAIRO_SCRIPT > bool > + select CAIRO_LZO > select CAIRO_ZLIB > prompt "script surface" > > diff --git a/rules/cairo.make b/rules/cairo.make > index 3bbd5770bb86..c147998fe252 100644 > --- a/rules/cairo.make > +++ b/rules/cairo.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo > # > # Paths and names > # > -CAIRO_VERSION := 1.18.2 > -CAIRO_MD5 := 5ad67c707edd0003f1b91c8bbc0005c1 > +CAIRO_VERSION := 1.18.4 > +CAIRO_MD5 := db575fb41bbda127e0147e401f36f8ac > CAIRO := cairo-$(CAIRO_VERSION) > CAIRO_SUFFIX := tar.xz > CAIRO_URL := http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX) > @@ -45,6 +45,7 @@ CAIRO_CONF_OPT := \ > -Dglib=$(call ptx/endis, PTXCONF_CAIRO_GOBJECT)d \ > -Dgtk2-utils=disabled \ > -Dgtk_doc=false \ > + -Dlzo=$(call ptx/endis, PTXCONF_CAIRO_LZO)d \ > -Dpng=$(call ptx/endis, PTXCONF_CAIRO_PNG)d \ > -Dquartz=disabled \ > -Dspectre=disabled \