apply patch from extra to fix varfonts FS#65629

6 files changed, 81 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3eb941eeebe..841f8e6d7072 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freetype2-cleartype
 	pkgdesc = Font rasterization library with ClearType patch
 	pkgver = 2.10.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.freetype.org/
 	install = freetype2.install
 	arch = x86_64
@@ -21,14 +21,16 @@ pkgbase = freetype2-cleartype
 	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 = SKIP
-	sha1sums = 46fd67e6a594f6c2c473b9321ba64913984ba42f
-	sha1sums = 4bf0c0749db09878b918cc404300f0d3e9091607
-	sha1sums = af76172be8135e74391b7ad1b82c2124ae0ad86c
+	sha1sums = 77b68e06e417783ca57c7f8d73c67feb9e230a6e
+	sha1sums = 67dc149d576cea17fe3eb9addcef19bb59b6d5be
+	sha1sums = 3559f8bb0aadef51ecef2f93c33164109e12b549
+	sha1sums = aba1f28bbbf4ff94413096e3d55ac79071a210e2
 	sha1sums = 769ee34c98e78d1e6182476704ddec85f92da394
 	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
 
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 2c38e8f5b665..f3ceb1548149 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,5 +1,4 @@
-From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001
-Message-Id: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
+From 434eca71f2d570fd0ae711fbcbad11eda043e37c 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
@@ -42,5 +41,5 @@ index dc6c8d42d..2ab145016 100644
  # Auxiliary PostScript driver component to share common code.
  #
 -- 
-2.21.0
+2.25.1
 
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
index 22a19a6463ee..74503b624ca5 100644
--- a/0002-Enable-infinality-subpixel-hinting.patch
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -1,7 +1,4 @@
-From fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2 Mon Sep 17 00:00:00 2001
-Message-Id: <fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2.1552648361.git.jan.steffens@gmail.com>
-In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
-References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
+From 782c6bf852905f655b0cfc0e59038248e1b096e0 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
@@ -26,5 +23,5 @@ index 12f47a82e..1d4469a99 100644
  
    /**************************************************************************
 -- 
-2.21.0
+2.25.1
 
diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
index 916fe9cf141f..f609f0fa1ee6 100644
--- a/0003-Enable-long-PCF-family-names.patch
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -1,7 +1,4 @@
-From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001
-Message-Id: <a7c04e60d28a0ad0420bb7a1943479a08a923d07.1552648361.git.jan.steffens@gmail.com>
-In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
-References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
+From 889a7d2febe8ef1a710af578913763ee49cba3aa 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
@@ -24,5 +21,5 @@ index 1d4469a99..4ff4e7821 100644
  
    /*************************************************************************/
 -- 
-2.21.0
+2.25.1
 
diff --git a/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch b/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch
new file mode 100644
index 000000000000..3f498d6f4fbf
--- /dev/null
+++ b/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch
@@ -0,0 +1,60 @@
+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 d64ae56f72a0..407751536aaf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=freetype2-cleartype
 pkgver=2.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Font rasterization library with ClearType patch"
 arch=('x86_64')
 license=('GPL')
@@ -29,13 +29,15 @@ 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'
           'SKIP'
-          '46fd67e6a594f6c2c473b9321ba64913984ba42f'
-          '4bf0c0749db09878b918cc404300f0d3e9091607'
-          'af76172be8135e74391b7ad1b82c2124ae0ad86c'
+          '77b68e06e417783ca57c7f8d73c67feb9e230a6e'
+          '67dc149d576cea17fe3eb9addcef19bb59b6d5be'
+          '3559f8bb0aadef51ecef2f93c33164109e12b549'
+          'aba1f28bbbf4ff94413096e3d55ac79071a210e2'
           '769ee34c98e78d1e6182476704ddec85f92da394'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -46,6 +48,9 @@ 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
 }