From d50a65be3b6db9dee0e44bab89de06bdb7e30a3d Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 29 Dec 2020 20:21:49 +0100 Subject: [PATCH] Update mingw-w64-freetype2 --- ...0001-Enable-table-validation-modules.patch | 10 ++----- .../0002-Enable-subpixel-rendering.patch | 22 ++++++++++++++ ...-Enable-infinality-subpixel-hinting.patch} | 14 +++------ ...> 0004-Enable-long-PCF-family-names.patch} | 14 +++------ freetype2/mingw-w64-bootstrap/PKGBUILD | 29 ++++++++++--------- ...0001-Enable-table-validation-modules.patch | 10 ++----- .../0002-Enable-subpixel-rendering.patch | 22 ++++++++++++++ ...-Enable-infinality-subpixel-hinting.patch} | 14 +++------ ...> 0004-Enable-long-PCF-family-names.patch} | 14 +++------ freetype2/mingw-w64/PKGBUILD | 29 ++++++++++--------- 10 files changed, 98 insertions(+), 80 deletions(-) create mode 100644 freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch rename freetype2/mingw-w64-bootstrap/{0002-Enable-infinality-subpixel-hinting.patch => 0003-Enable-infinality-subpixel-hinting.patch} (63%) rename freetype2/mingw-w64-bootstrap/{0003-Enable-long-PCF-family-names.patch => 0004-Enable-long-PCF-family-names.patch} (59%) create mode 100644 freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch rename freetype2/mingw-w64/{0002-Enable-infinality-subpixel-hinting.patch => 0003-Enable-infinality-subpixel-hinting.patch} (63%) rename freetype2/mingw-w64/{0003-Enable-long-PCF-family-names.patch => 0004-Enable-long-PCF-family-names.patch} (59%) 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 2c38e8f5..4c469faf 100644 --- a/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch +++ b/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch @@ -1,15 +1,14 @@ -From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001 -Message-Id: +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 23 Jun 2015 08:40:29 +0200 -Subject: [PATCH 1/4] Enable table validation modules +Subject: [PATCH] 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 +index d6cdbe523..181f91541 100644 --- a/modules.cfg +++ b/modules.cfg @@ -111,26 +111,26 @@ AUX_MODULES += cache @@ -41,6 +40,3 @@ index dc6c8d42d..2ab145016 100644 # Auxiliary PostScript driver component to share common code. # --- -2.21.0 - diff --git a/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch b/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch new file mode 100644 index 00000000..26360b5c --- /dev/null +++ b/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Tue, 23 Jun 2015 08:43:07 +0200 +Subject: [PATCH] Enable subpixel rendering + +--- + 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 097f19b8a..e5de62e35 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -124,7 +124,7 @@ FT_BEGIN_HEADER + * When this macro is not defined, FreeType offers alternative LCD + * rendering technology that produces excellent output. + */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /************************************************************************** diff --git a/freetype2/mingw-w64-bootstrap/0002-Enable-infinality-subpixel-hinting.patch b/freetype2/mingw-w64-bootstrap/0003-Enable-infinality-subpixel-hinting.patch similarity index 63% rename from freetype2/mingw-w64-bootstrap/0002-Enable-infinality-subpixel-hinting.patch rename to freetype2/mingw-w64-bootstrap/0003-Enable-infinality-subpixel-hinting.patch index 22a19a64..d2369893 100644 --- a/freetype2/mingw-w64-bootstrap/0002-Enable-infinality-subpixel-hinting.patch +++ b/freetype2/mingw-w64-bootstrap/0003-Enable-infinality-subpixel-hinting.patch @@ -1,20 +1,17 @@ -From fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 29 Aug 2016 08:43:10 +0200 -Subject: [PATCH 2/4] Enable infinality subpixel hinting +Subject: [PATCH] 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 +index e5de62e35..acb4d6d6a 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h -@@ -658,8 +658,8 @@ FT_BEGIN_HEADER +@@ -672,8 +672,8 @@ FT_BEGIN_HEADER * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ @@ -25,6 +22,3 @@ index 12f47a82e..1d4469a99 100644 /************************************************************************** --- -2.21.0 - diff --git a/freetype2/mingw-w64-bootstrap/0003-Enable-long-PCF-family-names.patch b/freetype2/mingw-w64-bootstrap/0004-Enable-long-PCF-family-names.patch similarity index 59% rename from freetype2/mingw-w64-bootstrap/0003-Enable-long-PCF-family-names.patch rename to freetype2/mingw-w64-bootstrap/0004-Enable-long-PCF-family-names.patch index 916fe9cf..45fb72c4 100644 --- a/freetype2/mingw-w64-bootstrap/0003-Enable-long-PCF-family-names.patch +++ b/freetype2/mingw-w64-bootstrap/0004-Enable-long-PCF-family-names.patch @@ -1,20 +1,17 @@ -From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Sun, 14 May 2017 18:09:31 +0200 -Subject: [PATCH 3/4] Enable long PCF family names +Subject: [PATCH] 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 +index acb4d6d6a..efa13b9c6 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h -@@ -847,7 +847,7 @@ FT_BEGIN_HEADER +@@ -861,7 +861,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. */ @@ -23,6 +20,3 @@ index 1d4469a99..4ff4e7821 100644 /*************************************************************************/ --- -2.21.0 - diff --git a/freetype2/mingw-w64-bootstrap/PKGBUILD b/freetype2/mingw-w64-bootstrap/PKGBUILD index a307832d..1f31563c 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.10.1 +pkgver=2.10.4 pkgrel=1 pkgdesc='Font rasterization library (mingw-w64)' arch=('any') @@ -15,17 +15,19 @@ makedepends=(mingw-w64-gcc mingw-w64-configure) provides=(mingw-w64-freetype) replaces=(mingw-w64-freetype) conflicts=(mingw-w64-freetype) -source=(https://download-mirror.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) options=(!strip !buildflags !libtool staticlibs) -sha1sums=('79874ef4eaa52025126b71d836453b8279bdd331' - 'SKIP' - '46fd67e6a594f6c2c473b9321ba64913984ba42f' - '4bf0c0749db09878b918cc404300f0d3e9091607' - 'af76172be8135e74391b7ad1b82c2124ae0ad86c') -validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') +source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig} + 0001-Enable-table-validation-modules.patch + 0002-Enable-subpixel-rendering.patch + 0003-Enable-infinality-subpixel-hinting.patch + 0004-Enable-long-PCF-family-names.patch) +sha256sums=('86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784' + 'SKIP' + 'f41df4f336d5e82e58733c7a4594476c9216cfc85c096327745a7e1b559e17e1' + 'dc77c1cfee4bf8e7e0690628c95d211df09e0d0750e4c8f075b78b5f105514f7' + '21a62bc12b848320c686d602d8d4e3bcd51294a9def4dc9c301736e077b59f3f' + '266384222f87a02fb02b2179828f6c26fe6d7b1fd09d1f7e3734e7fcb09cda2e') +validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then _provides=${pkgname%-bootstrap} @@ -45,8 +47,9 @@ prepare() { cd "${srcdir}/freetype-${pkgver}" 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 + patch -Np1 -i ../0002-Enable-subpixel-rendering.patch + patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch + patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch } build() { diff --git a/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch b/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch index 2c38e8f5..4c469faf 100644 --- a/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch +++ b/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch @@ -1,15 +1,14 @@ -From b609203df7333beea20dbfd604262a9486f01497 Mon Sep 17 00:00:00 2001 -Message-Id: +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 23 Jun 2015 08:40:29 +0200 -Subject: [PATCH 1/4] Enable table validation modules +Subject: [PATCH] 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 +index d6cdbe523..181f91541 100644 --- a/modules.cfg +++ b/modules.cfg @@ -111,26 +111,26 @@ AUX_MODULES += cache @@ -41,6 +40,3 @@ index dc6c8d42d..2ab145016 100644 # Auxiliary PostScript driver component to share common code. # --- -2.21.0 - diff --git a/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch b/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch new file mode 100644 index 00000000..26360b5c --- /dev/null +++ b/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Tue, 23 Jun 2015 08:43:07 +0200 +Subject: [PATCH] Enable subpixel rendering + +--- + 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 097f19b8a..e5de62e35 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -124,7 +124,7 @@ FT_BEGIN_HEADER + * When this macro is not defined, FreeType offers alternative LCD + * rendering technology that produces excellent output. + */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /************************************************************************** diff --git a/freetype2/mingw-w64/0002-Enable-infinality-subpixel-hinting.patch b/freetype2/mingw-w64/0003-Enable-infinality-subpixel-hinting.patch similarity index 63% rename from freetype2/mingw-w64/0002-Enable-infinality-subpixel-hinting.patch rename to freetype2/mingw-w64/0003-Enable-infinality-subpixel-hinting.patch index 22a19a64..d2369893 100644 --- a/freetype2/mingw-w64/0002-Enable-infinality-subpixel-hinting.patch +++ b/freetype2/mingw-w64/0003-Enable-infinality-subpixel-hinting.patch @@ -1,20 +1,17 @@ -From fbeffd53c40de0932b1e9ef32ca4f30b7e1aeea2 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 29 Aug 2016 08:43:10 +0200 -Subject: [PATCH 2/4] Enable infinality subpixel hinting +Subject: [PATCH] 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 +index e5de62e35..acb4d6d6a 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h -@@ -658,8 +658,8 @@ FT_BEGIN_HEADER +@@ -672,8 +672,8 @@ FT_BEGIN_HEADER * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ @@ -25,6 +22,3 @@ index 12f47a82e..1d4469a99 100644 /************************************************************************** --- -2.21.0 - diff --git a/freetype2/mingw-w64/0003-Enable-long-PCF-family-names.patch b/freetype2/mingw-w64/0004-Enable-long-PCF-family-names.patch similarity index 59% rename from freetype2/mingw-w64/0003-Enable-long-PCF-family-names.patch rename to freetype2/mingw-w64/0004-Enable-long-PCF-family-names.patch index 916fe9cf..45fb72c4 100644 --- a/freetype2/mingw-w64/0003-Enable-long-PCF-family-names.patch +++ b/freetype2/mingw-w64/0004-Enable-long-PCF-family-names.patch @@ -1,20 +1,17 @@ -From a7c04e60d28a0ad0420bb7a1943479a08a923d07 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Sun, 14 May 2017 18:09:31 +0200 -Subject: [PATCH 3/4] Enable long PCF family names +Subject: [PATCH] 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 +index acb4d6d6a..efa13b9c6 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h -@@ -847,7 +847,7 @@ FT_BEGIN_HEADER +@@ -861,7 +861,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. */ @@ -23,6 +20,3 @@ index 1d4469a99..4ff4e7821 100644 /*************************************************************************/ --- -2.21.0 - diff --git a/freetype2/mingw-w64/PKGBUILD b/freetype2/mingw-w64/PKGBUILD index 796cb1ad..234e98b4 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.10.1 +pkgver=2.10.4 pkgrel=1 pkgdesc='Font rasterization library (mingw-w64)' arch=('any') @@ -15,17 +15,19 @@ makedepends=(mingw-w64-gcc mingw-w64-configure) provides=(mingw-w64-freetype) replaces=(mingw-w64-freetype) conflicts=(mingw-w64-freetype) -source=(https://download-mirror.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) options=(!strip !buildflags !libtool staticlibs) -sha1sums=('79874ef4eaa52025126b71d836453b8279bdd331' - 'SKIP' - '46fd67e6a594f6c2c473b9321ba64913984ba42f' - '4bf0c0749db09878b918cc404300f0d3e9091607' - 'af76172be8135e74391b7ad1b82c2124ae0ad86c') -validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') +source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig} + 0001-Enable-table-validation-modules.patch + 0002-Enable-subpixel-rendering.patch + 0003-Enable-infinality-subpixel-hinting.patch + 0004-Enable-long-PCF-family-names.patch) +sha256sums=('86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784' + 'SKIP' + 'f41df4f336d5e82e58733c7a4594476c9216cfc85c096327745a7e1b559e17e1' + 'dc77c1cfee4bf8e7e0690628c95d211df09e0d0750e4c8f075b78b5f105514f7' + '21a62bc12b848320c686d602d8d4e3bcd51294a9def4dc9c301736e077b59f3f' + '266384222f87a02fb02b2179828f6c26fe6d7b1fd09d1f7e3734e7fcb09cda2e') +validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then _provides=${pkgname%-bootstrap} @@ -45,8 +47,9 @@ prepare() { cd "${srcdir}/freetype-${pkgver}" 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 + patch -Np1 -i ../0002-Enable-subpixel-rendering.patch + patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch + patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch } build() {