diff --git a/extra/cairo/0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch b/extra/cairo/0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch deleted file mode 100644 index 0cc9f45d4..000000000 --- a/extra/cairo/0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch +++ /dev/null @@ -1,32 +0,0 @@ -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/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 64daf08cb..b8972944e 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -5,8 +5,8 @@ # - drop valgrind makedepend pkgname=cairo -pkgver=1.16.0 -pkgrel=2 +pkgver=1.17.2+17+g52a7c79fd +pkgrel=1 pkgdesc="2D graphics library with support for multiple output devices" url="https://cairographics.org/" arch=(x86_64) @@ -14,11 +14,9 @@ license=(LGPL MPL) depends=(libpng libxrender libxext fontconfig pixman glib2 lzo) makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc 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) -sha1sums=('SKIP' - '9850a5b06e300055676ad1f5dfa90ecba0fe623c') +_commit=52a7c79fd4ff96bb5fac175f0199819b0f8c18fc # master +source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit") +sha256sums=('SKIP') pkgver() { cd cairo @@ -28,13 +26,13 @@ pkgver() { prepare() { cd cairo - # CVE-2018-19876 - patch -Np1 -i ../0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch - # Update gtk-doc cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4 cp /usr/share/gtk-doc/data/gtk-doc.make build/Makefile.am.gtk-doc + # Fix typo + sed -i 's/have_png/use_png/g' configure.ac + NOCONFIGURE=1 ./autogen.sh } @@ -53,7 +51,7 @@ build() { --enable-gtk-doc \ --enable-full-testing \ --enable-test-surfaces - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make }