Date: Friday, December 4, 2015 @ 06:30:35 Author: fyan Revision: 148309
archrelease: copy trunk to multilib-x86_64 Added: lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch (from rev 148308, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch) lib32-freetype2/repos/multilib-x86_64/0002-Enable-subpixel-rendering.patch (from rev 148308, lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch) lib32-freetype2/repos/multilib-x86_64/0003-Enable-subpixel-hinting.patch (from rev 148308, lib32-freetype2/trunk/0003-Enable-subpixel-hinting.patch) lib32-freetype2/repos/multilib-x86_64/0004-Mask-subpixel-hinting-with-an-env-var.patch (from rev 148308, lib32-freetype2/trunk/0004-Mask-subpixel-hinting-with-an-env-var.patch) lib32-freetype2/repos/multilib-x86_64/PKGBUILD (from rev 148308, lib32-freetype2/trunk/PKGBUILD) Deleted: lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch lib32-freetype2/repos/multilib-x86_64/0002-Enable-subpixel-rendering.patch lib32-freetype2/repos/multilib-x86_64/0003-Enable-subpixel-hinting.patch lib32-freetype2/repos/multilib-x86_64/0004-Mask-subpixel-hinting-with-an-env-var.patch lib32-freetype2/repos/multilib-x86_64/PKGBUILD --------------------------------------------------+ 0001-Enable-table-validation-modules.patch | 68 +++++------ 0002-Enable-subpixel-rendering.patch | 50 ++++---- 0003-Enable-subpixel-hinting.patch | 50 ++++---- 0004-Mask-subpixel-hinting-with-an-env-var.patch | 62 +++++----- PKGBUILD | 124 ++++++++++----------- 5 files changed, 177 insertions(+), 177 deletions(-) Deleted: 0001-Enable-table-validation-modules.patch =================================================================== --- 0001-Enable-table-validation-modules.patch 2015-12-04 05:30:04 UTC (rev 148308) +++ 0001-Enable-table-validation-modules.patch 2015-12-04 05:30:35 UTC (rev 148309) @@ -1,34 +0,0 @@ -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: lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch (from rev 148308, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch) =================================================================== --- 0001-Enable-table-validation-modules.patch (rev 0) +++ 0001-Enable-table-validation-modules.patch 2015-12-04 05:30:35 UTC (rev 148309) @@ -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 + Deleted: 0002-Enable-subpixel-rendering.patch =================================================================== --- 0002-Enable-subpixel-rendering.patch 2015-12-04 05:30:04 UTC (rev 148308) +++ 0002-Enable-subpixel-rendering.patch 2015-12-04 05:30:35 UTC (rev 148309) @@ -1,25 +0,0 @@ -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: lib32-freetype2/repos/multilib-x86_64/0002-Enable-subpixel-rendering.patch (from rev 148308, lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch) =================================================================== --- 0002-Enable-subpixel-rendering.patch (rev 0) +++ 0002-Enable-subpixel-rendering.patch 2015-12-04 05:30:35 UTC (rev 148309) @@ -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 + Deleted: 0003-Enable-subpixel-hinting.patch =================================================================== --- 0003-Enable-subpixel-hinting.patch 2015-12-04 05:30:04 UTC (rev 148308) +++ 0003-Enable-subpixel-hinting.patch 2015-12-04 05:30:35 UTC (rev 148309) @@ -1,25 +0,0 @@ -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: lib32-freetype2/repos/multilib-x86_64/0003-Enable-subpixel-hinting.patch (from rev 148308, lib32-freetype2/trunk/0003-Enable-subpixel-hinting.patch) =================================================================== --- 0003-Enable-subpixel-hinting.patch (rev 0) +++ 0003-Enable-subpixel-hinting.patch 2015-12-04 05:30:35 UTC (rev 148309) @@ -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 + Deleted: 0004-Mask-subpixel-hinting-with-an-env-var.patch =================================================================== --- 0004-Mask-subpixel-hinting-with-an-env-var.patch 2015-12-04 05:30:04 UTC (rev 148308) +++ 0004-Mask-subpixel-hinting-with-an-env-var.patch 2015-12-04 05:30:35 UTC (rev 148309) @@ -1,31 +0,0 @@ -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 - Copied: lib32-freetype2/repos/multilib-x86_64/0004-Mask-subpixel-hinting-with-an-env-var.patch (from rev 148308, lib32-freetype2/trunk/0004-Mask-subpixel-hinting-with-an-env-var.patch) =================================================================== --- 0004-Mask-subpixel-hinting-with-an-env-var.patch (rev 0) +++ 0004-Mask-subpixel-hinting-with-an-env-var.patch 2015-12-04 05:30:35 UTC (rev 148309) @@ -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 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-12-04 05:30:04 UTC (rev 148308) +++ PKGBUILD 2015-12-04 05:30:35 UTC (rev 148309) @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer: Ionut Biru <ib...@archlinux.org> -# Contributor: Jan de Groot <j...@archlinux.org> - -_pkgbasename=freetype2 -pkgname=lib32-$_pkgbasename -pkgver=2.6.1 -pkgrel=1 -pkgdesc="TrueType font rendering library (32-bit)" -arch=(x86_64) -license=('GPL') -url="http://www.freetype.org/" -# adding harfbuzz for improved OpenType features auto-hinting -# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream -depends=('lib32-zlib' 'lib32-bzip2' 'lib32-libpng' 'lib32-harfbuzz' $_pkgbasename) -makedepends=(gcc-multilib) -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-Enable-subpixel-hinting.patch - 0004-Mask-subpixel-hinting-with-an-env-var.patch) -sha1sums=('393447fbf64c107b20a1ccc9e9a9a52f39786ae0' - 'SKIP' - '1c7bc438df0428a63f881e7e4343b22c5b09ecb1' - 'e2d2b8c4847ab9cfd497179c7140835e99ece711' - 'ebe3d7a6fc41304a77c23cb56e94dc718146d963' - 'f50c70080f3fbee45b9c4264d8ae37eb4f1ac335') -validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') - -prepare() { - cd "${srcdir}/freetype-${pkgver}" - 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}/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}/0004-Mask-subpixel-hinting-with-an-env-var.patch" -} - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/freetype-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -check() { - cd "${srcdir}/freetype-${pkgver}" - make -k check -} - -package() { - cd "${srcdir}/freetype-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}"/usr/{include,share,bin} -} Copied: lib32-freetype2/repos/multilib-x86_64/PKGBUILD (from rev 148308, lib32-freetype2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-12-04 05:30:35 UTC (rev 148309) @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> + +_pkgbasename=freetype2 +pkgname=lib32-$_pkgbasename +pkgver=2.6.2 +pkgrel=1 +pkgdesc="TrueType font rendering library (32-bit)" +arch=(x86_64) +license=('GPL') +url="http://www.freetype.org/" +# adding harfbuzz for improved OpenType features auto-hinting +# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream +depends=('lib32-zlib' 'lib32-bzip2' 'lib32-libpng' 'lib32-harfbuzz' $_pkgbasename) +makedepends=(gcc-multilib) +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-Enable-subpixel-hinting.patch + 0004-Mask-subpixel-hinting-with-an-env-var.patch) +sha1sums=('29c22b85b77cb22cf95c13e7062e21f39fe6b17a' + 'SKIP' + '1c7bc438df0428a63f881e7e4343b22c5b09ecb1' + 'e2d2b8c4847ab9cfd497179c7140835e99ece711' + 'ebe3d7a6fc41304a77c23cb56e94dc718146d963' + 'f50c70080f3fbee45b9c4264d8ae37eb4f1ac335') +validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') + +prepare() { + cd "${srcdir}/freetype-${pkgver}" + 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}/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}/0004-Mask-subpixel-hinting-with-an-env-var.patch" +} + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/freetype-${pkgver}" + ./configure --prefix=/usr --libdir=/usr/lib32 + make +} + +check() { + cd "${srcdir}/freetype-${pkgver}" + make -k check +} + +package() { + cd "${srcdir}/freetype-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/{include,share,bin} +}