[arch-commits] Commit in lib32-freetype2/repos/multilib-x86_64 (9 files)
Jan Steffens
heftig at archlinux.org
Thu Feb 27 14:27:49 UTC 2020
Date: Thursday, February 27, 2020 @ 14:27:49
Author: heftig
Revision: 584145
archrelease: copy trunk to multilib-x86_64
Added:
lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch
(from rev 584144, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch)
lib32-freetype2/repos/multilib-x86_64/0002-Enable-infinality-subpixel-hinting.patch
(from rev 584144, lib32-freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch)
lib32-freetype2/repos/multilib-x86_64/0003-Enable-long-PCF-family-names.patch
(from rev 584144, lib32-freetype2/trunk/0003-Enable-long-PCF-family-names.patch)
lib32-freetype2/repos/multilib-x86_64/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch
(from rev 584144, lib32-freetype2/trunk/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch)
lib32-freetype2/repos/multilib-x86_64/PKGBUILD
(from rev 584144, lib32-freetype2/trunk/PKGBUILD)
Deleted:
lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch
lib32-freetype2/repos/multilib-x86_64/0002-Enable-infinality-subpixel-hinting.patch
lib32-freetype2/repos/multilib-x86_64/0003-Enable-long-PCF-family-names.patch
lib32-freetype2/repos/multilib-x86_64/PKGBUILD
-----------------------------------------------------------------+
0001-Enable-table-validation-modules.patch | 90 +++----
0002-Enable-infinality-subpixel-hinting.patch | 54 ++--
0003-Enable-long-PCF-family-names.patch | 50 ++--
0004-Properly-handle-phantom-points-for-variation-fonts-5.patch | 60 ++++
PKGBUILD | 125 +++++-----
5 files changed, 222 insertions(+), 157 deletions(-)
Deleted: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch 2020-02-27 14:27:20 UTC (rev 584144)
+++ 0001-Enable-table-validation-modules.patch 2020-02-27 14:27:49 UTC (rev 584145)
@@ -1,45 +0,0 @@
-From 1b46dedc6316849e61b22187091dc7ab40fec7a5 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/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
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -111,26 +111,26 @@ AUX_MODULES += cache
-
- # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
- #
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
-
- # Support for streams compressed with gzip (files with suffix .gz).
- #
- # See include/freetype/ftgzip.h for the API.
- AUX_MODULES += gzip
-
- # Support for streams compressed with LZW (files with suffix .Z).
- #
- # See include/freetype/ftlzw.h for the API.
- AUX_MODULES += lzw
-
- # Support for streams compressed with bzip2 (files with suffix .bz2).
- #
- # See include/freetype/ftbzip2.h for the API.
- AUX_MODULES += bzip2
-
- # OpenType table validation. Needs `ftotval.c' below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
-
- # Auxiliary PostScript driver component to share common code.
- #
---
-2.22.0
-
Copied: lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch (from rev 584144, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- 0001-Enable-table-validation-modules.patch (rev 0)
+++ 0001-Enable-table-validation-modules.patch 2020-02-27 14:27:49 UTC (rev 584145)
@@ -0,0 +1,45 @@
+From 434eca71f2d570fd0ae711fbcbad11eda043e37c 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
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index dc6c8d42d..2ab145016 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -111,26 +111,26 @@ AUX_MODULES += cache
+
+ # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
+ #
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+ # See include/freetype/ftgzip.h for the API.
+ AUX_MODULES += gzip
+
+ # Support for streams compressed with LZW (files with suffix .Z).
+ #
+ # See include/freetype/ftlzw.h for the API.
+ AUX_MODULES += lzw
+
+ # Support for streams compressed with bzip2 (files with suffix .bz2).
+ #
+ # See include/freetype/ftbzip2.h for the API.
+ AUX_MODULES += bzip2
+
+ # OpenType table validation. Needs `ftotval.c' below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
+--
+2.25.1
+
Deleted: 0002-Enable-infinality-subpixel-hinting.patch
===================================================================
--- 0002-Enable-infinality-subpixel-hinting.patch 2020-02-27 14:27:20 UTC (rev 584144)
+++ 0002-Enable-infinality-subpixel-hinting.patch 2020-02-27 14:27:49 UTC (rev 584145)
@@ -1,27 +0,0 @@
-From db01ee6d453cd2f6bfcbb3420ec1a48b2d37631c 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/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
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -658,8 +658,8 @@ FT_BEGIN_HEADER
- * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
- */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
--#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
-
-
- /**************************************************************************
---
-2.22.0
-
Copied: lib32-freetype2/repos/multilib-x86_64/0002-Enable-infinality-subpixel-hinting.patch (from rev 584144, lib32-freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- 0002-Enable-infinality-subpixel-hinting.patch (rev 0)
+++ 0002-Enable-infinality-subpixel-hinting.patch 2020-02-27 14:27:49 UTC (rev 584145)
@@ -0,0 +1,27 @@
+From 782c6bf852905f655b0cfc0e59038248e1b096e0 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
+
+---
+ 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
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -658,8 +658,8 @@ FT_BEGIN_HEADER
+ * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
+ */
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
+-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
+
+
+ /**************************************************************************
+--
+2.25.1
+
Deleted: 0003-Enable-long-PCF-family-names.patch
===================================================================
--- 0003-Enable-long-PCF-family-names.patch 2020-02-27 14:27:20 UTC (rev 584144)
+++ 0003-Enable-long-PCF-family-names.patch 2020-02-27 14:27:49 UTC (rev 584145)
@@ -1,25 +0,0 @@
-From 41449761b1200749b34e034f9b4b3c0bdf299013 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/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
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -847,7 +847,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.
- */
--/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
-+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
-
- /*************************************************************************/
---
-2.22.0
-
Copied: lib32-freetype2/repos/multilib-x86_64/0003-Enable-long-PCF-family-names.patch (from rev 584144, lib32-freetype2/trunk/0003-Enable-long-PCF-family-names.patch)
===================================================================
--- 0003-Enable-long-PCF-family-names.patch (rev 0)
+++ 0003-Enable-long-PCF-family-names.patch 2020-02-27 14:27:49 UTC (rev 584145)
@@ -0,0 +1,25 @@
+From 889a7d2febe8ef1a710af578913763ee49cba3aa 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
+
+---
+ 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
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -847,7 +847,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.
+ */
+-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+
+ /*************************************************************************/
+--
+2.25.1
+
Copied: lib32-freetype2/repos/multilib-x86_64/0004-Properly-handle-phantom-points-for-variation-fonts-5.patch (from rev 584144, lib32-freetype2/trunk/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:27:49 UTC (rev 584145)
@@ -0,0 +1,60 @@
+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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-27 14:27:20 UTC (rev 584144)
+++ PKGBUILD 2020-02-27 14:27:49 UTC (rev 584145)
@@ -1,60 +0,0 @@
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-_pkgbasename=freetype2
-pkgname=lib32-$_pkgbasename
-pkgver=2.10.1
-pkgrel=1
-pkgdesc="TrueType font rendering library (32-bit)"
-arch=(x86_64)
-license=('GPL')
-url="https://www.freetype.org/"
-# adding harfbuzz for improved OpenType features auto-hinting
-# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
-depends=('lib32-zlib' 'lib32-bzip2' 'lib32-libpng' 'lib32-harfbuzz' $_pkgbasename)
-makedepends=('gcc-multilib')
-provides=('libfreetype.so')
-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)
-sha1sums=('79874ef4eaa52025126b71d836453b8279bdd331'
- 'SKIP'
- '283427030ef4b942f01e24ba022f2b84f1733fa8'
- '1efd1e1db64cb7705296b724920d6328ff5f1f14'
- '6b289e2ba54a4513af9aa3981b374fccb20ffc89')
-validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
-
-prepare() {
- # Rename source dir to allow building the demos
- mv freetype-${pkgver} freetype2
-
- cd freetype2
- 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
-}
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd freetype2
- ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
- make
-}
-
-check() {
- cd freetype2
- make -k check
-}
-
-package() {
- cd freetype2
- make DESTDIR="${pkgdir}" install
-
- rm -r "${pkgdir}"/usr/{include,share}
-}
-
-# vim:set ts=2 sw=2 et:
Copied: lib32-freetype2/repos/multilib-x86_64/PKGBUILD (from rev 584144, lib32-freetype2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-02-27 14:27:49 UTC (rev 584145)
@@ -0,0 +1,65 @@
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+_pkgbasename=freetype2
+pkgname=lib32-$_pkgbasename
+pkgver=2.10.1
+pkgrel=2
+pkgdesc="TrueType font rendering library (32-bit)"
+arch=(x86_64)
+license=('GPL')
+url="https://www.freetype.org/"
+# adding harfbuzz for improved OpenType features auto-hinting
+# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+depends=('lib32-zlib' 'lib32-bzip2' 'lib32-libpng' 'lib32-harfbuzz' $_pkgbasename)
+makedepends=('gcc-multilib')
+provides=('libfreetype.so')
+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'
+ 'SKIP'
+ '77b68e06e417783ca57c7f8d73c67feb9e230a6e'
+ '67dc149d576cea17fe3eb9addcef19bb59b6d5be'
+ '3559f8bb0aadef51ecef2f93c33164109e12b549'
+ 'aba1f28bbbf4ff94413096e3d55ac79071a210e2')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+prepare() {
+ # Rename source dir to allow building the demos
+ mv freetype-${pkgver} freetype2
+
+ cd freetype2
+ 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() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ cd freetype2
+ ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
+ make
+}
+
+check() {
+ cd freetype2
+ make -k check
+}
+
+package() {
+ cd freetype2
+ make DESTDIR="${pkgdir}" install
+
+ rm -r "${pkgdir}"/usr/{include,share}
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list