From 4b52872452dbc8761651023bb65b0a269420af69 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 15 Mar 2019 23:07:57 +0100 Subject: [PATCH] Update mingw-w64-freetype2 to 2.10.0 --- ...0001-Enable-table-validation-modules.patch | 16 ++++++--------- ...2-Enable-infinality-subpixel-hinting.patch | 20 +++++++++---------- .../0003-Enable-long-PCF-family-names.patch | 20 +++++++++---------- freetype2/mingw-w64-bootstrap/PKGBUILD | 10 +++++----- ...0001-Enable-table-validation-modules.patch | 16 ++++++--------- ...2-Enable-infinality-subpixel-hinting.patch | 20 +++++++++---------- .../0003-Enable-long-PCF-family-names.patch | 20 +++++++++---------- freetype2/mingw-w64/PKGBUILD | 10 +++++----- freetype2/sync-variants.sh | 2 +- 9 files changed, 63 insertions(+), 71 deletions(-) diff --git a/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch b/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch index b492755d..2c38e8f5 100644 --- a/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch +++ b/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch @@ -1,5 +1,5 @@ -From 7053fd3cef88991e2da6aac5f1dda2c30ce22b4c Mon Sep 17 00:00:00 2001 -Message-Id: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> +From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001 +Message-Id: From: "Jan Alexander Steffens (heftig)" Date: Tue, 23 Jun 2015 08:40:29 +0200 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(-) diff --git a/modules.cfg b/modules.cfg -index 4bf344524..f9aa44b2a 100644 +index dc6c8d42d..2ab145016 100644 --- a/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. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += gxvalid +AUX_MODULES += gxvalid # Support for streams compressed with gzip (files with suffix .gz). # # See include/freetype/ftgzip.h for the API. - # No FT_CONFIG_OPTION_PIC support. AUX_MODULES += gzip # Support for streams compressed with LZW (files with suffix .Z). # # See include/freetype/ftlzw.h for the API. - # No FT_CONFIG_OPTION_PIC support. AUX_MODULES += lzw # Support for streams compressed with bzip2 (files with suffix .bz2). # # See include/freetype/ftbzip2.h for the API. - # No FT_CONFIG_OPTION_PIC support. AUX_MODULES += bzip2 # OpenType table validation. Needs `ftotval.c' below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += otvalid +AUX_MODULES += otvalid # Auxiliary PostScript driver component to share common code. # -- -2.17.0 +2.21.0 diff --git a/freetype2/mingw-w64-bootstrap/0002-Enable-infinality-subpixel-hinting.patch b/freetype2/mingw-w64-bootstrap/0002-Enable-infinality-subpixel-hinting.patch index 461f8e91..22a19a64 100644 --- a/freetype2/mingw-w64-bootstrap/0002-Enable-infinality-subpixel-hinting.patch +++ b/freetype2/mingw-w64-bootstrap/0002-Enable-infinality-subpixel-hinting.patch @@ -1,7 +1,7 @@ -From ecb052d87dd80603aac454a65fd6e074bc57772c Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> -References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> +From fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: "Jan Alexander Steffens (heftig)" Date: Mon, 29 Aug 2016 08:43:10 +0200 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(-) 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 +++ b/include/freetype/config/ftoption.h @@ -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 2 -/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 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 diff --git a/freetype2/mingw-w64-bootstrap/0003-Enable-long-PCF-family-names.patch b/freetype2/mingw-w64-bootstrap/0003-Enable-long-PCF-family-names.patch index 38623e36..916fe9cf 100644 --- a/freetype2/mingw-w64-bootstrap/0003-Enable-long-PCF-family-names.patch +++ b/freetype2/mingw-w64-bootstrap/0003-Enable-long-PCF-family-names.patch @@ -1,7 +1,7 @@ -From bbb386e90cf9440c9c9952aa14bc309f2ec76205 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> -References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> +From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: "Jan Alexander Steffens (heftig)" Date: Sun, 14 May 2017 18:09:31 +0200 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(-) 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 +++ b/include/freetype/config/ftoption.h -@@ -849,7 +849,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. */ - /* */ +@@ -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.17.0 +2.21.0 diff --git a/freetype2/mingw-w64-bootstrap/PKGBUILD b/freetype2/mingw-w64-bootstrap/PKGBUILD index ad2d8266..c839fdae 100644 --- a/freetype2/mingw-w64-bootstrap/PKGBUILD +++ b/freetype2/mingw-w64-bootstrap/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-freetype2-bootstrap -pkgver=2.9.1 +pkgver=2.10.0 pkgrel=1 pkgdesc='Font rasterization library (mingw-w64)' arch=('any') @@ -20,11 +20,11 @@ source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pk 0002-Enable-infinality-subpixel-hinting.patch 0003-Enable-long-PCF-family-names.patch) options=(!strip !buildflags !libtool staticlibs) -sha1sums=('220c82062171c513e4017c523d196933c9de4a7d' +sha1sums=('f6abf03e0e3189a0de883981c57d3861b5d314f5' 'SKIP' - 'd9eb22e5c962923089b0c9fc5491cf28a19bd982' - 'd13503902e0404cf3558db76b477f23f9910d06e' - 'fc49742fb6c19fe0677e3552bb7c00aac8530265') + '46fd67e6a594f6c2c473b9321ba64913984ba42f' + '4bf0c0749db09878b918cc404300f0d3e9091607' + 'af76172be8135e74391b7ad1b82c2124ae0ad86c') validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then diff --git a/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch b/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch index b492755d..2c38e8f5 100644 --- a/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch +++ b/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch @@ -1,5 +1,5 @@ -From 7053fd3cef88991e2da6aac5f1dda2c30ce22b4c Mon Sep 17 00:00:00 2001 -Message-Id: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> +From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001 +Message-Id: From: "Jan Alexander Steffens (heftig)" Date: Tue, 23 Jun 2015 08:40:29 +0200 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(-) diff --git a/modules.cfg b/modules.cfg -index 4bf344524..f9aa44b2a 100644 +index dc6c8d42d..2ab145016 100644 --- a/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. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += gxvalid +AUX_MODULES += gxvalid # Support for streams compressed with gzip (files with suffix .gz). # # See include/freetype/ftgzip.h for the API. - # No FT_CONFIG_OPTION_PIC support. AUX_MODULES += gzip # Support for streams compressed with LZW (files with suffix .Z). # # See include/freetype/ftlzw.h for the API. - # No FT_CONFIG_OPTION_PIC support. AUX_MODULES += lzw # Support for streams compressed with bzip2 (files with suffix .bz2). # # See include/freetype/ftbzip2.h for the API. - # No FT_CONFIG_OPTION_PIC support. AUX_MODULES += bzip2 # OpenType table validation. Needs `ftotval.c' below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += otvalid +AUX_MODULES += otvalid # Auxiliary PostScript driver component to share common code. # -- -2.17.0 +2.21.0 diff --git a/freetype2/mingw-w64/0002-Enable-infinality-subpixel-hinting.patch b/freetype2/mingw-w64/0002-Enable-infinality-subpixel-hinting.patch index 461f8e91..22a19a64 100644 --- a/freetype2/mingw-w64/0002-Enable-infinality-subpixel-hinting.patch +++ b/freetype2/mingw-w64/0002-Enable-infinality-subpixel-hinting.patch @@ -1,7 +1,7 @@ -From ecb052d87dd80603aac454a65fd6e074bc57772c Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> -References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> +From fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: "Jan Alexander Steffens (heftig)" Date: Mon, 29 Aug 2016 08:43:10 +0200 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(-) 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 +++ b/include/freetype/config/ftoption.h @@ -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 2 -/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 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 diff --git a/freetype2/mingw-w64/0003-Enable-long-PCF-family-names.patch b/freetype2/mingw-w64/0003-Enable-long-PCF-family-names.patch index 38623e36..916fe9cf 100644 --- a/freetype2/mingw-w64/0003-Enable-long-PCF-family-names.patch +++ b/freetype2/mingw-w64/0003-Enable-long-PCF-family-names.patch @@ -1,7 +1,7 @@ -From bbb386e90cf9440c9c9952aa14bc309f2ec76205 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> -References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens@gmail.com> +From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: "Jan Alexander Steffens (heftig)" Date: Sun, 14 May 2017 18:09:31 +0200 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(-) 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 +++ b/include/freetype/config/ftoption.h -@@ -849,7 +849,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. */ - /* */ +@@ -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.17.0 +2.21.0 diff --git a/freetype2/mingw-w64/PKGBUILD b/freetype2/mingw-w64/PKGBUILD index 05689fab..ca861e11 100644 --- a/freetype2/mingw-w64/PKGBUILD +++ b/freetype2/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-freetype2 -pkgver=2.9.1 +pkgver=2.10.0 pkgrel=1 pkgdesc='Font rasterization library (mingw-w64)' arch=('any') @@ -20,11 +20,11 @@ source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pk 0002-Enable-infinality-subpixel-hinting.patch 0003-Enable-long-PCF-family-names.patch) options=(!strip !buildflags !libtool staticlibs) -sha1sums=('220c82062171c513e4017c523d196933c9de4a7d' +sha1sums=('f6abf03e0e3189a0de883981c57d3861b5d314f5' 'SKIP' - 'd9eb22e5c962923089b0c9fc5491cf28a19bd982' - 'd13503902e0404cf3558db76b477f23f9910d06e' - 'fc49742fb6c19fe0677e3552bb7c00aac8530265') + '46fd67e6a594f6c2c473b9321ba64913984ba42f' + '4bf0c0749db09878b918cc404300f0d3e9091607' + 'af76172be8135e74391b7ad1b82c2124ae0ad86c') validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then diff --git a/freetype2/sync-variants.sh b/freetype2/sync-variants.sh index b2e521fe..49d884b1 100755 --- a/freetype2/sync-variants.sh +++ b/freetype2/sync-variants.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash # Syncs the different variants of mingw-w64-qt5-base