Date: Thursday, February 27, 2020 @ 14:22:33 Author: heftig Revision: 376292
2.10.1-2: FS#65629 fix some varfonts Added: freetype2/trunk/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch Modified: freetype2/trunk/0001-Enable-table-validation-modules.patch freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch freetype2/trunk/0003-Enable-long-PCF-family-names.patch freetype2/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-Enable-table-validation-modules.patch | 6 - 0002-Enable-infinality-subpixel-hinting.patch | 6 - 0003-Enable-long-PCF-family-names.patch | 6 - 0004-Properly-handle-phantom-points-for-variation-fonts-5.patch | 60 ++++++++++ PKGBUILD | 13 +- 5 files changed, 78 insertions(+), 13 deletions(-) Modified: 0001-Enable-table-validation-modules.patch =================================================================== --- 0001-Enable-table-validation-modules.patch 2020-02-27 14:16:24 UTC (rev 376291) +++ 0001-Enable-table-validation-modules.patch 2020-02-27 14:22:33 UTC (rev 376292) @@ -1,7 +1,7 @@ -From 1b46dedc6316849e61b22187091dc7ab40fec7a5 Mon Sep 17 00:00:00 2001 +From 434eca71f2d570fd0ae711fbcbad11eda043e37c Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> Date: Tue, 23 Jun 2015 08:40:29 +0200 -Subject: [PATCH 1/3] Enable table validation modules +Subject: [PATCH 1/4] Enable table validation modules --- modules.cfg | 4 ++-- @@ -41,5 +41,5 @@ # Auxiliary PostScript driver component to share common code. # -- -2.22.0 +2.25.1 Modified: 0002-Enable-infinality-subpixel-hinting.patch =================================================================== --- 0002-Enable-infinality-subpixel-hinting.patch 2020-02-27 14:16:24 UTC (rev 376291) +++ 0002-Enable-infinality-subpixel-hinting.patch 2020-02-27 14:22:33 UTC (rev 376292) @@ -1,7 +1,7 @@ -From db01ee6d453cd2f6bfcbb3420ec1a48b2d37631c Mon Sep 17 00:00:00 2001 +From 782c6bf852905f655b0cfc0e59038248e1b096e0 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> Date: Mon, 29 Aug 2016 08:43:10 +0200 -Subject: [PATCH 2/3] Enable infinality subpixel hinting +Subject: [PATCH 2/4] Enable infinality subpixel hinting --- include/freetype/config/ftoption.h | 4 ++-- @@ -23,5 +23,5 @@ /************************************************************************** -- -2.22.0 +2.25.1 Modified: 0003-Enable-long-PCF-family-names.patch =================================================================== --- 0003-Enable-long-PCF-family-names.patch 2020-02-27 14:16:24 UTC (rev 376291) +++ 0003-Enable-long-PCF-family-names.patch 2020-02-27 14:22:33 UTC (rev 376292) @@ -1,7 +1,7 @@ -From 41449761b1200749b34e034f9b4b3c0bdf299013 Mon Sep 17 00:00:00 2001 +From 889a7d2febe8ef1a710af578913763ee49cba3aa Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> Date: Sun, 14 May 2017 18:09:31 +0200 -Subject: [PATCH 3/3] Enable long PCF family names +Subject: [PATCH 3/4] Enable long PCF family names --- include/freetype/config/ftoption.h | 2 +- @@ -21,5 +21,5 @@ /*************************************************************************/ -- -2.22.0 +2.25.1 Added: 0004-Properly-handle-phantom-points-for-variation-fonts-5.patch =================================================================== --- 0004-Properly-handle-phantom-points-for-variation-fonts-5.patch (rev 0) +++ 0004-Properly-handle-phantom-points-for-variation-fonts-5.patch 2020-02-27 14:22:33 UTC (rev 376292) @@ -0,0 +1,60 @@ +From 2d7a2292f80368125c08f3818faf6926bcc9eb5d Mon Sep 17 00:00:00 2001 +From: Ben Wagner <bunge...@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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-27 14:16:24 UTC (rev 376291) +++ PKGBUILD 2020-02-27 14:22:33 UTC (rev 376292) @@ -3,7 +3,7 @@ pkgbase=freetype2 pkgname=('freetype2' 'freetype2-demos' 'freetype2-docs') pkgver=2.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Font rasterization library" arch=(x86_64) license=('GPL') @@ -18,6 +18,7 @@ 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 freetype-2.5.2-more-demos.patch freetype2.sh) sha1sums=('79874ef4eaa52025126b71d836453b8279bdd331' @@ -26,9 +27,10 @@ 'SKIP' 'bf5e24878c66404b765eab638783626d777a25ac' 'SKIP' - '283427030ef4b942f01e24ba022f2b84f1733fa8' - '1efd1e1db64cb7705296b724920d6328ff5f1f14' - '6b289e2ba54a4513af9aa3981b374fccb20ffc89' + '77b68e06e417783ca57c7f8d73c67feb9e230a6e' + '67dc149d576cea17fe3eb9addcef19bb59b6d5be' + '3559f8bb0aadef51ecef2f93c33164109e12b549' + 'aba1f28bbbf4ff94413096e3d55ac79071a210e2' '72cfecbe738085eec475e012617661ad0cc9b76f' 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f') validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') @@ -43,6 +45,9 @@ 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 + cd ../freetype2-demos # enable more demos patch -Np1 -i ../freetype-2.5.2-more-demos.patch