Date: Wednesday, December 10, 2014 @ 09:51:19 Author: foutrelis Revision: 227388
upgpkg: freetype2 2.5.4-3 Make subpixel hinting opt-in (FS#35274). Added: freetype2/trunk/env_FT2_SUBPIXEL_HINTING.diff (from rev 227387, freetype2/trunk/env_FT2_NO_SUBPIXEL_HINTING.diff) Modified: freetype2/trunk/PKGBUILD freetype2/trunk/freetype2.install Deleted: freetype2/trunk/env_FT2_NO_SUBPIXEL_HINTING.diff ----------------------------------+ PKGBUILD | 12 ++++++------ env_FT2_NO_SUBPIXEL_HINTING.diff | 19 ------------------- env_FT2_SUBPIXEL_HINTING.diff | 18 ++++++++++++++++++ freetype2.install | 5 ++--- 4 files changed, 26 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-12-09 21:11:53 UTC (rev 227387) +++ PKGBUILD 2014-12-10 08:51:19 UTC (rev 227388) @@ -3,7 +3,7 @@ pkgname=freetype2 pkgver=2.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="TrueType font rendering library" arch=(i686 x86_64) license=('GPL') @@ -16,7 +16,7 @@ freetype-2.2.1-enable-valid.patch freetype-2.5.1-enable-spr.patch freetype-2.5.1-enable-sph.patch - env_FT2_NO_SUBPIXEL_HINTING.diff + env_FT2_SUBPIXEL_HINTING.diff 0001-pcf-Fix-Savannah-bug-43774.patch) sha1sums=('f30b929e2edc5d7ca64c1ccc65f0c2068e84c5e2' 'SKIP' @@ -23,7 +23,7 @@ 'f279d922a873d62a8af50bfc873051839d194dca' '13ee8d558593db991ad29fa090b461f914536104' 'c31fa3d342ead56f3acfa1f267b474a7686d0014' - 'ddba70eef4270e5a89e098d6ee1e7ceb03ea98da' + '78322bee05f013cd76487439ddac0cae50596db4' '16057f51b084e9ce5c614a4add41b532d32648b4') prepare() { @@ -33,10 +33,10 @@ # https://bugs.archlinux.org/task/35274 patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch" - # Provide a way to disable the above patch at runtime. - # Expected to be a temporary measure until fontconfig picks up + # 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_NO_SUBPIXEL_HINTING.diff" + patch -Np1 -i "${srcdir}/env_FT2_SUBPIXEL_HINTING.diff" # http://savannah.nongnu.org/bugs/index.php?43774 patch -Np1 -i "${srcdir}/0001-pcf-Fix-Savannah-bug-43774.patch" Deleted: env_FT2_NO_SUBPIXEL_HINTING.diff =================================================================== --- env_FT2_NO_SUBPIXEL_HINTING.diff 2014-12-09 21:11:53 UTC (rev 227387) +++ env_FT2_NO_SUBPIXEL_HINTING.diff 2014-12-10 08:51:19 UTC (rev 227388) @@ -1,19 +0,0 @@ -diff --git i/src/truetype/ttobjs.c w/src/truetype/ttobjs.c -index 46f1332..af50a1d 100644 ---- i/src/truetype/ttobjs.c -+++ w/src/truetype/ttobjs.c -@@ -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_NO_SUBPIXEL_HINTING" ) ) -+ driver->interpreter_version = TT_INTERPRETER_VERSION_38; -+ else - #endif -+ driver->interpreter_version = TT_INTERPRETER_VERSION_35; - - #else /* !TT_USE_BYTECODE_INTERPRETER */ - Copied: freetype2/trunk/env_FT2_SUBPIXEL_HINTING.diff (from rev 227387, freetype2/trunk/env_FT2_NO_SUBPIXEL_HINTING.diff) =================================================================== --- env_FT2_SUBPIXEL_HINTING.diff (rev 0) +++ env_FT2_SUBPIXEL_HINTING.diff 2014-12-10 08:51:19 UTC (rev 227388) @@ -0,0 +1,18 @@ +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 */ + Modified: freetype2.install =================================================================== --- freetype2.install 2014-12-09 21:11:53 UTC (rev 227387) +++ freetype2.install 2014-12-10 08:51:19 UTC (rev 227388) @@ -1,8 +1,7 @@ post_upgrade() { - if (( $(vercmp $2 2.5.4-1) < 0 )); then + if (( $(vercmp $2 2.5.4-3) < 0 )); then cat <<MSG - Subpixel hinting has been enabled by default. To get back the old look, add - FT2_NO_SUBPIXEL_HINTING=1 + Subpixel hinting can be enabled by adding FT2_SUBPIXEL_HINTING=1 to your environment, for example /etc/environment or ~/.pam_environment . MSG fi