Update to 2.9.1

6 files changed, 34 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 786d962670aa..1fa23dcd656b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freetype2-ttmetrics
 	pkgdesc = Font rasterization library with TrueType metrics enabled
-	pkgver = 2.9
-	pkgrel = 3
+	pkgver = 2.9.1
+	pkgrel = 1
 	url = https://www.freetype.org/
 	install = freetype2.install
 	arch = i686
@@ -14,22 +14,20 @@ pkgbase = freetype2-ttmetrics
 	depends = libpng
 	depends = harfbuzz
 	provides = libfreetype.so
-	provides = freetype2=2.9
+	provides = freetype2=2.9.1
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
-	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.9.tar.bz2
+	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.bz2
 	source = 0001-Enable-table-validation-modules.patch
 	source = 0002-Enable-infinality-subpixel-hinting.patch
 	source = 0003-Enable-long-PCF-family-names.patch
-	source = 0001-psaux-Correctly-handle-Flex-features-52846.patch
 	source = freetype2.sh
 	source = enable_truetype_like_size_metrics.patch
 	source = fix_metrics_on_size_request.patch
-	sha1sums = 94c4399b1a55c5892812e732843fcb4a7c2fe657
-	sha1sums = b69531770c343d403be294b7e4d25ac45738c833
-	sha1sums = 3d26a569f0cb94c28a550577f5dcaadb4e193d91
-	sha1sums = 770f1981734a837bcf065564c91644b4cc5e256a
-	sha1sums = 21ad7dd31e16adb5b39adfa5671018a736626562
+	sha1sums = 220c82062171c513e4017c523d196933c9de4a7d
+	sha1sums = d9eb22e5c962923089b0c9fc5491cf28a19bd982
+	sha1sums = d13503902e0404cf3558db76b477f23f9910d06e
+	sha1sums = fc49742fb6c19fe0677e3552bb7c00aac8530265
 	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
 	sha1sums = 833a8622bc61fc6f41c0e87c3614dec73490c9b1
 	sha1sums = fcb6e379591f06793d4e081f8a9ea7731b484478
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 5fd339ff056f..b492755d99bd 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/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/0001-psaux-Correctly-handle-Flex-features-52846.patch b/0001-psaux-Correctly-handle-Flex-features-52846.patch
deleted file mode 100644
index 44630fbdcf1f..000000000000
--- a/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/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index 5f4391504bf8..461f8e91cdd7 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/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/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index be202c1f0902..38623e369271 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/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/PKGBUILD b/PKGBUILD
index 356c05023fff..72788040f26b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=freetype2-ttmetrics
 _srcname=freetype
-pkgver=2.9
-pkgrel=3
+pkgver=2.9.1
+pkgrel=1
 pkgdesc="Font rasterization library with TrueType metrics enabled"
 arch=(i686 x86_64)
 license=('GPL')
@@ -21,15 +21,13 @@ 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
         freetype2.sh
         enable_truetype_like_size_metrics.patch
         fix_metrics_on_size_request.patch)
-sha1sums=('94c4399b1a55c5892812e732843fcb4a7c2fe657'
-          'b69531770c343d403be294b7e4d25ac45738c833'
-          '3d26a569f0cb94c28a550577f5dcaadb4e193d91'
-          '770f1981734a837bcf065564c91644b4cc5e256a'
-          '21ad7dd31e16adb5b39adfa5671018a736626562'
+sha1sums=('220c82062171c513e4017c523d196933c9de4a7d'
+          'd9eb22e5c962923089b0c9fc5491cf28a19bd982'
+          'd13503902e0404cf3558db76b477f23f9910d06e'
+          'fc49742fb6c19fe0677e3552bb7c00aac8530265'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f'
           '833a8622bc61fc6f41c0e87c3614dec73490c9b1'
           'fcb6e379591f06793d4e081f8a9ea7731b484478')
@@ -42,10 +40,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
-
   # ttmetrics patches
   # see https://bbs.archlinux.org/viewtopic.php?id=226380
   #