Update mingw-w64-freetype2 to 2.10.0

This commit is contained in:
Martchus 2019-03-15 23:07:57 +01:00
parent 85601f1185
commit 4b52872452
9 changed files with 63 additions and 71 deletions

View File

@ -1,5 +1,5 @@
From 7053fd3cef88991e2da6aac5f1dda2c30ce22b4c Mon Sep 17 00:00:00 2001 From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001
Message-Id: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> Message-Id: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:40:29 +0200 Date: Tue, 23 Jun 2015 08:40:29 +0200
Subject: [PATCH 1/4] Enable table validation modules Subject: [PATCH 1/4] Enable table validation modules
@ -9,42 +9,38 @@ Subject: [PATCH 1/4] Enable table validation modules
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.cfg b/modules.cfg diff --git a/modules.cfg b/modules.cfg
index 4bf344524..f9aa44b2a 100644 index dc6c8d42d..2ab145016 100644
--- a/modules.cfg --- a/modules.cfg
+++ b/modules.cfg +++ b/modules.cfg
@@ -120,30 +120,30 @@ AUX_MODULES += cache @@ -111,26 +111,26 @@ AUX_MODULES += cache
# TrueType GX/AAT table validation. Needs `ftgxval.c' below. # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
# #
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid -# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid +AUX_MODULES += gxvalid
# Support for streams compressed with gzip (files with suffix .gz). # Support for streams compressed with gzip (files with suffix .gz).
# #
# See include/freetype/ftgzip.h for the API. # See include/freetype/ftgzip.h for the API.
# No FT_CONFIG_OPTION_PIC support.
AUX_MODULES += gzip AUX_MODULES += gzip
# Support for streams compressed with LZW (files with suffix .Z). # Support for streams compressed with LZW (files with suffix .Z).
# #
# See include/freetype/ftlzw.h for the API. # See include/freetype/ftlzw.h for the API.
# No FT_CONFIG_OPTION_PIC support.
AUX_MODULES += lzw AUX_MODULES += lzw
# Support for streams compressed with bzip2 (files with suffix .bz2). # Support for streams compressed with bzip2 (files with suffix .bz2).
# #
# See include/freetype/ftbzip2.h for the API. # See include/freetype/ftbzip2.h for the API.
# No FT_CONFIG_OPTION_PIC support.
AUX_MODULES += bzip2 AUX_MODULES += bzip2
# OpenType table validation. Needs `ftotval.c' below. # OpenType table validation. Needs `ftotval.c' below.
# #
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid -# AUX_MODULES += otvalid
+AUX_MODULES += otvalid +AUX_MODULES += otvalid
# Auxiliary PostScript driver component to share common code. # Auxiliary PostScript driver component to share common code.
# #
-- --
2.17.0 2.21.0

View File

@ -1,7 +1,7 @@
From ecb052d87dd80603aac454a65fd6e074bc57772c Mon Sep 17 00:00:00 2001 From fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2 Mon Sep 17 00:00:00 2001
Message-Id: <ecb052d87dd80603aac454a65fd6e074bc57772c.1525259379.git.jan.steffens@gmail.com> Message-Id: <fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2.1552648361.git.jan.steffens@gmail.com>
In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 29 Aug 2016 08:43:10 +0200 Date: Mon, 29 Aug 2016 08:43:10 +0200
Subject: [PATCH 2/4] Enable infinality subpixel hinting Subject: [PATCH 2/4] Enable infinality subpixel hinting
@ -11,20 +11,20 @@ Subject: [PATCH 2/4] Enable infinality subpixel hinting
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 4bcab2af5..862b926d5 100644 index 12f47a82e..1d4469a99 100644
--- a/include/freetype/config/ftoption.h --- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h
@@ -658,8 +658,8 @@ FT_BEGIN_HEADER @@ -658,8 +658,8 @@ FT_BEGIN_HEADER
/* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
/* */ */
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 -#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */ -/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */ +/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) +#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
/*************************************************************************/ /**************************************************************************
-- --
2.17.0 2.21.0

View File

@ -1,7 +1,7 @@
From bbb386e90cf9440c9c9952aa14bc309f2ec76205 Mon Sep 17 00:00:00 2001 From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001
Message-Id: <bbb386e90cf9440c9c9952aa14bc309f2ec76205.1525259379.git.jan.steffens@gmail.com> Message-Id: <a7c04e60d28a0ad0420bb7a1943479a08a923d07.1552648361.git.jan.steffens@gmail.com>
In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sun, 14 May 2017 18:09:31 +0200 Date: Sun, 14 May 2017 18:09:31 +0200
Subject: [PATCH 3/4] Enable long PCF family names Subject: [PATCH 3/4] Enable long PCF family names
@ -11,18 +11,18 @@ Subject: [PATCH 3/4] Enable long PCF family names
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 862b926d5..bd6a4f7d3 100644 index 1d4469a99..4ff4e7821 100644
--- a/include/freetype/config/ftoption.h --- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h
@@ -849,7 +849,7 @@ FT_BEGIN_HEADER @@ -847,7 +847,7 @@ FT_BEGIN_HEADER
/* If this option is activated, it can be controlled with the */ * If this option is activated, it can be controlled with the
/* `no-long-family-names' property of the pcf driver module. */ * `no-long-family-names` property of the 'pcf' driver module.
/* */ */
-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES +#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
/*************************************************************************/ /*************************************************************************/
-- --
2.17.0 2.21.0

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-freetype2-bootstrap pkgname=mingw-w64-freetype2-bootstrap
pkgver=2.9.1 pkgver=2.10.0
pkgrel=1 pkgrel=1
pkgdesc='Font rasterization library (mingw-w64)' pkgdesc='Font rasterization library (mingw-w64)'
arch=('any') arch=('any')
@ -20,11 +20,11 @@ source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pk
0002-Enable-infinality-subpixel-hinting.patch 0002-Enable-infinality-subpixel-hinting.patch
0003-Enable-long-PCF-family-names.patch) 0003-Enable-long-PCF-family-names.patch)
options=(!strip !buildflags !libtool staticlibs) options=(!strip !buildflags !libtool staticlibs)
sha1sums=('220c82062171c513e4017c523d196933c9de4a7d' sha1sums=('f6abf03e0e3189a0de883981c57d3861b5d314f5'
'SKIP' 'SKIP'
'd9eb22e5c962923089b0c9fc5491cf28a19bd982' '46fd67e6a594f6c2c473b9321ba64913984ba42f'
'd13503902e0404cf3558db76b477f23f9910d06e' '4bf0c0749db09878b918cc404300f0d3e9091607'
'fc49742fb6c19fe0677e3552bb7c00aac8530265') 'af76172be8135e74391b7ad1b82c2124ae0ad86c')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then

View File

@ -1,5 +1,5 @@
From 7053fd3cef88991e2da6aac5f1dda2c30ce22b4c Mon Sep 17 00:00:00 2001 From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001
Message-Id: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> Message-Id: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:40:29 +0200 Date: Tue, 23 Jun 2015 08:40:29 +0200
Subject: [PATCH 1/4] Enable table validation modules Subject: [PATCH 1/4] Enable table validation modules
@ -9,42 +9,38 @@ Subject: [PATCH 1/4] Enable table validation modules
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.cfg b/modules.cfg diff --git a/modules.cfg b/modules.cfg
index 4bf344524..f9aa44b2a 100644 index dc6c8d42d..2ab145016 100644
--- a/modules.cfg --- a/modules.cfg
+++ b/modules.cfg +++ b/modules.cfg
@@ -120,30 +120,30 @@ AUX_MODULES += cache @@ -111,26 +111,26 @@ AUX_MODULES += cache
# TrueType GX/AAT table validation. Needs `ftgxval.c' below. # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
# #
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid -# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid +AUX_MODULES += gxvalid
# Support for streams compressed with gzip (files with suffix .gz). # Support for streams compressed with gzip (files with suffix .gz).
# #
# See include/freetype/ftgzip.h for the API. # See include/freetype/ftgzip.h for the API.
# No FT_CONFIG_OPTION_PIC support.
AUX_MODULES += gzip AUX_MODULES += gzip
# Support for streams compressed with LZW (files with suffix .Z). # Support for streams compressed with LZW (files with suffix .Z).
# #
# See include/freetype/ftlzw.h for the API. # See include/freetype/ftlzw.h for the API.
# No FT_CONFIG_OPTION_PIC support.
AUX_MODULES += lzw AUX_MODULES += lzw
# Support for streams compressed with bzip2 (files with suffix .bz2). # Support for streams compressed with bzip2 (files with suffix .bz2).
# #
# See include/freetype/ftbzip2.h for the API. # See include/freetype/ftbzip2.h for the API.
# No FT_CONFIG_OPTION_PIC support.
AUX_MODULES += bzip2 AUX_MODULES += bzip2
# OpenType table validation. Needs `ftotval.c' below. # OpenType table validation. Needs `ftotval.c' below.
# #
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid -# AUX_MODULES += otvalid
+AUX_MODULES += otvalid +AUX_MODULES += otvalid
# Auxiliary PostScript driver component to share common code. # Auxiliary PostScript driver component to share common code.
# #
-- --
2.17.0 2.21.0

View File

@ -1,7 +1,7 @@
From ecb052d87dd80603aac454a65fd6e074bc57772c Mon Sep 17 00:00:00 2001 From fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2 Mon Sep 17 00:00:00 2001
Message-Id: <ecb052d87dd80603aac454a65fd6e074bc57772c.1525259379.git.jan.steffens@gmail.com> Message-Id: <fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2.1552648361.git.jan.steffens@gmail.com>
In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 29 Aug 2016 08:43:10 +0200 Date: Mon, 29 Aug 2016 08:43:10 +0200
Subject: [PATCH 2/4] Enable infinality subpixel hinting Subject: [PATCH 2/4] Enable infinality subpixel hinting
@ -11,20 +11,20 @@ Subject: [PATCH 2/4] Enable infinality subpixel hinting
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 4bcab2af5..862b926d5 100644 index 12f47a82e..1d4469a99 100644
--- a/include/freetype/config/ftoption.h --- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h
@@ -658,8 +658,8 @@ FT_BEGIN_HEADER @@ -658,8 +658,8 @@ FT_BEGIN_HEADER
/* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
/* */ */
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 -#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */ -/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */ +/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) +#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
/*************************************************************************/ /**************************************************************************
-- --
2.17.0 2.21.0

View File

@ -1,7 +1,7 @@
From bbb386e90cf9440c9c9952aa14bc309f2ec76205 Mon Sep 17 00:00:00 2001 From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001
Message-Id: <bbb386e90cf9440c9c9952aa14bc309f2ec76205.1525259379.git.jan.steffens@gmail.com> Message-Id: <a7c04e60d28a0ad0420bb7a1943479a08a923d07.1552648361.git.jan.steffens@gmail.com>
In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sun, 14 May 2017 18:09:31 +0200 Date: Sun, 14 May 2017 18:09:31 +0200
Subject: [PATCH 3/4] Enable long PCF family names Subject: [PATCH 3/4] Enable long PCF family names
@ -11,18 +11,18 @@ Subject: [PATCH 3/4] Enable long PCF family names
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 862b926d5..bd6a4f7d3 100644 index 1d4469a99..4ff4e7821 100644
--- a/include/freetype/config/ftoption.h --- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h
@@ -849,7 +849,7 @@ FT_BEGIN_HEADER @@ -847,7 +847,7 @@ FT_BEGIN_HEADER
/* If this option is activated, it can be controlled with the */ * If this option is activated, it can be controlled with the
/* `no-long-family-names' property of the pcf driver module. */ * `no-long-family-names` property of the 'pcf' driver module.
/* */ */
-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES +#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
/*************************************************************************/ /*************************************************************************/
-- --
2.17.0 2.21.0

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository. # you also find the URL of a binary repository.
pkgname=mingw-w64-freetype2 pkgname=mingw-w64-freetype2
pkgver=2.9.1 pkgver=2.10.0
pkgrel=1 pkgrel=1
pkgdesc='Font rasterization library (mingw-w64)' pkgdesc='Font rasterization library (mingw-w64)'
arch=('any') arch=('any')
@ -20,11 +20,11 @@ source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pk
0002-Enable-infinality-subpixel-hinting.patch 0002-Enable-infinality-subpixel-hinting.patch
0003-Enable-long-PCF-family-names.patch) 0003-Enable-long-PCF-family-names.patch)
options=(!strip !buildflags !libtool staticlibs) options=(!strip !buildflags !libtool staticlibs)
sha1sums=('220c82062171c513e4017c523d196933c9de4a7d' sha1sums=('f6abf03e0e3189a0de883981c57d3861b5d314f5'
'SKIP' 'SKIP'
'd9eb22e5c962923089b0c9fc5491cf28a19bd982' '46fd67e6a594f6c2c473b9321ba64913984ba42f'
'd13503902e0404cf3558db76b477f23f9910d06e' '4bf0c0749db09878b918cc404300f0d3e9091607'
'fc49742fb6c19fe0677e3552bb7c00aac8530265') 'af76172be8135e74391b7ad1b82c2124ae0ad86c')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then

View File

@ -1,4 +1,4 @@
#!/usr/bin/bash #!/bin/bash
# Syncs the different variants of mingw-w64-qt5-base # Syncs the different variants of mingw-w64-qt5-base