summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJakub Klinkovsk√Ĺ <j.l.k@gmx.com>2019-02-17 12:10:01 +0100
committerJakub Klinkovsk√Ĺ <j.l.k@gmx.com>2019-02-17 12:10:01 +0100
commit66754ae1bb9acf30c88b061306745fb12e710ec8 (patch)
treefd1e9123d047a7b3f517db2b184957ebb1e18374
parent39dcbfc56e81eabefeb8eb4427a5b03bc82d750d (diff)
merge extra/cairo-1.16.0-2
-rw-r--r--0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch32
-rw-r--r--PKGBUILD7
2 files changed, 38 insertions, 1 deletions
diff --git a/0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch b/0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
new file mode 100644
index 0000000..0cc9f45
--- /dev/null
+++ b/0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
@@ -0,0 +1,32 @@
+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
+
+Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
+---
+ 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.20.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 8b7ee2d..ab1179a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=cairo-infinality-ultimate
_name=cairo
pkgver=1.16.0
-pkgrel=1
+pkgrel=2
pkgdesc="2D graphics library with support for multiple output devices"
url="https://cairographics.org/"
arch=(x86_64)
@@ -16,11 +16,13 @@ makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
checkdepends=(ttf-dejavu gsfonts)
_commit=3ad43122b21a3299dd729dc8462d6b8f7f01142d # tags/1.16.0^0
source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit"
+ 0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
cairo-make-lcdfilter-default.patch
cairo-respect-fontconfig_pb.patch
cairo-server-side-gradients.patch
cairo-webkit-html5-fix.patch)
sha1sums=('SKIP'
+ '9850a5b06e300055676ad1f5dfa90ecba0fe623c'
'b0cc2466cc5479f055ca2148cfa37fe13a1e78a6'
'd8ffcb4c4745f7e61671109362a80a872ac989d3'
'72ecf2dda8462e1588512de257ccbe18642d507f'
@@ -29,6 +31,9 @@ sha1sums=('SKIP'
prepare(){
cd $_name
+ # CVE-2018-19876
+ patch -Np1 -i ../0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+
patch -Np1 -i "${srcdir}"/cairo-make-lcdfilter-default.patch
patch -Np1 -i "${srcdir}"/cairo-respect-fontconfig_pb.patch
patch -Np1 -i "${srcdir}"/cairo-server-side-gradients.patch