update to 2.10.2

6 files changed, 28 insertions, 94 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 841f8e6d7072..b4194bd056a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freetype2-cleartype
 	pkgdesc = Font rasterization library with ClearType patch
-	pkgver = 2.10.1
-	pkgrel = 2
+	pkgver = 2.10.2
+	pkgrel = 1
 	url = https://www.freetype.org/
 	install = freetype2.install
 	arch = x86_64
@@ -16,21 +16,19 @@ pkgbase = freetype2-cleartype
 	provides = libfreetype.so
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
-	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.xz
-	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.xz.sig
+	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.2.tar.xz
+	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.2.tar.xz.sig
 	source = 0001-Enable-table-validation-modules.patch
 	source = 0002-Enable-infinality-subpixel-hinting.patch
 	source = 0003-Enable-long-PCF-family-names.patch
-	source = 0004-Properly-handle-phantom-points-for-variation-fonts-5.patch
 	source = 0007-cleartype.patch
 	source = freetype2.sh
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
-	sha1sums = 79874ef4eaa52025126b71d836453b8279bdd331
+	sha1sums = b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875
 	sha1sums = SKIP
-	sha1sums = 77b68e06e417783ca57c7f8d73c67feb9e230a6e
-	sha1sums = 67dc149d576cea17fe3eb9addcef19bb59b6d5be
-	sha1sums = 3559f8bb0aadef51ecef2f93c33164109e12b549
-	sha1sums = aba1f28bbbf4ff94413096e3d55ac79071a210e2
+	sha1sums = 43919bfbf8fcc0e8df2659af6a1f09d338286fcf
+	sha1sums = a3267cfeb115a06ad5dd6e4a74b44778e3e6bbb6
+	sha1sums = c3903dc78dd0c233075fb33077d1e134b9d148d8
 	sha1sums = 769ee34c98e78d1e6182476704ddec85f92da394
 	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
 
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index f3ceb1548149..fbbc30bffbc4 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,14 +1,14 @@
-From 434eca71f2d570fd0ae711fbcbad11eda043e37c Mon Sep 17 00:00:00 2001
+From c29e554b370dd9e283a53b81527434415f4572c2 Mon Sep 17 00:00:00 2001
 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
+Subject: [PATCH 1/3] Enable table validation modules
 
 ---
  modules.cfg | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.cfg b/modules.cfg
-index dc6c8d42d..2ab145016 100644
+index d6cdbe523..181f91541 100644
 --- a/modules.cfg
 +++ b/modules.cfg
 @@ -111,26 +111,26 @@ AUX_MODULES += cache
@@ -41,5 +41,5 @@ index dc6c8d42d..2ab145016 100644
  # Auxiliary PostScript driver component to share common code.
  #
 -- 
-2.25.1
+2.26.2
 
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index 74503b624ca5..3073f4786501 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,17 +1,17 @@
-From 782c6bf852905f655b0cfc0e59038248e1b096e0 Mon Sep 17 00:00:00 2001
+From 9f26c483bbc0e96967963905ea824e20a0f30778 Mon Sep 17 00:00:00 2001
 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
+Subject: [PATCH 2/3] Enable infinality subpixel hinting
 
 ---
  include/freetype/config/ftoption.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 12f47a82e..1d4469a99 100644
+index 426806d2e..1cadffe8a 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -658,8 +658,8 @@ FT_BEGIN_HEADER
+@@ -674,8 +674,8 @@ FT_BEGIN_HEADER
     * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
     */
  /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
@@ -23,5 +23,5 @@ index 12f47a82e..1d4469a99 100644
  
    /**************************************************************************
 -- 
-2.25.1
+2.26.2
 
diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index f609f0fa1ee6..12130e99150c 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -1,17 +1,17 @@
-From 889a7d2febe8ef1a710af578913763ee49cba3aa Mon Sep 17 00:00:00 2001
+From cd916f63dc53e7116aa99c4775e13caca7b3c59c Mon Sep 17 00:00:00 2001
 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
+Subject: [PATCH 3/3] Enable long PCF family names
 
 ---
  include/freetype/config/ftoption.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 1d4469a99..4ff4e7821 100644
+index 1cadffe8a..569d1c638 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -847,7 +847,7 @@ FT_BEGIN_HEADER
+@@ -863,7 +863,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.
     */
@@ -21,5 +21,5 @@ index 1d4469a99..4ff4e7821 100644
  
    /*************************************************************************/
 -- 
-2.25.1
+2.26.2
 
diff --git a/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch b/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch
deleted file mode 100644
index 3f498d6f4fbf..000000000000
--- a/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2d7a2292f80368125c08f3818faf6926bcc9eb5d Mon Sep 17 00:00:00 2001
-From: Ben Wagner <bungeman@google.com>
-Date: Fri, 12 Jul 2019 10:48:10 +0200
-Subject: [PATCH 4/4] Properly handle phantom points for variation fonts
- (#56601).
-
-* src/truetype/ttgload.c (TT_Process_Simple_Glyph): Scale phantom
-points if HVAR and/or VVAR is present.
----
- src/truetype/ttgload.c | 27 +++++++++++++++++++++------
- 1 file changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
-index a04684086..093eed839 100644
---- a/src/truetype/ttgload.c
-+++ b/src/truetype/ttgload.c
-@@ -1102,19 +1102,34 @@
-       }
- 
- #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
--      /* if we have a HVAR table, `pp1' and/or `pp2' are already adjusted */
--      if ( !( loader->face->variation_support & TT_FACE_FLAG_VAR_HADVANCE ) ||
--           !IS_HINTED( loader->load_flags )                                 )
-+      /* if we have a HVAR table, `pp1' and/or `pp2' */
-+      /* are already adjusted but unscaled           */
-+      if ( ( loader->face->variation_support & TT_FACE_FLAG_VAR_HADVANCE ) &&
-+           IS_HINTED( loader->load_flags )                                 )
-+      {
-+        loader->pp1.x = FT_MulFix( loader->pp1.x, x_scale );
-+        loader->pp2.x = FT_MulFix( loader->pp2.x, x_scale );
-+        /* pp1.y and pp2.y are always zero */
-+      }
-+      else
- #endif
-       {
-         loader->pp1 = outline->points[n_points - 4];
-         loader->pp2 = outline->points[n_points - 3];
-       }
- 
- #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
--      /* if we have a VVAR table, `pp3' and/or `pp4' are already adjusted */
--      if ( !( loader->face->variation_support & TT_FACE_FLAG_VAR_VADVANCE ) ||
--           !IS_HINTED( loader->load_flags )                                 )
-+      /* if we have a VVAR table, `pp3' and/or `pp4' */
-+      /* are already adjusted but unscaled           */
-+      if ( ( loader->face->variation_support & TT_FACE_FLAG_VAR_VADVANCE ) &&
-+           IS_HINTED( loader->load_flags )                                 )
-+      {
-+        loader->pp3.x = FT_MulFix( loader->pp3.x, x_scale );
-+        loader->pp3.y = FT_MulFix( loader->pp3.y, y_scale );
-+        loader->pp4.x = FT_MulFix( loader->pp4.x, x_scale );
-+        loader->pp4.y = FT_MulFix( loader->pp4.y, y_scale );
-+      }
-+      else
- #endif
-       {
-         loader->pp3 = outline->points[n_points - 2];
--- 
-2.25.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 407751536aaf..43d939918247 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@
 # Contributor: freedom
 
 pkgname=freetype2-cleartype
-pkgver=2.10.1
-pkgrel=2
+pkgver=2.10.2
+pkgrel=1
 pkgdesc="Font rasterization library with ClearType patch"
 arch=('x86_64')
 license=('GPL')
@@ -29,15 +29,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
-        0004-Properly-handle-phantom-points-for-variation-fonts-5.patch
         0007-cleartype.patch
         freetype2.sh)
-sha1sums=('79874ef4eaa52025126b71d836453b8279bdd331'
+sha1sums=('b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875'
           'SKIP'
-          '77b68e06e417783ca57c7f8d73c67feb9e230a6e'
-          '67dc149d576cea17fe3eb9addcef19bb59b6d5be'
-          '3559f8bb0aadef51ecef2f93c33164109e12b549'
-          'aba1f28bbbf4ff94413096e3d55ac79071a210e2'
+          '43919bfbf8fcc0e8df2659af6a1f09d338286fcf'
+          'a3267cfeb115a06ad5dd6e4a74b44778e3e6bbb6'
+          'c3903dc78dd0c233075fb33077d1e134b9d148d8'
           '769ee34c98e78d1e6182476704ddec85f92da394'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -48,8 +46,6 @@ prepare() {
 	patch -Np1 -i ../0001-Enable-table-validation-modules.patch
 	patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch
 	patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
-	# https://bugs.archlinux.org/task/65629
-	patch -Np1 -i ../0004-Properly-handle-phantom-points-for-variation-fonts-5.patch
 
 	# Enable ClearType
 	patch -Np1 -i ../0007-cleartype.patch