freetype2: update to 2.9.1

5 files changed, 28 insertions, 73 deletions

diff --git a/abs/core/freetype2/0001-Enable-table-validation-modules.patch b/abs/core/freetype2/0001-Enable-table-validation-modules.patch
index 5fd339f..b492755 100644
--- a/abs/core/freetype2/0001-Enable-table-validation-modules.patch
+++ b/abs/core/freetype2/0001-Enable-table-validation-modules.patch
@@ -1,5 +1,5 @@
-From c7a6a2312313a971089fb592deb8c476be4dca0f Mon Sep 17 00:00:00 2001
-Message-Id: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
+From 7053fd3cef88991e2da6aac5f1dda2c30ce22b4c Mon Sep 17 00:00:00 2001
+Message-Id: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Tue, 23 Jun 2015 08:40:29 +0200
 Subject: [PATCH 1/4] Enable table validation modules
@@ -9,11 +9,11 @@ Subject: [PATCH 1/4] Enable table validation modules
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.cfg b/modules.cfg
-index 56a2340e56d187aa..3a028329187275df 100644
+index 4bf344524..f9aa44b2a 100644
 --- a/modules.cfg
 +++ b/modules.cfg
 @@ -120,30 +120,30 @@ AUX_MODULES += cache
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
+ # TrueType GX/AAT table validation.  Needs `ftgxval.c' below.
  #
  # No FT_CONFIG_OPTION_PIC support.
 -# AUX_MODULES += gxvalid
@@ -37,7 +37,7 @@ index 56a2340e56d187aa..3a028329187275df 100644
  # No FT_CONFIG_OPTION_PIC support.
  AUX_MODULES += bzip2
  
- # OpenType table validation.  Needs ftotval.c below.
+ # OpenType table validation.  Needs `ftotval.c' below.
  #
  # No FT_CONFIG_OPTION_PIC support.
 -# AUX_MODULES += otvalid
@@ -46,5 +46,5 @@ index 56a2340e56d187aa..3a028329187275df 100644
  # Auxiliary PostScript driver component to share common code.
  #
 -- 
-2.15.1
+2.17.0
 
diff --git a/abs/core/freetype2/0001-psaux-Correctly-handle-Flex-features-52846.patch b/abs/core/freetype2/0001-psaux-Correctly-handle-Flex-features-52846.patch
deleted file mode 100644
index 44630fb..0000000
--- a/abs/core/freetype2/0001-psaux-Correctly-handle-Flex-features-52846.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cc2f3cdecff5a351e7e8961b9f2e389ab740231a Mon Sep 17 00:00:00 2001
-From: Ewald Hew <ewaldhew@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
-
diff --git a/abs/core/freetype2/0002-Enable-infinality-subpixel-hinting.patch b/abs/core/freetype2/0002-Enable-infinality-subpixel-hinting.patch
index 5f43915..461f8e9 100644
--- a/abs/core/freetype2/0002-Enable-infinality-subpixel-hinting.patch
+++ b/abs/core/freetype2/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,7 +1,7 @@
-From 438b8c65e900d4c28db9eeb2a45e5998048eb471 Mon Sep 17 00:00:00 2001
-Message-Id: <438b8c65e900d4c28db9eeb2a45e5998048eb471.1513462508.git.jan.steffens@gmail.com>
-In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
-References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
+From ecb052d87dd80603aac454a65fd6e074bc57772c Mon Sep 17 00:00:00 2001
+Message-Id: <ecb052d87dd80603aac454a65fd6e074bc57772c.1525259379.git.jan.steffens@gmail.com>
+In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
+References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 29 Aug 2016 08:43:10 +0200
 Subject: [PATCH 2/4] Enable infinality subpixel hinting
@@ -11,10 +11,10 @@ Subject: [PATCH 2/4] Enable infinality subpixel hinting
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 06f3d50bb02fb5ac..e6f9720df9b5d004 100644
+index 4bcab2af5..862b926d5 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -654,8 +654,8 @@ FT_BEGIN_HEADER
+@@ -658,8 +658,8 @@ FT_BEGIN_HEADER
    /* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
    /*                                                                       */
  /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
@@ -26,5 +26,5 @@ index 06f3d50bb02fb5ac..e6f9720df9b5d004 100644
  
    /*************************************************************************/
 -- 
-2.15.1
+2.17.0
 
diff --git a/abs/core/freetype2/0003-Enable-long-PCF-family-names.patch b/abs/core/freetype2/0003-Enable-long-PCF-family-names.patch
index be202c1..38623e3 100644
--- a/abs/core/freetype2/0003-Enable-long-PCF-family-names.patch
+++ b/abs/core/freetype2/0003-Enable-long-PCF-family-names.patch
@@ -1,7 +1,7 @@
-From 7e262bff01573c67432f8b8fd879bf858e1611b3 Mon Sep 17 00:00:00 2001
-Message-Id: <7e262bff01573c67432f8b8fd879bf858e1611b3.1513462508.git.jan.steffens@gmail.com>
-In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
-References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
+From bbb386e90cf9440c9c9952aa14bc309f2ec76205 Mon Sep 17 00:00:00 2001
+Message-Id: <bbb386e90cf9440c9c9952aa14bc309f2ec76205.1525259379.git.jan.steffens@gmail.com>
+In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
+References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Sun, 14 May 2017 18:09:31 +0200
 Subject: [PATCH 3/4] Enable long PCF family names
@@ -11,10 +11,10 @@ Subject: [PATCH 3/4] Enable long PCF family names
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index e6f9720df9b5d004..832c9c3cd200f91a 100644
+index 862b926d5..bd6a4f7d3 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -845,7 +845,7 @@ FT_BEGIN_HEADER
+@@ -849,7 +849,7 @@ FT_BEGIN_HEADER
    /* If this option is activated, it can be controlled with the            */
    /* `no-long-family-names' property of the pcf driver module.             */
    /*                                                                       */
@@ -24,5 +24,5 @@ index e6f9720df9b5d004..832c9c3cd200f91a 100644
  
    /*************************************************************************/
 -- 
-2.15.1
+2.17.0
 
diff --git a/abs/core/freetype2/PKGBUILD b/abs/core/freetype2/PKGBUILD
index 251ac74..4406cca 100644
--- a/abs/core/freetype2/PKGBUILD
+++ b/abs/core/freetype2/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=freetype2
 pkgname=('freetype2' 'freetype2-demos' 'freetype2-docs')
-pkgver=2.9
-pkgrel=2
+pkgver=2.9.1
+pkgrel=1
 pkgdesc="Font rasterization library"
 arch=(x86_64)
 license=('GPL')
@@ -19,19 +18,17 @@ source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pk
         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'
+sha1sums=('220c82062171c513e4017c523d196933c9de4a7d'
           'SKIP'
-          '63e171aa5b2c46e7bece3ae7781015380d012e1f'
+          'bb6c973f9fef972ad4ecc03bc09ed676b8dc0d59'
           'SKIP'
-          'bd8a5d17274f987284e6f934722fb7715d00892e'
+          '45704d7b75c4f9fdd6a9b3787918e8220b36aa77'
           'SKIP'
-          'b69531770c343d403be294b7e4d25ac45738c833'
-          '3d26a569f0cb94c28a550577f5dcaadb4e193d91'
-          '770f1981734a837bcf065564c91644b4cc5e256a'
-          '21ad7dd31e16adb5b39adfa5671018a736626562'
+          'd9eb22e5c962923089b0c9fc5491cf28a19bd982'
+          'd13503902e0404cf3558db76b477f23f9910d06e'
+          'fc49742fb6c19fe0677e3552bb7c00aac8530265'
           '72cfecbe738085eec475e012617661ad0cc9b76f'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -46,10 +43,6 @@ prepare() {
   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