[ptxdist] [PATCH] cairo: Version bump. 1.18.2 -> 1.18.4

[ptxdist] [PATCH] cairo: Version bump. 1.18.2 -> 1.18.4

[Christian Melki]

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 <christian.melki@t2data.com>
---
 .../0001-cairo-ft-fx-building-without-SVG-support.patch      | 0
 ...airo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch | 0
 ...here-is-an-assertion-in-function-_cairo_arc_in_dire.patch | 0
 patches/{cairo-1.18.2 => cairo-1.18.4}/series                | 0
 rules/cairo.in                                               | 5 +++++
 rules/cairo.make                                             | 5 +++--
 6 files changed, 8 insertions(+), 2 deletions(-)
 rename patches/{cairo-1.18.2 => cairo-1.18.4}/0001-cairo-ft-fx-building-without-SVG-support.patch (100%)
 rename patches/{cairo-1.18.2 => cairo-1.18.4}/0100-Cairo-Fix-Denial-of-Service-Attack-due-to-Logical-Pr.patch (100%)
 rename patches/{cairo-1.18.2 => cairo-1.18.4}/0101-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch (100%)
 rename patches/{cairo-1.18.2 => cairo-1.18.4}/series (100%)

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 a2c678a43..7490f6d5b 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 3bbd5770b..c147998fe 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 \
-- 
2.34.1