diff options
author | Matt Turner <mattst88@gentoo.org> | 2019-03-29 19:00:30 -0700 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2019-03-29 19:03:47 -0700 |
commit | 8e27a74b58384414d920401521f7460a240ea37a (patch) | |
tree | 1b93d528de9b4b8e13c4f4fee99a3dbf2d302774 /x11-libs/cairo/files | |
parent | dev-lang/sassc: take over maintainership (diff) | |
download | gentoo-8e27a74b58384414d920401521f7460a240ea37a.tar.gz gentoo-8e27a74b58384414d920401521f7460a240ea37a.tar.bz2 gentoo-8e27a74b58384414d920401521f7460a240ea37a.zip |
x11-libs/cairo: Pull in a few fixes from upstream
Bug: https://bugs.gentoo.org/672908
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-libs/cairo/files')
-rw-r--r-- | x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch | 30 | ||||
-rw-r--r-- | x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch | 29 |
2 files changed, 59 insertions, 0 deletions
diff --git a/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch b/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch new file mode 100644 index 000000000000..3709c5a90f80 --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch @@ -0,0 +1,30 @@ +From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <cgarcia@igalia.com> +Date: Mon, 19 Nov 2018 12:33:07 +0100 +Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in + cairo_ft_apply_variations + +Fixes a crash when using freetype >= 2.9 +--- + src/cairo-ft-font.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c +index 325dd61b4..981973f78 100644 +--- a/src/cairo-ft-font.c ++++ b/src/cairo-ft-font.c +@@ -2393,7 +2393,11 @@ skip: + done: + free (coords); + free (current_coords); ++#if HAVE_FT_DONE_MM_VAR ++ FT_Done_MM_Var (face->glyph->library, ft_mm_var); ++#else + free (ft_mm_var); ++#endif + } + } + +-- +2.19.2 + diff --git a/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch b/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch new file mode 100644 index 000000000000..19345f141872 --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch @@ -0,0 +1,29 @@ +From 4c8813f0eaacc32c27126ad2296951a626300b89 Mon Sep 17 00:00:00 2001 +From: Adrian Johnson <ajohnson@redneon.com> +Date: Thu, 25 Oct 2018 18:46:17 +1030 +Subject: [PATCH] pdf: add missing flush + +Issue #342 +--- + src/cairo-pdf-surface.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c +index 7eb61aa1e..939b2d2d7 100644 +--- a/src/cairo-pdf-surface.c ++++ b/src/cairo-pdf-surface.c +@@ -7711,6 +7711,11 @@ _cairo_pdf_surface_mask (void *abstract_surface, + * and most common, case to handle. */ + if (_cairo_pattern_is_constant_alpha (mask, &extents.bounded, &alpha) && + _can_paint_pattern (source)) { ++ ++ status = _cairo_pdf_operators_flush (&surface->pdf_operators); ++ if (unlikely (status)) ++ goto cleanup; ++ + _cairo_output_stream_printf (surface->output, "q\n"); + status = _cairo_pdf_surface_paint_pattern (surface, + op, +-- +2.19.2 + |