[arch-commits] Commit in lib32-freetype2/trunk (5 files)

Jan Steffens heftig at archlinux.org
Sat May 9 18:14:48 UTC 2020


    Date: Saturday, May 9, 2020 @ 18:14:46
  Author: heftig
Revision: 626055

2.10.2-1

Modified:
  lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch
  lib32-freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch
  lib32-freetype2/trunk/0003-Enable-long-PCF-family-names.patch
  lib32-freetype2/trunk/PKGBUILD
Deleted:
  lib32-freetype2/trunk/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch

-----------------------------------------------------------------+
 0001-Enable-table-validation-modules.patch                      |    8 -
 0002-Enable-infinality-subpixel-hinting.patch                   |   10 -
 0003-Enable-long-PCF-family-names.patch                         |   10 -
 0004-Properly-handle-phantom-points-for-variation-fonts-5.patch |   60 ----------
 PKGBUILD                                                        |   19 +--
 5 files changed, 21 insertions(+), 86 deletions(-)

Modified: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch	2020-05-09 18:00:07 UTC (rev 626054)
+++ 0001-Enable-table-validation-modules.patch	2020-05-09 18:14:46 UTC (rev 626055)
@@ -1,7 +1,7 @@
-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 at 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 ++--
@@ -8,7 +8,7 @@
  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 @@
  # Auxiliary PostScript driver component to share common code.
  #
 -- 
-2.25.1
+2.26.2
 

Modified: 0002-Enable-infinality-subpixel-hinting.patch
===================================================================
--- 0002-Enable-infinality-subpixel-hinting.patch	2020-05-09 18:00:07 UTC (rev 626054)
+++ 0002-Enable-infinality-subpixel-hinting.patch	2020-05-09 18:14:46 UTC (rev 626055)
@@ -1,7 +1,7 @@
-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 at 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 ++--
@@ -8,10 +8,10 @@
  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 @@
  
    /**************************************************************************
 -- 
-2.25.1
+2.26.2
 

Modified: 0003-Enable-long-PCF-family-names.patch
===================================================================
--- 0003-Enable-long-PCF-family-names.patch	2020-05-09 18:00:07 UTC (rev 626054)
+++ 0003-Enable-long-PCF-family-names.patch	2020-05-09 18:14:46 UTC (rev 626055)
@@ -1,7 +1,7 @@
-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 at 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 +-
@@ -8,10 +8,10 @@
  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 @@
  
    /*************************************************************************/
 -- 
-2.25.1
+2.26.2
 

Deleted: 0004-Properly-handle-phantom-points-for-variation-fonts-5.patch
===================================================================
--- 0004-Properly-handle-phantom-points-for-variation-fonts-5.patch	2020-05-09 18:00:07 UTC (rev 626054)
+++ 0004-Properly-handle-phantom-points-for-variation-fonts-5.patch	2020-05-09 18:14:46 UTC (rev 626055)
@@ -1,60 +0,0 @@
-From 2d7a2292f80368125c08f3818faf6926bcc9eb5d Mon Sep 17 00:00:00 2001
-From: Ben Wagner <bungeman at 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-05-09 18:00:07 UTC (rev 626054)
+++ PKGBUILD	2020-05-09 18:14:46 UTC (rev 626055)
@@ -3,8 +3,8 @@
 
 _pkgbasename=freetype2
 pkgname=lib32-$_pkgbasename
-pkgver=2.10.1
-pkgrel=2
+pkgver=2.10.2
+pkgrel=1
 pkgdesc="TrueType font rendering library (32-bit)"
 arch=(x86_64)
 license=('GPL')
@@ -17,14 +17,12 @@
 source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.xz{,.sig}
         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)
-sha1sums=('79874ef4eaa52025126b71d836453b8279bdd331'
+        0003-Enable-long-PCF-family-names.patch)
+sha1sums=('b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875'
           'SKIP'
-          '77b68e06e417783ca57c7f8d73c67feb9e230a6e'
-          '67dc149d576cea17fe3eb9addcef19bb59b6d5be'
-          '3559f8bb0aadef51ecef2f93c33164109e12b549'
-          'aba1f28bbbf4ff94413096e3d55ac79071a210e2')
+          '43919bfbf8fcc0e8df2659af6a1f09d338286fcf'
+          'a3267cfeb115a06ad5dd6e4a74b44778e3e6bbb6'
+          'c3903dc78dd0c233075fb33077d1e134b9d148d8')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
 prepare() {
@@ -35,9 +33,6 @@
   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
 }
 
 build() {


More information about the arch-commits mailing list