From 39cf5433947630d4e6287f3de86f6b33785b791b Mon Sep 17 00:00:00 2001
From: svenper <svenper@users.noreply.github.com>
Date: Sat, 20 Jan 2018 06:59:31 +0100
Subject: [PATCH] freetype: add upstream fix for bad Type1 rendering (#10724)

The patch is taken from this commit:
`cc2f3cdecff5a351e7e8961b9f2e389ab740231a` [psaux] Correctly handle Flex
features (#52846).

In turn the commit refers to this bug:
https://savannah.nongnu.org/bugs/?52846
---
 .../patches/upstream-type1-flex.patch         | 33 +++++++++++++++++++
 srcpkgs/freetype/template                     |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/freetype/patches/upstream-type1-flex.patch

diff --git a/srcpkgs/freetype/patches/upstream-type1-flex.patch b/srcpkgs/freetype/patches/upstream-type1-flex.patch
new file mode 100644
index 00000000000..c00b711872f
--- /dev/null
+++ b/srcpkgs/freetype/patches/upstream-type1-flex.patch
@@ -0,0 +1,33 @@
+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;
+ 
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 7c653ecb2f4..3843a342fb3 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
 # Template build file 'freetype'.
 pkgname=freetype
 version=2.9
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="zlib-devel bzip2-devel libpng-devel"