Date: Tuesday, July 12, 2016 @ 11:00:12 Author: heftig Revision: 182686
2.6.5-1 Added: lib32-freetype2/trunk/0004-Keep-default-interpreter-version-as-35.patch Modified: lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch lib32-freetype2/trunk/0003-Make-subpixel-hinting-mode-configurable.patch lib32-freetype2/trunk/PKGBUILD ----------------------------------------------------+ 0001-Enable-table-validation-modules.patch | 6 +-- 0002-Enable-subpixel-rendering.patch | 8 ++-- 0003-Make-subpixel-hinting-mode-configurable.patch | 20 +++++------ 0004-Keep-default-interpreter-version-as-35.patch | 29 ++++++++++++++++ PKGBUILD | 33 ++++++++++++------- 5 files changed, 66 insertions(+), 30 deletions(-) Modified: 0001-Enable-table-validation-modules.patch =================================================================== --- 0001-Enable-table-validation-modules.patch 2016-07-12 10:49:07 UTC (rev 182685) +++ 0001-Enable-table-validation-modules.patch 2016-07-12 11:00:12 UTC (rev 182686) @@ -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)" <[email protected]> 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 @@ # Auxiliary PostScript driver component to share common code. # -- -2.8.3 +2.9.0 Modified: 0002-Enable-subpixel-rendering.patch =================================================================== --- 0002-Enable-subpixel-rendering.patch 2016-07-12 10:49:07 UTC (rev 182685) +++ 0002-Enable-subpixel-rendering.patch 2016-07-12 11:00:12 UTC (rev 182686) @@ -1,7 +1,7 @@ -From 340fa8551faed5a105d0e1cbe4e81ade1f750a04 Mon Sep 17 00:00:00 2001 +From 6a8bbe968954bcc54fdfcd5a71c7632370e3066a Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <[email protected]> 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 +- @@ -8,7 +8,7 @@ 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 @@ /*************************************************************************/ -- -2.8.3 +2.9.0 Modified: 0003-Make-subpixel-hinting-mode-configurable.patch =================================================================== --- 0003-Make-subpixel-hinting-mode-configurable.patch 2016-07-12 10:49:07 UTC (rev 182685) +++ 0003-Make-subpixel-hinting-mode-configurable.patch 2016-07-12 11:00:12 UTC (rev 182686) @@ -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)" <[email protected]> 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 @@ FT_UNUSED( ttdriver ); -- -2.8.3 +2.9.0 Added: 0004-Keep-default-interpreter-version-as-35.patch =================================================================== --- 0004-Keep-default-interpreter-version-as-35.patch (rev 0) +++ 0004-Keep-default-interpreter-version-as-35.patch 2016-07-12 11:00:12 UTC (rev 182686) @@ -0,0 +1,29 @@ +From 88e7474320b8d2b5333e276b8b1771bc2690c43f Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-07-12 10:49:07 UTC (rev 182685) +++ PKGBUILD 2016-07-12 11:00:12 UTC (rev 182686) @@ -4,8 +4,8 @@ _pkgbasename=freetype2 pkgname=lib32-$_pkgbasename -pkgver=2.6.4 -pkgrel=2 +pkgver=2.6.5 +pkgrel=1 pkgdesc="TrueType font rendering library (32-bit)" arch=(x86_64) license=('GPL') @@ -18,16 +18,20 @@ 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) -sha1sums=('5eaa8c949b4841eeabba44d2c582ff6859e5c4b9' + 0003-Make-subpixel-hinting-mode-configurable.patch + 0004-Keep-default-interpreter-version-as-35.patch) +sha1sums=('5db38ae2308c5a2c519c8e071e98b70d61585201' 'SKIP' - '045b1b6a56151ab46a8300e6fd09f24294258e97' - 'afd6f9504516fa02e57890dde820f488e0df36bb' - '2a1d6e734001e196c7a7790c78165d9b9fe49f7f') + 'e1fde7854d2a64868a5eef07415ad23c339fc630' + '7da3af8e1e002e39a247c37a05a10beb576007d6' + 'c64ba9d37732fc75de7817d1d679a3e38efdb4cb' + '1f30feeba9c51c9ec745bd29ef07beccf9544338') validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') prepare() { - cd "${srcdir}/freetype-${pkgver}" + # rename source dir to allow building the demos + mv freetype-${pkgver} freetype2 + cd freetype2 patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch" patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch" @@ -34,6 +38,10 @@ # 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" + + # Keep the classic subpixel hinting mode as default, as expected + # by upstream for the 2.6 series + patch -Np1 -i "${srcdir}/0004-Keep-default-interpreter-version-as-35.patch" } build() { @@ -41,18 +49,19 @@ export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - cd "${srcdir}/freetype-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 + cd freetype2 + ./configure --prefix=/usr --disable-static --libdir=/usr/lib32 make } check() { - cd "${srcdir}/freetype-${pkgver}" + cd freetype2 make -k check } package() { - cd "${srcdir}/freetype-${pkgver}" + cd freetype2 make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/{include,share,bin} }
