[packages/cairo] - updated to 1.18.4

[qboosh]

commit e33aea4a5b31e539a0eef87a2bc9840b04cc1b9a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Mar 13 21:41:50 2025 +0100

    - updated to 1.18.4

 cairo-1.18.2-cups.patch | 32 --------------------------------
 cairo.spec              | 31 +++++++++++++++++--------------
 2 files changed, 17 insertions(+), 46 deletions(-)
---
diff --git a/cairo.spec b/cairo.spec
index b708475..db0adcc 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -10,15 +10,14 @@
 Summary:	Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
-Version:	1.18.2
-Release:	2
+Version:	1.18.4
+Release:	1
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 Source0:	https://www.cairographics.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	5ad67c707edd0003f1b91c8bbc0005c1
-Patch1:		%{name}-1.18.2-cups.patch
+# Source0-md5:	db575fb41bbda127e0147e401f36f8ac
 URL:		https://www.cairographics.org/
-BuildRequires:	binutils-devel
+BuildRequires:	binutils-devel >= 2.21.53
 BuildRequires:	fontconfig-devel >= 2.13.0
 %if %{with tests}
 # ttx
@@ -40,8 +39,7 @@ BuildRequires:	libspectre-devel >= 0.2.0
 BuildRequires:	lzo-devel >= 2
 BuildRequires:	meson >= 1.3.0
 BuildRequires:	ninja >= 1.5
-# TODO: 0.42.3 when released
-BuildRequires:	pixman-devel >= 0.40.0
+BuildRequires:	pixman-devel >= 0.42.3
 BuildRequires:	pkgconfig >= 1:0.18
 %if %{with pdf} && %{with tests}
 BuildRequires:	poppler-glib-devel >= 0.17.4
@@ -59,7 +57,7 @@ BuildRequires:	zlib-devel
 Requires:	fontconfig-libs >= 2.13.0
 Requires:	freetype >= 1:2.13.0
 %{?with_xcb:Requires:	libxcb >= 1.6}
-Requires:	pixman >= 0.40.0
+Requires:	pixman >= 0.42.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -100,7 +98,7 @@ Requires:	freetype-devel >= 1:2.13.0
 Requires:	libpng-devel >= 2:1.4.0
 %{?with_xcb:Requires:	libxcb-devel >= 1.6}
 Requires:	lzo-devel >= 2
-Requires:	pixman-devel >= 0.40.0
+Requires:	pixman-devel >= 0.42.3
 Requires:	xorg-lib-libX11-devel%{?with_xcb: >= 1.1}
 Requires:	xorg-lib-libXext-devel
 Requires:	xorg-lib-libXrender-devel >= 0.6
@@ -191,29 +189,34 @@ Dokumentacja API Cairo.
 
 %prep
 %setup -q
-%patch 1 -p1
+
 %build
-%meson build \
+%meson \
 	%{!?with_static_libs:--default-library=shared} \
+	-Ddwrite=disabled \
 	-Dfontconfig=enabled \
 	-Dfreetype=enabled \
+	-Dglib=enabled \
 	-Dgtk_doc=%{__true_false apidocs} \
+	-Dlzo=enabled \
 	-Dpng=enabled \
+	-Dquartz=disabled \
 	-Dspectre=%{__enabled_disabled tests} \
+	-Dsymbol-lookup=enabled \
 	-Dtee=enabled \
 	-Dtests=disabled \
 	-Dxcb=%{__enabled_disabled xcb} \
 	-Dxlib=enabled \
 	-Dzlib=enabled
 
-%ninja_build -C build
+%meson_build
 
-%{?with_tests:%ninja_test -C build}
+%{?with_tests:%meson_test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%ninja_install -C build
+%meson_install
 
 # LD_PRELOADable library
 %{?with_static_libs:%{__rm} $RPM_BUILD_ROOT%{_libdir}/cairo/libcairo-{fdr,trace}.a}
diff --git a/cairo-1.18.2-cups.patch b/cairo-1.18.2-cups.patch
deleted file mode 100644
index 6a34c28..0000000
--- a/cairo-1.18.2-cups.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/939607
-https://gitlab.freedesktop.org/cairo/cairo/-/issues/870
-https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/595
-https://gitlab.freedesktop.org/cairo/cairo/-/commit/f19e2fe080ddcfce93c8234a919fd882f3d63362
-
-From f19e2fe080ddcfce93c8234a919fd882f3d63362 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson at redneon.com>
-Date: Fri, 13 Sep 2024 06:28:39 +0930
-Subject: [PATCH] cff: Don't fail if no local subs
-
-Fixes: #870
---- a/src/cairo-cff-subset.c
-+++ b/src/cairo-cff-subset.c
-@@ -952,9 +952,13 @@ cairo_cff_font_read_private_dict (cairo_cff_font_t   *font,
- 	 decode_number (operand, nominal_width);
- 
-     num_subs = _cairo_array_num_elements (local_sub_index);
--    *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t));
--    if (unlikely (*local_subs_used == NULL))
--	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+    if (num_subs > 0) {
-+	*local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t));
-+	if (unlikely (*local_subs_used == NULL))
-+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+    } else {
-+	*local_subs_used = NULL;
-+    }
- 
-     if (num_subs < 1240)
- 	*local_sub_bias = 107;
--- 
-GitLab
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cairo.git/commitdiff/e33aea4a5b31e539a0eef87a2bc9840b04cc1b9a