Date: Tuesday, January 10, 2017 @ 19:24:27 Author: heftig Revision: 206650
archrelease: copy trunk to multilib-x86_64 Added: lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch (from rev 206649, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch) lib32-freetype2/repos/multilib-x86_64/0002-Enable-subpixel-rendering.patch (from rev 206649, lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch) lib32-freetype2/repos/multilib-x86_64/0003-Enable-infinality-subpixel-hinting.patch (from rev 206649, lib32-freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch) lib32-freetype2/repos/multilib-x86_64/PKGBUILD (from rev 206649, 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-infinality-subpixel-hinting.patch lib32-freetype2/repos/multilib-x86_64/PKGBUILD -----------------------------------------------+ 0001-Enable-table-validation-modules.patch | 68 ++++++------- 0002-Enable-subpixel-rendering.patch | 50 +++++----- 0003-Enable-infinality-subpixel-hinting.patch | 54 +++++----- PKGBUILD | 118 ++++++++++++------------ 4 files changed, 145 insertions(+), 145 deletions(-) Deleted: 0001-Enable-table-validation-modules.patch =================================================================== --- 0001-Enable-table-validation-modules.patch 2017-01-10 19:23:56 UTC (rev 206649) +++ 0001-Enable-table-validation-modules.patch 2017-01-10 19:24:27 UTC (rev 206650) @@ -1,34 +0,0 @@ -From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 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/3] Enable table validation modules - ---- - modules.cfg | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.cfg b/modules.cfg -index f30049c38cc45159..7b8e50fe1b34584a 100644 ---- a/modules.cfg -+++ b/modules.cfg -@@ -120,7 +120,7 @@ AUX_MODULES += cache - # TrueType GX/AAT table validation. Needs ftgxval.c below. - # - # No FT_CONFIG_OPTION_PIC support. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -143,7 +143,7 @@ AUX_MODULES += bzip2 - # OpenType table validation. Needs ftotval.c below. - # - # No FT_CONFIG_OPTION_PIC support. --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # --- -2.9.3 - Copied: lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch (from rev 206649, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch) =================================================================== --- 0001-Enable-table-validation-modules.patch (rev 0) +++ 0001-Enable-table-validation-modules.patch 2017-01-10 19:24:27 UTC (rev 206650) @@ -0,0 +1,34 @@ +From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 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/3] Enable table validation modules + +--- + modules.cfg | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.cfg b/modules.cfg +index f30049c38cc45159..7b8e50fe1b34584a 100644 +--- a/modules.cfg ++++ b/modules.cfg +@@ -120,7 +120,7 @@ AUX_MODULES += cache + # TrueType GX/AAT table validation. Needs ftgxval.c below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -143,7 +143,7 @@ AUX_MODULES += bzip2 + # OpenType table validation. Needs ftotval.c below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # +-- +2.9.3 + Deleted: 0002-Enable-subpixel-rendering.patch =================================================================== --- 0002-Enable-subpixel-rendering.patch 2017-01-10 19:23:56 UTC (rev 206649) +++ 0002-Enable-subpixel-rendering.patch 2017-01-10 19:24:27 UTC (rev 206650) @@ -1,25 +0,0 @@ -From 96f09f08417887b2618c177bccfb6da2906568d9 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/3] 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 90c123ef93e9ea04..67a361dd41e0b026 100644 ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -122,7 +122,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.9.3 - Copied: lib32-freetype2/repos/multilib-x86_64/0002-Enable-subpixel-rendering.patch (from rev 206649, lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch) =================================================================== --- 0002-Enable-subpixel-rendering.patch (rev 0) +++ 0002-Enable-subpixel-rendering.patch 2017-01-10 19:24:27 UTC (rev 206650) @@ -0,0 +1,25 @@ +From 96f09f08417887b2618c177bccfb6da2906568d9 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/3] 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 90c123ef93e9ea04..67a361dd41e0b026 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -122,7 +122,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.9.3 + Deleted: 0003-Enable-infinality-subpixel-hinting.patch =================================================================== --- 0003-Enable-infinality-subpixel-hinting.patch 2017-01-10 19:23:56 UTC (rev 206649) +++ 0003-Enable-infinality-subpixel-hinting.patch 2017-01-10 19:24:27 UTC (rev 206650) @@ -1,27 +0,0 @@ -From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Mon, 29 Aug 2016 08:43:10 +0200 -Subject: [PATCH 3/3] Enable infinality subpixel hinting - ---- - include/freetype/config/ftoption.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 67a361dd41e0b026..c4812862518b66a6 100644 ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -675,8 +675,8 @@ FT_BEGIN_HEADER - /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ - /* */ - /* #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 ) - - - /*************************************************************************/ --- -2.9.3 - Copied: lib32-freetype2/repos/multilib-x86_64/0003-Enable-infinality-subpixel-hinting.patch (from rev 206649, lib32-freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch) =================================================================== --- 0003-Enable-infinality-subpixel-hinting.patch (rev 0) +++ 0003-Enable-infinality-subpixel-hinting.patch 2017-01-10 19:24:27 UTC (rev 206650) @@ -0,0 +1,27 @@ +From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Mon, 29 Aug 2016 08:43:10 +0200 +Subject: [PATCH 3/3] Enable infinality subpixel hinting + +--- + include/freetype/config/ftoption.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index 67a361dd41e0b026..c4812862518b66a6 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -675,8 +675,8 @@ FT_BEGIN_HEADER + /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ + /* */ + /* #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 ) + + + /*************************************************************************/ +-- +2.9.3 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-01-10 19:23:56 UTC (rev 206649) +++ PKGBUILD 2017-01-10 19:24:27 UTC (rev 206650) @@ -1,59 +0,0 @@ -# $Id$ -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Jan de Groot <j...@archlinux.org> - -_pkgbasename=freetype2 -pkgname=lib32-$_pkgbasename -pkgver=2.7 -pkgrel=2 -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') -provides=('libfreetype.so') -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-infinality-subpixel-hinting.patch) -sha1sums=('f251029d5ab542a96dd4531605fe577185077560' - 'SKIP' - 'b31882ef5e8447e761acee1c4a44c0630cd4d465' - 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e' - '41d27140fd590945e22e012c9dce62de3d6f11e6') -validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') - -prepare() { - # Rename source dir to allow building the demos - mv freetype-${pkgver} freetype2 - - cd freetype2 - patch -Np1 -i ../0001-Enable-table-validation-modules.patch - patch -Np1 -i ../0002-Enable-subpixel-rendering.patch - patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch -} - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd freetype2 - ./configure --prefix=/usr --disable-static --libdir=/usr/lib32 - make -} - -check() { - cd freetype2 - make -k check -} - -package() { - cd freetype2 - make DESTDIR="${pkgdir}" install - - rm -r "${pkgdir}"/usr/{include,share,bin} -} Copied: lib32-freetype2/repos/multilib-x86_64/PKGBUILD (from rev 206649, lib32-freetype2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-01-10 19:24:27 UTC (rev 206650) @@ -0,0 +1,59 @@ +# $Id$ +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> + +_pkgbasename=freetype2 +pkgname=lib32-$_pkgbasename +pkgver=2.7.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') +provides=('libfreetype.so') +source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig} + 0001-Enable-table-validation-modules.patch + 0002-Enable-subpixel-rendering.patch + 0003-Enable-infinality-subpixel-hinting.patch) +sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789' + 'SKIP' + 'b31882ef5e8447e761acee1c4a44c0630cd4d465' + 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e' + '41d27140fd590945e22e012c9dce62de3d6f11e6') +validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') + +prepare() { + # Rename source dir to allow building the demos + mv freetype-${pkgver} freetype2 + + cd freetype2 + patch -Np1 -i ../0001-Enable-table-validation-modules.patch + patch -Np1 -i ../0002-Enable-subpixel-rendering.patch + patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch +} + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd freetype2 + ./configure --prefix=/usr --disable-static --libdir=/usr/lib32 + make +} + +check() { + cd freetype2 + make -k check +} + +package() { + cd freetype2 + make DESTDIR="${pkgdir}" install + + rm -r "${pkgdir}"/usr/{include,share,bin} +}