Update cairo-infinality-remix to 1.17.2+17+g52a7c79fd-1.

3 files changed, 13 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index efb7a5017e9e..a9bee90b87bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cairo-infinality-remix
 	pkgdesc = Cairo vector graphics library with Infinality patch support
-	pkgver = 1.16.0
-	pkgrel = 2
+	pkgver = 1.17.2+17+g52a7c79fd
+	pkgrel = 1
 	url = http://cairographics.org/
 	arch = i686
 	arch = x86_64
@@ -36,14 +36,12 @@ pkgbase = cairo-infinality-remix
 	conflicts = cairo-ocaml-git
 	conflicts = cairo-ubuntu
 	replaces = cairo-xcb
-	source = git+https://anongit.freedesktop.org/git/cairo#tag=1.16.0
-	source = 0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+	source = git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=52a7c79fd4ff96bb5fac175f0199819b0f8c18fc
 	source = cairo-make-lcdfilter-default.patch
 	source = cairo-respect-fontconfig_pb.patch
 	source = cairo-server-side-gradients.patch
 	source = cairo-webkit-html5-fix.patch
 	sha256sums = SKIP
-	sha256sums = 52ab418058076ad01e046ebbbdc834f390305516c222d07de91a93a4dcebe921
 	sha256sums = 9d692ffdbb13eaf5a66e7b5821fa6d67f2dbe3629d86d40e44f8bdcf0e6cdc2d
 	sha256sums = 3ef17cfd14b3edc14092b5e96fc63673b6b020b7f05adaa59d3c3e4b0cfdde66
 	sha256sums = b80c99b10fd48dbf98abd70ca2d1265ad6035383c47bfbee5e540a814b6d2a23
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
deleted file mode 100644
index 0cc9f45d429b..000000000000
--- a/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/PKGBUILD b/PKGBUILD
index 9d81b07e75bc..4db3a90d2e0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=cairo-infinality-remix
 _name=cairo
-pkgver=1.16.0
-pkgrel=2
+pkgver=1.17.2+17+g52a7c79fd
+pkgrel=1
 pkgdesc="Cairo vector graphics library with Infinality patch support"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -26,15 +26,16 @@ conflicts=('cairo'
             'cairo-ocaml-git'
             'cairo-ubuntu')
 
-source=("git+https://anongit.freedesktop.org/git/cairo#tag=$pkgver"
-        0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+# Arch official upstream version commit
+_commit=52a7c79fd4ff96bb5fac175f0199819b0f8c18fc
+
+source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit"
         cairo-make-lcdfilter-default.patch
         cairo-respect-fontconfig_pb.patch
         cairo-server-side-gradients.patch
         cairo-webkit-html5-fix.patch)
 
 sha256sums=('SKIP'
-            '52ab418058076ad01e046ebbbdc834f390305516c222d07de91a93a4dcebe921'
             '9d692ffdbb13eaf5a66e7b5821fa6d67f2dbe3629d86d40e44f8bdcf0e6cdc2d'
             '3ef17cfd14b3edc14092b5e96fc63673b6b020b7f05adaa59d3c3e4b0cfdde66'
             'b80c99b10fd48dbf98abd70ca2d1265ad6035383c47bfbee5e540a814b6d2a23'
@@ -43,9 +44,6 @@ sha256sums=('SKIP'
 prepare(){
     cd $_name
 
-    # CVE-2018-19876
-    patch -Np1 -i "${srcdir}"/0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
-
     # Infinality patches
     patch -Np1 -i "${srcdir}"/cairo-make-lcdfilter-default.patch
     patch -Np1 -i "${srcdir}"/cairo-respect-fontconfig_pb.patch
@@ -58,6 +56,9 @@ prepare(){
     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 a typo
+    sed -i 's/have_png/use_png/g' configure.ac
+
     NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -74,7 +75,7 @@ build() {
         --enable-pdf \
         --enable-gobject \
         --enable-gtk-doc
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }