diff --git a/cairo-1.17.8-tee-surface-fix.patch b/cairo-1.17.8-tee-surface-fix.patch deleted file mode 100644 index df8f57311ae63852de94626eb6786a09d0903960..0000000000000000000000000000000000000000 --- a/cairo-1.17.8-tee-surface-fix.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 5e42a5277eddafd312a73e355d7775a4401dae4e Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Fri, 3 Feb 2023 15:40:12 +0100 -Subject: tee: Fix cairo wrapper functions - -Follow-up to !391 to apply the same changes to the (disabled by default) -tee surface. - -Fixes: #634 ---- - src/cairo-tee-surface.c | 24 ++++++++++++++---------- - 1 file changed, 14 insertions(+), 10 deletions(-) - -diff --git a/src/cairo-tee-surface.c b/src/cairo-tee-surface.c -index 7a94c9bca..4994a5a60 100644 ---- a/src/cairo-tee-surface.c -+++ b/src/cairo-tee-surface.c -@@ -220,12 +220,12 @@ _cairo_tee_surface_paint (void *abstract_surface, - num_slaves = _cairo_array_num_elements (&surface->slaves); - slaves = _cairo_array_index (&surface->slaves, 0); - for (n = 0; n < num_slaves; n++) { -- status = _cairo_surface_wrapper_paint (&slaves[n], op, source, clip); -+ status = _cairo_surface_wrapper_paint (&slaves[n], op, source, 0, clip); - if (unlikely (status)) - return status; - } - -- return _cairo_surface_wrapper_paint (&surface->master, op, source, clip); -+ return _cairo_surface_wrapper_paint (&surface->master, op, source, 0, clip); - } - - static cairo_int_status_t -@@ -244,13 +244,17 @@ _cairo_tee_surface_mask (void *abstract_surface, - slaves = _cairo_array_index (&surface->slaves, 0); - for (n = 0; n < num_slaves; n++) { - status = _cairo_surface_wrapper_mask (&slaves[n], -- op, source, mask, clip); -+ op, source, 0, -+ mask, 0, -+ clip); - if (unlikely (status)) - return status; - } - - return _cairo_surface_wrapper_mask (&surface->master, -- op, source, mask, clip); -+ op, source, 0, -+ mask, 0, -+ clip); - } - - static cairo_int_status_t -@@ -274,7 +278,7 @@ _cairo_tee_surface_stroke (void *abstract_surface, - slaves = _cairo_array_index (&surface->slaves, 0); - for (n = 0; n < num_slaves; n++) { - status = _cairo_surface_wrapper_stroke (&slaves[n], -- op, source, -+ op, source, 0, - path, style, - ctm, ctm_inverse, - tolerance, antialias, -@@ -284,7 +288,7 @@ _cairo_tee_surface_stroke (void *abstract_surface, - } - - return _cairo_surface_wrapper_stroke (&surface->master, -- op, source, -+ op, source, 0, - path, style, - ctm, ctm_inverse, - tolerance, antialias, -@@ -310,7 +314,7 @@ _cairo_tee_surface_fill (void *abstract_surface, - slaves = _cairo_array_index (&surface->slaves, 0); - for (n = 0; n < num_slaves; n++) { - status = _cairo_surface_wrapper_fill (&slaves[n], -- op, source, -+ op, source, 0, - path, fill_rule, - tolerance, antialias, - clip); -@@ -319,7 +323,7 @@ _cairo_tee_surface_fill (void *abstract_surface, - } - - return _cairo_surface_wrapper_fill (&surface->master, -- op, source, -+ op, source, 0, - path, fill_rule, - tolerance, antialias, - clip); -@@ -361,7 +365,7 @@ _cairo_tee_surface_show_text_glyphs (void *abstract_surface, - for (n = 0; n < num_slaves; n++) { - memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs); - status = _cairo_surface_wrapper_show_text_glyphs (&slaves[n], op, -- source, -+ source, 0, - utf8, utf8_len, - glyphs_copy, num_glyphs, - clusters, num_clusters, -@@ -374,7 +378,7 @@ _cairo_tee_surface_show_text_glyphs (void *abstract_surface, - - memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs); - status = _cairo_surface_wrapper_show_text_glyphs (&surface->master, op, -- source, -+ source, 0, - utf8, utf8_len, - glyphs_copy, num_glyphs, - clusters, num_clusters, --- -cgit v1.2.1 - diff --git a/cairo-1.17.8.tar.xz b/cairo-1.18.0.tar.xz similarity index 80% rename from cairo-1.17.8.tar.xz rename to cairo-1.18.0.tar.xz index 4006ce2e3e0a6a4cacf4005f2362660c296fc823..ef0ca44e2c924ea53ca9c87b156549ad78a6eb92 100644 Binary files a/cairo-1.17.8.tar.xz and b/cairo-1.18.0.tar.xz differ diff --git a/cairo.spec b/cairo.spec index 86dec28bdcd1f7438f1baa14dd90f385d5a30cce..44773c7dc2fdfc4c2f48cfc0abf8d5464a485ea6 100644 --- a/cairo.spec +++ b/cairo.spec @@ -1,32 +1,28 @@ %define anolis_release 1 Name: cairo -Version: 1.17.8 +Version: 1.18.0 Release: %{anolis_release}%{?dist} Summary: A 2D graphics library -License: LGPLv2 or MPLv1.1 +License: LGPL-2.1-only OR MPL-1.1 URL: http://cairographics.org Source0: https://cairographics.org/snapshots/%{name}-%{version}.tar.xz -# https://gitlab.freedesktop.org/cairo/cairo/-/issues/634 -# - https://cgit.freedesktop.org/cairo/commit/?id=5e42a5277eddafd312a73e355d7775a4401dae4e -Patch1: cairo-1.17.8-tee-surface-fix.patch + BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: meson >= 0.56.0 BuildRequires: pkgconfig(fontconfig) >= 2.2.95 +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(freetype2) >= 9.7.3 -BuildRequires: pkgconfig(glib-2.0) >= 2.14 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(pixman-1) >= 0.36.0 -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xcb) >= 1.6 -BuildRequires: pkgconfig(xcb-render) >= 1.6 -BuildRequires: pkgconfig(xcb-shm) +BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xcb-render) BuildRequires: pkgconfig(xrender) >= 0.6 -BuildRequires: pkgconfig(zlib) %description Cairo is a 2D graphics library designed to provide high-quality display @@ -81,7 +77,6 @@ needed for developing software which uses the cairo Gobject library. %package tools Summary: Development tools for cairo Requires: %{name} = %{version}-%{release} -Conflicts: %{name} < 1.17.6-3 %description tools Cairo is a 2D graphics library designed to provide high-quality display @@ -105,7 +100,7 @@ This package contains tools for working with the cairo graphics library. -Dtests=disabled \ -Dxcb=enabled \ -Dxlib=enabled \ - -Dxml=disabled + %{nil} %meson_build %install @@ -168,15 +163,17 @@ This package contains tools for working with the cairo graphics library. %{_libdir}/pkgconfig/cairo-gobject.pc %files tools -%{_bindir}/cairo-sphinx %{_bindir}/cairo-trace %{abidir}/cairo-trace-option.list %{_libdir}/cairo/ -%{abidir}/libcairo-fdr.dump -%{abidir}/libcairo-sphinx.dump %{abidir}/libcairo-trace.dump %changelog +* Mon Feb 17 2025 Zhao Hang - 1.18.0-1 +- Update to 1.18.0-1 from 1.17.8-1 +- Remove patch which is already exist in code +- Migrated to SPDX license + * Mon Feb 6 2023 Funda Wang - 1.17.8-1 - New version 1.17.8