summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJakub Klinkovsk√Ĺ <j.l.k@gmx.com>2019-08-11 08:47:09 +0200
committerJakub Klinkovsk√Ĺ <j.l.k@gmx.com>2019-08-11 08:47:09 +0200
commit5cfb9d97817652c80048f96eb97fecc90aa0d693 (patch)
treeeda9b19ef2d52112f7fef296e7e68f203ead07ef
parent66754ae1bb9acf30c88b061306745fb12e710ec8 (diff)
merge extra/cairo=1.17.2+17+g52a7c79fd
-rw-r--r--0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch32
-rw-r--r--PKGBUILD16
2 files changed, 7 insertions, 41 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
deleted file mode 100644
index 0cc9f45..0000000
--- 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 ab1179a..9e6d076 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
pkgname=cairo-infinality-ultimate
_name=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,15 +14,13 @@ conflicts=(cairo)
depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
checkdepends=(ttf-dejavu gsfonts)
-_commit=3ad43122b21a3299dd729dc8462d6b8f7f01142d # tags/1.16.0^0
+_commit=52a7c79fd4ff96bb5fac175f0199819b0f8c18fc # master
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'
@@ -31,9 +29,6 @@ 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
@@ -43,6 +38,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 typo
+ sed -i 's/have_png/use_png/g' configure.ac
+
NOCONFIGURE=1 ./autogen.sh
}
@@ -61,7 +59,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
}