[arch-commits] Commit in freetype2/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, January 30, 2018 @ 12:58:25
  Author: foutrelis
Revision: 315619

upgpkg: freetype2 2.9-2

Fix rendering of some Type 1 fonts (FS#57205).

Added:
  freetype2/trunk/0001-psaux-Correctly-handle-Flex-features-52846.patch
Modified:
  freetype2/trunk/PKGBUILD

-------------------------------------------------------+
 0001-psaux-Correctly-handle-Flex-features-52846.patch |   38 ++++++++++++++++
 PKGBUILD                                              |    8 ++-
 2 files changed, 45 insertions(+), 1 deletion(-)

Added: 0001-psaux-Correctly-handle-Flex-features-52846.patch
===================================================================
--- 0001-psaux-Correctly-handle-Flex-features-52846.patch	                        (rev 0)
+++ 0001-psaux-Correctly-handle-Flex-features-52846.patch	2018-01-30 12:58:25 UTC (rev 315619)
@@ -0,0 +1,38 @@
+From cc2f3cdecff5a351e7e8961b9f2e389ab740231a Mon Sep 17 00:00:00 2001
+From: Ewald Hew <ewaldhew at gmail.com>
+Date: Wed, 10 Jan 2018 13:24:56 +0800
+Subject: [PATCH] [psaux] Correctly handle Flex features (#52846).
+
+* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO,
+cf2_cmdHMOVETO>: Do not move if doing Flex.
+---
+ src/psaux/psintrp.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c
+index 5c0ee78..da5a8da 100644
+--- a/src/psaux/psintrp.c
++++ b/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;
+ 
+-- 
+2.16.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-30 12:57:19 UTC (rev 315618)
+++ PKGBUILD	2018-01-30 12:58:25 UTC (rev 315619)
@@ -4,7 +4,7 @@
 pkgbase=freetype2
 pkgname=('freetype2' 'freetype2-demos' 'freetype2-docs')
 pkgver=2.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Font rasterization library"
 arch=(x86_64)
 license=('GPL')
@@ -19,6 +19,7 @@
         0001-Enable-table-validation-modules.patch
         0002-Enable-infinality-subpixel-hinting.patch
         0003-Enable-long-PCF-family-names.patch
+        0001-psaux-Correctly-handle-Flex-features-52846.patch
         0005-freetype-2.5.2-more-demos.patch
         freetype2.sh)
 sha1sums=('94c4399b1a55c5892812e732843fcb4a7c2fe657'
@@ -30,6 +31,7 @@
           'b69531770c343d403be294b7e4d25ac45738c833'
           '3d26a569f0cb94c28a550577f5dcaadb4e193d91'
           '770f1981734a837bcf065564c91644b4cc5e256a'
+          '21ad7dd31e16adb5b39adfa5671018a736626562'
           '72cfecbe738085eec475e012617661ad0cc9b76f'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -44,6 +46,10 @@
   patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch
   patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
 
+  # Freetype 2.9 regression: bad rendering for some Type 1 fonts
+  # https://savannah.nongnu.org/bugs/?52846
+  patch -Np1 -i ../0001-psaux-Correctly-handle-Flex-features-52846.patch
+
   cd ../freetype2-demos
   # enable more demos
   patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch