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 e4c425c0..55288708 100644 --- a/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch +++ b/freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch @@ -1,7 +1,7 @@ -From 38732f60a5dc2a619dac5605d6c2fa90fc58d606 Mon Sep 17 00:00:00 2001 +From a7e32953f291c39a8286b87516cd0c0516c2c89b Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 23 Jun 2015 08:40:29 +0200 -Subject: [PATCH 1/3] Enable table validation modules +Subject: [PATCH 1/4] Enable table validation modules --- modules.cfg | 4 ++-- @@ -30,5 +30,5 @@ index d677565a2bc2b5a2..f19cbec33384a86f 100644 # Auxiliary PostScript driver component to share common code. # -- -2.8.3 +2.9.0 diff --git a/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch b/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch index d2747bfd..d70b4f0e 100644 --- a/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch +++ b/freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch @@ -1,14 +1,14 @@ -From 340fa8551faed5a105d0e1cbe4e81ade1f750a04 Mon Sep 17 00:00:00 2001 +From 6a8bbe968954bcc54fdfcd5a71c7632370e3066a Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 23 Jun 2015 08:43:07 +0200 -Subject: [PATCH 2/3] Enable subpixel rendering +Subject: [PATCH 2/4] 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 7dd3f55e572a23b9..33d563c4e1e47228 100644 +index 2556c64d9d6c0838..8e58403529f597e5 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -92,7 +92,7 @@ FT_BEGIN_HEADER @@ -21,5 +21,5 @@ index 7dd3f55e572a23b9..33d563c4e1e47228 100644 /*************************************************************************/ -- -2.8.3 +2.9.0 diff --git a/freetype2/mingw-w64-bootstrap/0003-Make-subpixel-hinting-mode-configurable.patch b/freetype2/mingw-w64-bootstrap/0003-Make-subpixel-hinting-mode-configurable.patch index df1edcfe..c1441dbe 100644 --- a/freetype2/mingw-w64-bootstrap/0003-Make-subpixel-hinting-mode-configurable.patch +++ b/freetype2/mingw-w64-bootstrap/0003-Make-subpixel-hinting-mode-configurable.patch @@ -1,24 +1,22 @@ -From d0d93c2496175aa42b4c4bb3a45e4f0a6d264112 Mon Sep 17 00:00:00 2001 +From be997becc28dfbf2077cca55dc9a6a090d13e22a Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Wed, 15 Jun 2016 14:10:20 +0200 -Subject: [PATCH 3/3] Make subpixel hinting mode configurable +Subject: [PATCH 3/4] Make subpixel hinting mode configurable --- - include/freetype/config/ftoption.h | 4 ++-- + include/freetype/config/ftoption.h | 2 +- src/truetype/ttobjs.c | 37 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 39 insertions(+), 2 deletions(-) + 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 33d563c4e1e47228..a401fc8e9efbbd79 100644 +index 8e58403529f597e5..197e15cdc3cc1e74 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h -@@ -631,8 +631,8 @@ FT_BEGIN_HEADER - /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ +@@ -632,7 +632,7 @@ FT_BEGIN_HEADER /* */ - /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ --#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 + /* #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 ) @@ -86,5 +84,5 @@ index ed3be2dbee79427c..d89f92e94d0e816b 100644 FT_UNUSED( ttdriver ); -- -2.8.3 +2.9.0 diff --git a/freetype2/mingw-w64-bootstrap/0004-Keep-default-interpreter-version-as-35.patch b/freetype2/mingw-w64-bootstrap/0004-Keep-default-interpreter-version-as-35.patch new file mode 100644 index 00000000..ba188537 --- /dev/null +++ b/freetype2/mingw-w64-bootstrap/0004-Keep-default-interpreter-version-as-35.patch @@ -0,0 +1,29 @@ +From 88e7474320b8d2b5333e276b8b1771bc2690c43f Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Tue, 12 Jul 2016 12:47:57 +0200 +Subject: [PATCH 4/4] Keep default interpreter version as 35 + +--- + src/truetype/ttobjs.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c +index d89f92e94d0e816b..efca66fc21c0287a 100644 +--- a/src/truetype/ttobjs.c ++++ b/src/truetype/ttobjs.c +@@ -1292,12 +1292,6 @@ + const char *envval; + + driver->interpreter_version = TT_INTERPRETER_VERSION_35; +-#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY +- driver->interpreter_version = TT_INTERPRETER_VERSION_38; +-#endif +-#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL +- driver->interpreter_version = TT_INTERPRETER_VERSION_40; +-#endif + + errno = 0; + envval = getenv( "FT2_SUBPIXEL_HINTING" ); +-- +2.9.0 + diff --git a/freetype2/mingw-w64-bootstrap/PKGBUILD b/freetype2/mingw-w64-bootstrap/PKGBUILD index 21859339..7cc22f3f 100644 --- a/freetype2/mingw-w64-bootstrap/PKGBUILD +++ b/freetype2/mingw-w64-bootstrap/PKGBUILD @@ -4,40 +4,57 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-freetype2-bootstrap -pkgver=2.6.4 +pkgver=2.6.5 pkgrel=1 -pkgdesc="TrueType font rendering library (mingw-w64 bootstrap)" +pkgdesc="TrueType font rendering library (mingw-w64)" arch=('any') url="http://www.freetype.org/" license=('GPL') -# adding harfbuzz for improved OpenType features auto-hinting -# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2) makedepends=(mingw-w64-gcc mingw-w64-configure) -provides=(mingw-w64-freetype ${pkgname%-bootstrap}) -conflicts=(mingw-w64-freetype ${pkgname%-bootstrap}) +provides=(mingw-w64-freetype) +replaces=(mingw-w64-freetype) +conflicts=(mingw-w64-freetype) source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig} 0001-Enable-table-validation-modules.patch 0002-Enable-subpixel-rendering.patch - 0003-Make-subpixel-hinting-mode-configurable.patch) + 0003-Make-subpixel-hinting-mode-configurable.patch + 0004-Keep-default-interpreter-version-as-35.patch) options=(!strip !buildflags !libtool staticlibs) -sha1sums=('5eaa8c949b4841eeabba44d2c582ff6859e5c4b9' +sha1sums=('5db38ae2308c5a2c519c8e071e98b70d61585201' 'SKIP' - '045b1b6a56151ab46a8300e6fd09f24294258e97' - 'afd6f9504516fa02e57890dde820f488e0df36bb' - '2a1d6e734001e196c7a7790c78165d9b9fe49f7f') + 'e1fde7854d2a64868a5eef07415ad23c339fc630' + '7da3af8e1e002e39a247c37a05a10beb576007d6' + 'c64ba9d37732fc75de7817d1d679a3e38efdb4cb' + '1f30feeba9c51c9ec745bd29ef07beccf9544338') validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') +if [[ $pkgname = "mingw-w64-freetype2-bootstrap" ]]; then + _provides=${pkgname%-bootstrap} +else + _provides=${pkgname}-bootstrap + # adding harfbuzz for improved OpenType features auto-hinting + # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream + depends+=(mingw-w64-harfbuzz) +fi +provides+=(${_provides}) +replaces+=(${_provides}) +conflicts+=(${_provides}) + _architectures="i686-w64-mingw32 x86_64-w64-mingw32" prepare() { cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch" - patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch" + patch -Np1 -i ../0001-Enable-table-validation-modules.patch + patch -Np1 -i ../0002-Enable-subpixel-rendering.patch # Provide a way to set the default subpixel hinting mode # at runtime, without depending on the application to do so. - patch -Np1 -i "${srcdir}/0003-Make-subpixel-hinting-mode-configurable.patch" + patch -Np1 -i ../0003-Make-subpixel-hinting-mode-configurable.patch + + # Keep the classic subpixel hinting mode as default, as expected + # by upstream for the 2.6 series + patch -Np1 -i ../0004-Keep-default-interpreter-version-as-35.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 e4c425c0..55288708 100644 --- a/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch +++ b/freetype2/mingw-w64/0001-Enable-table-validation-modules.patch @@ -1,7 +1,7 @@ -From 38732f60a5dc2a619dac5605d6c2fa90fc58d606 Mon Sep 17 00:00:00 2001 +From a7e32953f291c39a8286b87516cd0c0516c2c89b Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 23 Jun 2015 08:40:29 +0200 -Subject: [PATCH 1/3] Enable table validation modules +Subject: [PATCH 1/4] Enable table validation modules --- modules.cfg | 4 ++-- @@ -30,5 +30,5 @@ index d677565a2bc2b5a2..f19cbec33384a86f 100644 # Auxiliary PostScript driver component to share common code. # -- -2.8.3 +2.9.0 diff --git a/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch b/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch index d2747bfd..d70b4f0e 100644 --- a/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch +++ b/freetype2/mingw-w64/0002-Enable-subpixel-rendering.patch @@ -1,14 +1,14 @@ -From 340fa8551faed5a105d0e1cbe4e81ade1f750a04 Mon Sep 17 00:00:00 2001 +From 6a8bbe968954bcc54fdfcd5a71c7632370e3066a Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 23 Jun 2015 08:43:07 +0200 -Subject: [PATCH 2/3] Enable subpixel rendering +Subject: [PATCH 2/4] 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 7dd3f55e572a23b9..33d563c4e1e47228 100644 +index 2556c64d9d6c0838..8e58403529f597e5 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -92,7 +92,7 @@ FT_BEGIN_HEADER @@ -21,5 +21,5 @@ index 7dd3f55e572a23b9..33d563c4e1e47228 100644 /*************************************************************************/ -- -2.8.3 +2.9.0 diff --git a/freetype2/mingw-w64/0003-Make-subpixel-hinting-mode-configurable.patch b/freetype2/mingw-w64/0003-Make-subpixel-hinting-mode-configurable.patch index df1edcfe..c1441dbe 100644 --- a/freetype2/mingw-w64/0003-Make-subpixel-hinting-mode-configurable.patch +++ b/freetype2/mingw-w64/0003-Make-subpixel-hinting-mode-configurable.patch @@ -1,24 +1,22 @@ -From d0d93c2496175aa42b4c4bb3a45e4f0a6d264112 Mon Sep 17 00:00:00 2001 +From be997becc28dfbf2077cca55dc9a6a090d13e22a Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Wed, 15 Jun 2016 14:10:20 +0200 -Subject: [PATCH 3/3] Make subpixel hinting mode configurable +Subject: [PATCH 3/4] Make subpixel hinting mode configurable --- - include/freetype/config/ftoption.h | 4 ++-- + include/freetype/config/ftoption.h | 2 +- src/truetype/ttobjs.c | 37 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 39 insertions(+), 2 deletions(-) + 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 33d563c4e1e47228..a401fc8e9efbbd79 100644 +index 8e58403529f597e5..197e15cdc3cc1e74 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h -@@ -631,8 +631,8 @@ FT_BEGIN_HEADER - /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ +@@ -632,7 +632,7 @@ FT_BEGIN_HEADER /* */ - /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ --#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 + /* #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 ) @@ -86,5 +84,5 @@ index ed3be2dbee79427c..d89f92e94d0e816b 100644 FT_UNUSED( ttdriver ); -- -2.8.3 +2.9.0 diff --git a/freetype2/mingw-w64/0004-Keep-default-interpreter-version-as-35.patch b/freetype2/mingw-w64/0004-Keep-default-interpreter-version-as-35.patch new file mode 100644 index 00000000..ba188537 --- /dev/null +++ b/freetype2/mingw-w64/0004-Keep-default-interpreter-version-as-35.patch @@ -0,0 +1,29 @@ +From 88e7474320b8d2b5333e276b8b1771bc2690c43f Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Tue, 12 Jul 2016 12:47:57 +0200 +Subject: [PATCH 4/4] Keep default interpreter version as 35 + +--- + src/truetype/ttobjs.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c +index d89f92e94d0e816b..efca66fc21c0287a 100644 +--- a/src/truetype/ttobjs.c ++++ b/src/truetype/ttobjs.c +@@ -1292,12 +1292,6 @@ + const char *envval; + + driver->interpreter_version = TT_INTERPRETER_VERSION_35; +-#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY +- driver->interpreter_version = TT_INTERPRETER_VERSION_38; +-#endif +-#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL +- driver->interpreter_version = TT_INTERPRETER_VERSION_40; +-#endif + + errno = 0; + envval = getenv( "FT2_SUBPIXEL_HINTING" ); +-- +2.9.0 + diff --git a/freetype2/mingw-w64/PKGBUILD b/freetype2/mingw-w64/PKGBUILD index 0f22989a..ea25ce39 100644 --- a/freetype2/mingw-w64/PKGBUILD +++ b/freetype2/mingw-w64/PKGBUILD @@ -4,41 +4,57 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-freetype2 -pkgver=2.6.4 +pkgver=2.6.5 pkgrel=1 pkgdesc="TrueType font rendering library (mingw-w64)" arch=('any') url="http://www.freetype.org/" license=('GPL') -# adding harfbuzz for improved OpenType features auto-hinting -# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream -depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-harfbuzz mingw-w64-bzip2) +depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2) makedepends=(mingw-w64-gcc mingw-w64-configure) -provides=(mingw-w64-freetype $pkgname-bootstrap) -replaces=(mingw-w64-freetype $pkgname-bootstrap) -conflicts=(mingw-w64-freetype $pkgname-bootstrap) +provides=(mingw-w64-freetype) +replaces=(mingw-w64-freetype) +conflicts=(mingw-w64-freetype) source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig} 0001-Enable-table-validation-modules.patch 0002-Enable-subpixel-rendering.patch - 0003-Make-subpixel-hinting-mode-configurable.patch) + 0003-Make-subpixel-hinting-mode-configurable.patch + 0004-Keep-default-interpreter-version-as-35.patch) options=(!strip !buildflags !libtool staticlibs) -sha1sums=('5eaa8c949b4841eeabba44d2c582ff6859e5c4b9' +sha1sums=('5db38ae2308c5a2c519c8e071e98b70d61585201' 'SKIP' - '045b1b6a56151ab46a8300e6fd09f24294258e97' - 'afd6f9504516fa02e57890dde820f488e0df36bb' - '2a1d6e734001e196c7a7790c78165d9b9fe49f7f') + 'e1fde7854d2a64868a5eef07415ad23c339fc630' + '7da3af8e1e002e39a247c37a05a10beb576007d6' + 'c64ba9d37732fc75de7817d1d679a3e38efdb4cb' + '1f30feeba9c51c9ec745bd29ef07beccf9544338') validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') +if [[ $pkgname = "mingw-w64-freetype2-bootstrap" ]]; then + _provides=${pkgname%-bootstrap} +else + _provides=${pkgname}-bootstrap + # adding harfbuzz for improved OpenType features auto-hinting + # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream + depends+=(mingw-w64-harfbuzz) +fi +provides+=(${_provides}) +replaces+=(${_provides}) +conflicts+=(${_provides}) + _architectures="i686-w64-mingw32 x86_64-w64-mingw32" prepare() { cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch" - patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch" + patch -Np1 -i ../0001-Enable-table-validation-modules.patch + patch -Np1 -i ../0002-Enable-subpixel-rendering.patch # Provide a way to set the default subpixel hinting mode # at runtime, without depending on the application to do so. - patch -Np1 -i "${srcdir}/0003-Make-subpixel-hinting-mode-configurable.patch" + patch -Np1 -i ../0003-Make-subpixel-hinting-mode-configurable.patch + + # Keep the classic subpixel hinting mode as default, as expected + # by upstream for the 2.6 series + patch -Np1 -i ../0004-Keep-default-interpreter-version-as-35.patch } build() {