Date: Sunday, October 4, 2015 @ 17:39:53 Author: heftig Revision: 248341
2.6.1 Added: freetype2/trunk/0001-Enable-table-validation-modules.patch (from rev 248340, freetype2/trunk/freetype-2.2.1-enable-valid.patch) freetype2/trunk/0002-Enable-subpixel-rendering.patch (from rev 248340, freetype2/trunk/freetype-2.5.1-enable-spr.patch) freetype2/trunk/0003-Enable-subpixel-hinting.patch (from rev 248340, freetype2/trunk/freetype-2.5.1-enable-sph.patch) freetype2/trunk/0004-Mask-subpixel-hinting-with-an-env-var.patch (from rev 248340, freetype2/trunk/env_FT2_SUBPIXEL_HINTING.diff) Modified: freetype2/trunk/PKGBUILD Deleted: freetype2/trunk/env_FT2_SUBPIXEL_HINTING.diff freetype2/trunk/fix-clipping.patch freetype2/trunk/freetype-2.2.1-enable-valid.patch freetype2/trunk/freetype-2.5.1-enable-sph.patch freetype2/trunk/freetype-2.5.1-enable-spr.patch --------------------------------------------------+ 0001-Enable-table-validation-modules.patch | 34 ++++++++++++++++++++ 0002-Enable-subpixel-rendering.patch | 25 +++++++++++++++ 0003-Enable-subpixel-hinting.patch | 25 +++++++++++++++ 0004-Mask-subpixel-hinting-with-an-env-var.patch | 31 ++++++++++++++++++ PKGBUILD | 35 +++++++++------------ env_FT2_SUBPIXEL_HINTING.diff | 18 ---------- fix-clipping.patch | 25 --------------- freetype-2.2.1-enable-valid.patch | 20 ------------ freetype-2.5.1-enable-sph.patch | 13 ------- freetype-2.5.1-enable-spr.patch | 13 ------- 10 files changed, 130 insertions(+), 109 deletions(-) Copied: freetype2/trunk/0001-Enable-table-validation-modules.patch (from rev 248340, freetype2/trunk/freetype-2.2.1-enable-valid.patch) =================================================================== --- 0001-Enable-table-validation-modules.patch (rev 0) +++ 0001-Enable-table-validation-modules.patch 2015-10-04 15:39:53 UTC (rev 248341) @@ -0,0 +1,34 @@ +From 27f765b5f41638de36de728e9018a1400b0be615 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Tue, 23 Jun 2015 08:40:29 +0200 +Subject: [PATCH 1/4] Enable table validation modules + +--- + modules.cfg | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.cfg b/modules.cfg +index 2984e51..a5db21d 100644 +--- a/modules.cfg ++++ b/modules.cfg +@@ -110,7 +110,7 @@ RASTER_MODULES += smooth + AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs ftgxval.c below. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -129,7 +129,7 @@ AUX_MODULES += bzip2 + + # OpenType table validation. Needs ftotval.c below. + # +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # +-- +2.6.0 + Copied: freetype2/trunk/0002-Enable-subpixel-rendering.patch (from rev 248340, freetype2/trunk/freetype-2.5.1-enable-spr.patch) =================================================================== --- 0002-Enable-subpixel-rendering.patch (rev 0) +++ 0002-Enable-subpixel-rendering.patch 2015-10-04 15:39:53 UTC (rev 248341) @@ -0,0 +1,25 @@ +From 27d96091b2bb0a825cbd62a332ef918f39c6126f Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Tue, 23 Jun 2015 08:43:07 +0200 +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 4970945..ab407e3 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -92,7 +92,7 @@ FT_BEGIN_HEADER + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ +-- +2.6.0 + Copied: freetype2/trunk/0003-Enable-subpixel-hinting.patch (from rev 248340, freetype2/trunk/freetype-2.5.1-enable-sph.patch) =================================================================== --- 0003-Enable-subpixel-hinting.patch (rev 0) +++ 0003-Enable-subpixel-hinting.patch 2015-10-04 15:39:53 UTC (rev 248341) @@ -0,0 +1,25 @@ +From f96a1d21d787b173d6293330fbf782b977194aa7 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Tue, 23 Jun 2015 08:43:57 +0200 +Subject: [PATCH 3/4] Enable subpixel hinting + +--- + 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 ab407e3..a2eab6a 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -602,7 +602,7 @@ FT_BEGIN_HEADER + /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ + /* defined. */ + /* */ +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING + + + /*************************************************************************/ +-- +2.6.0 + Copied: freetype2/trunk/0004-Mask-subpixel-hinting-with-an-env-var.patch (from rev 248340, freetype2/trunk/env_FT2_SUBPIXEL_HINTING.diff) =================================================================== --- 0004-Mask-subpixel-hinting-with-an-env-var.patch (rev 0) +++ 0004-Mask-subpixel-hinting-with-an-env-var.patch 2015-10-04 15:39:53 UTC (rev 248341) @@ -0,0 +1,31 @@ +From bb5ece9c6773145c8342107bd32fcacbc4b212ab Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Tue, 23 Jun 2015 08:34:54 +0200 +Subject: [PATCH 4/4] Mask subpixel hinting with an env var + +--- + src/truetype/ttobjs.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c +index 6060d6f..3fa98e7 100644 +--- a/src/truetype/ttobjs.c ++++ b/src/truetype/ttobjs.c +@@ -1302,10 +1302,11 @@ + TT_Driver driver = (TT_Driver)ttdriver; + + #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING +- driver->interpreter_version = TT_INTERPRETER_VERSION_38; +-#else +- driver->interpreter_version = TT_INTERPRETER_VERSION_35; ++ if ( getenv( "FT2_SUBPIXEL_HINTING" ) ) ++ driver->interpreter_version = TT_INTERPRETER_VERSION_38; ++ else + #endif ++ driver->interpreter_version = TT_INTERPRETER_VERSION_35; + + #else /* !TT_USE_BYTECODE_INTERPRETER */ + +-- +2.6.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-10-04 10:11:58 UTC (rev 248340) +++ PKGBUILD 2015-10-04 15:39:53 UTC (rev 248341) @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=freetype2 -pkgver=2.6 -pkgrel=2 +pkgver=2.6.1 +pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64) license=('GPL') @@ -13,34 +13,29 @@ depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz') install=freetype2.install source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig} - freetype-2.2.1-enable-valid.patch - freetype-2.5.1-enable-spr.patch - freetype-2.5.1-enable-sph.patch - env_FT2_SUBPIXEL_HINTING.diff - fix-clipping.patch) -sha1sums=('cd2b144205dd2c61693e2d861069367aa3dde1bc' + 0001-Enable-table-validation-modules.patch + 0002-Enable-subpixel-rendering.patch + 0003-Enable-subpixel-hinting.patch + 0004-Mask-subpixel-hinting-with-an-env-var.patch) +sha1sums=('393447fbf64c107b20a1ccc9e9a9a52f39786ae0' 'SKIP' - 'f279d922a873d62a8af50bfc873051839d194dca' - '13ee8d558593db991ad29fa090b461f914536104' - 'c31fa3d342ead56f3acfa1f267b474a7686d0014' - '78322bee05f013cd76487439ddac0cae50596db4' - '55eaf96bd1b68b27ca4278352171f4ae82292744') + '1c7bc438df0428a63f881e7e4343b22c5b09ecb1' + 'e2d2b8c4847ab9cfd497179c7140835e99ece711' + 'ebe3d7a6fc41304a77c23cb56e94dc718146d963' + 'f50c70080f3fbee45b9c4264d8ae37eb4f1ac335') validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') prepare() { cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" - patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch" + patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch" + patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch" # https://bugs.archlinux.org/task/35274 - patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch" + patch -Np1 -i "${srcdir}/0003-Enable-subpixel-hinting.patch" # Provide a way to enable the above patch at runtime. # Hopefully just a temporary measure until fontconfig picks up # the necessary configurables. - patch -Np1 -i "${srcdir}/env_FT2_SUBPIXEL_HINTING.diff" - - # FS#45584 - patch -Np1 -i ../fix-clipping.patch + patch -Np1 -i "${srcdir}/0004-Mask-subpixel-hinting-with-an-env-var.patch" } build() { Deleted: env_FT2_SUBPIXEL_HINTING.diff =================================================================== --- env_FT2_SUBPIXEL_HINTING.diff 2015-10-04 10:11:58 UTC (rev 248340) +++ env_FT2_SUBPIXEL_HINTING.diff 2015-10-04 15:39:53 UTC (rev 248341) @@ -1,18 +0,0 @@ -diff -u -r freetype-2.5.4/src/truetype/ttobjs.c freetype-2.5.4-env/src/truetype/ttobjs.c ---- freetype-2.5.4/src/truetype/ttobjs.c 2014-12-06 18:52:13.098214719 +0100 -+++ freetype-2.5.4-env/src/truetype/ttobjs.c 2014-12-10 09:13:04.418886699 +0100 -@@ -1264,10 +1264,11 @@ - return FT_THROW( Could_Not_Find_Context ); - - #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING -- driver->interpreter_version = TT_INTERPRETER_VERSION_38; --#else -- driver->interpreter_version = TT_INTERPRETER_VERSION_35; -+ if ( getenv( "FT2_SUBPIXEL_HINTING" ) ) -+ driver->interpreter_version = TT_INTERPRETER_VERSION_38; -+ else - #endif -+ driver->interpreter_version = TT_INTERPRETER_VERSION_35; - - #else /* !TT_USE_BYTECODE_INTERPRETER */ - Deleted: fix-clipping.patch =================================================================== --- fix-clipping.patch 2015-10-04 10:11:58 UTC (rev 248340) +++ fix-clipping.patch 2015-10-04 15:39:53 UTC (rev 248341) @@ -1,25 +0,0 @@ -From b650dfbb0b0700440cc88da31f97cec45b4140de Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <matthias.cla...@gmail.com> -Date: Sun, 26 Jul 2015 19:08:34 +0000 -Subject: [cff] Don't use `hmtx' table for LSB (#45520). - -* src/cff/cffgload.c (cff_slot_load): Use `htmx' table for advance -width only. Bug introduced 2015-04-10. ---- -diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c -index 43054f8..a075ddc 100644 ---- a/src/cff/cffgload.c -+++ b/src/cff/cffgload.c -@@ -3064,9 +3064,7 @@ - metrics->width = cbox.xMax - cbox.xMin; - metrics->height = cbox.yMax - cbox.yMin; - -- if ( !face->horizontal.number_Of_HMetrics ) -- metrics->horiBearingX = cbox.xMin; -- -+ metrics->horiBearingX = cbox.xMin; - metrics->horiBearingY = cbox.yMax; - - if ( has_vertical_info ) --- -cgit v0.9.0.2 Deleted: freetype-2.2.1-enable-valid.patch =================================================================== --- freetype-2.2.1-enable-valid.patch 2015-10-04 10:11:58 UTC (rev 248340) +++ freetype-2.2.1-enable-valid.patch 2015-10-04 15:39:53 UTC (rev 248341) @@ -1,20 +0,0 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs ftgxval.c below. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # Deleted: freetype-2.5.1-enable-sph.patch =================================================================== --- freetype-2.5.1-enable-sph.patch 2015-10-04 10:11:58 UTC (rev 248340) +++ freetype-2.5.1-enable-sph.patch 2015-10-04 15:39:53 UTC (rev 248341) @@ -1,13 +0,0 @@ -diff --git i/include/config/ftoption.h w/include/config/ftoption.h -index fe2ba15..1ab4226 100644 ---- i/include/config/ftoption.h -+++ w/include/config/ftoption.h -@@ -591,7 +591,7 @@ FT_BEGIN_HEADER - /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ - /* defined. */ - /* */ --/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ -+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING - - - /*************************************************************************/ Deleted: freetype-2.5.1-enable-spr.patch =================================================================== --- freetype-2.5.1-enable-spr.patch 2015-10-04 10:11:58 UTC (rev 248340) +++ freetype-2.5.1-enable-spr.patch 2015-10-04 15:39:53 UTC (rev 248341) @@ -1,13 +0,0 @@ -diff --git i/include/config/ftoption.h w/include/config/ftoption.h -index fe2ba15..22ce1a3 100644 ---- i/include/config/ftoption.h -+++ w/include/config/ftoption.h -@@ -92,7 +92,7 @@ FT_BEGIN_HEADER - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /*************************************************************************/