freetype: update to 2.9.1.
This commit is contained in:
parent
edc51e1d7a
commit
6760a63567
3 changed files with 11 additions and 82 deletions
|
@ -1,38 +0,0 @@
|
|||
From 29c759284e305ec428703c9a5831d0b1fc3497ef Mon Sep 17 00:00:00 2001
|
||||
From: Werner Lemberg <wl@gnu.org>
|
||||
Date: Sat, 27 Jan 2018 14:43:43 +0100
|
||||
Subject: * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL reference.
|
||||
|
||||
Reported as
|
||||
|
||||
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5736
|
||||
---
|
||||
src/truetype/ttinterp.c | 12 ++++++++++--
|
||||
2 files changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git ./src/truetype/ttinterp.c ./src/truetype/ttinterp.c
|
||||
index d855aaa..551f14a 100644
|
||||
--- ./src/truetype/ttinterp.c
|
||||
+++ ./src/truetype/ttinterp.c
|
||||
@@ -7532,8 +7532,16 @@
|
||||
return;
|
||||
}
|
||||
|
||||
- for ( i = 0; i < num_axes; i++ )
|
||||
- args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
|
||||
+ if ( coords )
|
||||
+ {
|
||||
+ for ( i = 0; i < num_axes; i++ )
|
||||
+ args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ for ( i = 0; i < num_axes; i++ )
|
||||
+ args[i] = 0;
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
cgit v1.0-41-gc330
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
commit cc2f3cdecff5a351e7e8961b9f2e389ab740231a
|
||||
Author: Ewald Hew <ewaldhew@gmail.com>
|
||||
Date: Wed Jan 10 13:24:56 2018 +0800
|
||||
|
||||
[psaux] Correctly handle Flex features (#52846).
|
||||
|
||||
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO,
|
||||
cf2_cmdHMOVETO>: Do not move if doing Flex.
|
||||
|
||||
diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c
|
||||
index 5c0ee7849..da5a8dad1 100644
|
||||
--- src/psaux/psintrp.c
|
||||
+++ src/psaux/psintrp.c
|
||||
@@ -852,7 +852,8 @@
|
||||
|
||||
curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) );
|
||||
|
||||
- cf2_glyphpath_moveTo( &glyphPath, curX, curY );
|
||||
+ if ( !decoder->flex_state )
|
||||
+ cf2_glyphpath_moveTo( &glyphPath, curX, curY );
|
||||
|
||||
break;
|
||||
|
||||
@@ -2674,7 +2675,8 @@
|
||||
|
||||
curX = ADD_INT32( curX, cf2_stack_popFixed( opStack ) );
|
||||
|
||||
- cf2_glyphpath_moveTo( &glyphPath, curX, curY );
|
||||
+ if ( !decoder->flex_state )
|
||||
+ cf2_glyphpath_moveTo( &glyphPath, curX, curY );
|
||||
|
||||
break;
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
# Template build file 'freetype'.
|
||||
# Template file for 'freetype'
|
||||
pkgname=freetype
|
||||
version=2.9
|
||||
revision=3
|
||||
version=2.9.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="zlib-devel bzip2-devel libpng-devel"
|
||||
makedepends="bzip2-devel libpng-devel"
|
||||
short_desc="Font rendering engine and library API"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://www.freetype.org/"
|
||||
license="GPL-2"
|
||||
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
|
||||
checksum=e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="https://www.freetype.org/"
|
||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
|
||||
checksum=db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d
|
||||
|
||||
build_options="v35 v38 v40"
|
||||
build_options_default="v40"
|
||||
|
@ -36,11 +36,11 @@ freetype-devel_package() {
|
|||
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
for f in bin include share; do
|
||||
for f in include share; do
|
||||
vmove usr/${f}
|
||||
done
|
||||
vmove usr/lib/*.a
|
||||
vmove usr/lib/*.so
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/lib/pkgconfig
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue