Commit 60476e9a authored by Xavier Claessens's avatar Xavier Claessens
Browse files

Update FreeType to 2.10.4 to fix security vulnerability

Part-of: <!642>
parent b4b46bf7
Pipeline #216736 passed with stages
in 58 minutes and 28 seconds
......@@ -3,14 +3,13 @@
class Recipe(recipe.Recipe):
name = 'freetype'
version = '2.10.1'
version = '2.10.4'
stype = SourceType.TARBALL
url = 'savannah://.tar.xz'
tarball_checksum = '16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f'
tarball_checksum = '86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784'
licenses = [{License.FreeType: ['docs/LICENSE.TXT']}, License.GPLv2Plus]
configure_tpl = "%(config-sh)s --prefix=%(prefix)s --libdir=%(libdir)s --with-harfbuzz=no"
deps = ['zlib', 'bzip2', 'libpng']
patches = ['freetype/0001-pngshim-Workaround-buggy-mingw-compiler.patch']
files_libs = ['libfreetype']
files_devel = ['lib/pkgconfig/freetype2.pc',
......
From 96395f10a35a81b33064276f921a1bd0636d4837 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward@centricular.com>
Date: Thu, 22 Feb 2018 07:56:35 +0100
Subject: [PATCH] pngshim: Workaround buggy mingw compiler
Our antequated mingw toolchain is buggy :(
---
src/sfnt/pngshim.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c
index 1602026..b5fae67 100644
--- a/src/sfnt/pngshim.c
+++ b/src/sfnt/pngshim.c
@@ -63,7 +63,7 @@
/* `__builtin_shuffle' for gcc was introduced in gcc 4.7.0. */
#if ( ( defined( __GNUC__ ) && \
( ( __GNUC__ >= 5 ) || \
- ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 7 ) ) ) ) || \
+ ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ > 7 ) ) ) ) || \
( defined( __clang__ ) && \
( ( __clang_major__ >= 4 ) || \
( ( __clang_major__ == 3 ) && ( __clang_minor__ >= 2 ) ) ) ) ) && \
@@ -81,7 +81,6 @@
typedef unsigned short v82 __attribute__(( vector_size( 16 ) ));
-
if ( row_info->rowbytes > 15 )
{
/* process blocks of 16 bytes in one rush, which gives a nice speed-up */
--
2.14.3
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment