Date: Thursday, June 20, 2013 @ 00:48:17 Author: heftig Revision: 188771
archrelease: copy trunk to testing-i686, testing-x86_64 Added: freetype2/repos/testing-i686/PKGBUILD (from rev 188770, freetype2/trunk/PKGBUILD) freetype2/repos/testing-i686/freetype-2.2.1-enable-valid.patch (from rev 188770, freetype2/trunk/freetype-2.2.1-enable-valid.patch) freetype2/repos/testing-i686/freetype-2.3.0-enable-spr.patch (from rev 188770, freetype2/trunk/freetype-2.3.0-enable-spr.patch) freetype2/repos/testing-i686/freetype-2.4.11-enable-sph.patch (from rev 188770, freetype2/trunk/freetype-2.4.11-enable-sph.patch) freetype2/repos/testing-x86_64/PKGBUILD (from rev 188770, freetype2/trunk/PKGBUILD) freetype2/repos/testing-x86_64/freetype-2.2.1-enable-valid.patch (from rev 188770, freetype2/trunk/freetype-2.2.1-enable-valid.patch) freetype2/repos/testing-x86_64/freetype-2.3.0-enable-spr.patch (from rev 188770, freetype2/trunk/freetype-2.3.0-enable-spr.patch) freetype2/repos/testing-x86_64/freetype-2.4.11-enable-sph.patch (from rev 188770, freetype2/trunk/freetype-2.4.11-enable-sph.patch) Deleted: freetype2/repos/testing-i686/PKGBUILD freetype2/repos/testing-i686/freetype-2.2.1-enable-valid.patch freetype2/repos/testing-i686/freetype-2.3.0-enable-spr.patch freetype2/repos/testing-i686/freetype-2.4.11-enable-sph.patch freetype2/repos/testing-i686/freetype-2.4.13-disable-old-cff-engine.patch freetype2/repos/testing-x86_64/PKGBUILD freetype2/repos/testing-x86_64/freetype-2.2.1-enable-valid.patch freetype2/repos/testing-x86_64/freetype-2.3.0-enable-spr.patch freetype2/repos/testing-x86_64/freetype-2.4.11-enable-sph.patch freetype2/repos/testing-x86_64/freetype-2.4.13-disable-old-cff-engine.patch -------------------------------------------------------------+ /PKGBUILD | 102 ++++++++++ /freetype-2.2.1-enable-valid.patch | 40 +++ /freetype-2.3.0-enable-spr.patch | 22 ++ /freetype-2.4.11-enable-sph.patch | 26 ++ testing-i686/PKGBUILD | 47 ---- testing-i686/freetype-2.2.1-enable-valid.patch | 20 - testing-i686/freetype-2.3.0-enable-spr.patch | 11 - testing-i686/freetype-2.4.11-enable-sph.patch | 13 - testing-i686/freetype-2.4.13-disable-old-cff-engine.patch | 13 - testing-x86_64/PKGBUILD | 47 ---- testing-x86_64/freetype-2.2.1-enable-valid.patch | 20 - testing-x86_64/freetype-2.3.0-enable-spr.patch | 11 - testing-x86_64/freetype-2.4.11-enable-sph.patch | 13 - testing-x86_64/freetype-2.4.13-disable-old-cff-engine.patch | 13 - 14 files changed, 190 insertions(+), 208 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2013-06-19 22:47:10 UTC (rev 188770) +++ testing-i686/PKGBUILD 2013-06-19 22:48:17 UTC (rev 188771) @@ -1,47 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=freetype2 -pkgver=2.5.0 -pkgrel=1 -pkgdesc="TrueType font rendering library" -arch=(i686 x86_64) -license=('GPL') -url="http://freetype.sourceforge.net" -depends=('zlib' 'bzip2' 'sh') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 - freetype-2.2.1-enable-valid.patch - freetype-2.3.0-enable-spr.patch - freetype-2.4.11-enable-sph.patch - freetype-2.4.13-disable-old-cff-engine.patch) -md5sums=('07b7f54bc32d3a0f8a44ec4586c73d81' - '214119610444c9b02766ccee5e220680' - '816dc8619a6904a7385769433c0a8653' - '2422f8902224fedb46ae9eec08c8ceac' - '65f1c3e7a461e202bc10765b65f4f6d3') - -prepare() { - cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" - #patch -Np1 -i "${srcdir}/freetype-2.4.11-enable-sph.patch" # Disabled for now due to resistance - patch -Np1 -i "${srcdir}/freetype-2.4.13-disable-old-cff-engine.patch" -} - -build() { - cd "${srcdir}/freetype-${pkgver}" - ./configure --prefix=/usr --disable-static \ - --without-png - make -} - -check() { - cd "${srcdir}/freetype-${pkgver}" - make -k check -} - -package() { - cd "${srcdir}/freetype-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: freetype2/repos/testing-i686/PKGBUILD (from rev 188770, freetype2/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2013-06-19 22:48:17 UTC (rev 188771) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=freetype2 +pkgver=2.5.0.1 +pkgrel=1 +pkgdesc="TrueType font rendering library" +arch=(i686 x86_64) +license=('GPL') +url="http://freetype.sourceforge.net" +depends=('zlib' 'bzip2' 'sh') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 + freetype-2.2.1-enable-valid.patch + freetype-2.3.0-enable-spr.patch + freetype-2.4.11-enable-sph.patch) +md5sums=('c72e9010b1d986d556fc0b2b5fcbf31a' + '214119610444c9b02766ccee5e220680' + '816dc8619a6904a7385769433c0a8653' + '2422f8902224fedb46ae9eec08c8ceac') + +prepare() { + cd "${srcdir}/freetype-${pkgver}" + patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" + patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" + + # Disabled for now due to resistance + # Kept here for easier rebuilds via ABS + # https://bugs.archlinux.org/task/35274 + #patch -Np1 -i "${srcdir}/freetype-2.4.11-enable-sph.patch" +} + +build() { + cd "${srcdir}/freetype-${pkgver}" + + # PNG support is useless if FT_CONFIG_OPTION_USE_PNG is disabled + ./configure --prefix=/usr --disable-static \ + --without-png + + make +} + +check() { + cd "${srcdir}/freetype-${pkgver}" + make -k check +} + +package() { + cd "${srcdir}/freetype-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: testing-i686/freetype-2.2.1-enable-valid.patch =================================================================== --- testing-i686/freetype-2.2.1-enable-valid.patch 2013-06-19 22:47:10 UTC (rev 188770) +++ testing-i686/freetype-2.2.1-enable-valid.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -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. - # Copied: freetype2/repos/testing-i686/freetype-2.2.1-enable-valid.patch (from rev 188770, freetype2/trunk/freetype-2.2.1-enable-valid.patch) =================================================================== --- testing-i686/freetype-2.2.1-enable-valid.patch (rev 0) +++ testing-i686/freetype-2.2.1-enable-valid.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -0,0 +1,20 @@ +--- 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: testing-i686/freetype-2.3.0-enable-spr.patch =================================================================== --- testing-i686/freetype-2.3.0-enable-spr.patch 2013-06-19 22:47:10 UTC (rev 188770) +++ testing-i686/freetype-2.3.0-enable-spr.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -1,11 +0,0 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ - /* 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 - - - /*************************************************************************/ Copied: freetype2/repos/testing-i686/freetype-2.3.0-enable-spr.patch (from rev 188770, freetype2/trunk/freetype-2.3.0-enable-spr.patch) =================================================================== --- testing-i686/freetype-2.3.0-enable-spr.patch (rev 0) +++ testing-i686/freetype-2.3.0-enable-spr.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -0,0 +1,11 @@ +--- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 ++++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 +@@ -92,7 +92,7 @@ + /* 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 + + + /*************************************************************************/ Deleted: testing-i686/freetype-2.4.11-enable-sph.patch =================================================================== --- testing-i686/freetype-2.4.11-enable-sph.patch 2013-06-19 22:47:10 UTC (rev 188770) +++ testing-i686/freetype-2.4.11-enable-sph.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -1,13 +0,0 @@ -diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h -index a73fff4..0a081bf 100644 ---- i/include/freetype/config/ftoption.h -+++ w/include/freetype/config/ftoption.h -@@ -577,7 +577,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 - - - /*************************************************************************/ Copied: freetype2/repos/testing-i686/freetype-2.4.11-enable-sph.patch (from rev 188770, freetype2/trunk/freetype-2.4.11-enable-sph.patch) =================================================================== --- testing-i686/freetype-2.4.11-enable-sph.patch (rev 0) +++ testing-i686/freetype-2.4.11-enable-sph.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -0,0 +1,13 @@ +diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h +index a73fff4..0a081bf 100644 +--- i/include/freetype/config/ftoption.h ++++ w/include/freetype/config/ftoption.h +@@ -577,7 +577,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: testing-i686/freetype-2.4.13-disable-old-cff-engine.patch =================================================================== --- testing-i686/freetype-2.4.13-disable-old-cff-engine.patch 2013-06-19 22:47:10 UTC (rev 188770) +++ testing-i686/freetype-2.4.13-disable-old-cff-engine.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -1,13 +0,0 @@ -diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h -index d162780..0883c69 100644 ---- i/include/freetype/config/ftoption.h -+++ w/include/freetype/config/ftoption.h -@@ -765,7 +765,7 @@ FT_BEGIN_HEADER - /* switch between the two engines using the `hinting-engine' property of */ - /* the cff driver module. */ - /* */ --#define CFF_CONFIG_OPTION_OLD_ENGINE -+/* #define CFF_CONFIG_OPTION_OLD_ENGINE */ - - - /*************************************************************************/ Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2013-06-19 22:47:10 UTC (rev 188770) +++ testing-x86_64/PKGBUILD 2013-06-19 22:48:17 UTC (rev 188771) @@ -1,47 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=freetype2 -pkgver=2.5.0 -pkgrel=1 -pkgdesc="TrueType font rendering library" -arch=(i686 x86_64) -license=('GPL') -url="http://freetype.sourceforge.net" -depends=('zlib' 'bzip2' 'sh') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 - freetype-2.2.1-enable-valid.patch - freetype-2.3.0-enable-spr.patch - freetype-2.4.11-enable-sph.patch - freetype-2.4.13-disable-old-cff-engine.patch) -md5sums=('07b7f54bc32d3a0f8a44ec4586c73d81' - '214119610444c9b02766ccee5e220680' - '816dc8619a6904a7385769433c0a8653' - '2422f8902224fedb46ae9eec08c8ceac' - '65f1c3e7a461e202bc10765b65f4f6d3') - -prepare() { - cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" - #patch -Np1 -i "${srcdir}/freetype-2.4.11-enable-sph.patch" # Disabled for now due to resistance - patch -Np1 -i "${srcdir}/freetype-2.4.13-disable-old-cff-engine.patch" -} - -build() { - cd "${srcdir}/freetype-${pkgver}" - ./configure --prefix=/usr --disable-static \ - --without-png - make -} - -check() { - cd "${srcdir}/freetype-${pkgver}" - make -k check -} - -package() { - cd "${srcdir}/freetype-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: freetype2/repos/testing-x86_64/PKGBUILD (from rev 188770, freetype2/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2013-06-19 22:48:17 UTC (rev 188771) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=freetype2 +pkgver=2.5.0.1 +pkgrel=1 +pkgdesc="TrueType font rendering library" +arch=(i686 x86_64) +license=('GPL') +url="http://freetype.sourceforge.net" +depends=('zlib' 'bzip2' 'sh') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 + freetype-2.2.1-enable-valid.patch + freetype-2.3.0-enable-spr.patch + freetype-2.4.11-enable-sph.patch) +md5sums=('c72e9010b1d986d556fc0b2b5fcbf31a' + '214119610444c9b02766ccee5e220680' + '816dc8619a6904a7385769433c0a8653' + '2422f8902224fedb46ae9eec08c8ceac') + +prepare() { + cd "${srcdir}/freetype-${pkgver}" + patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" + patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" + + # Disabled for now due to resistance + # Kept here for easier rebuilds via ABS + # https://bugs.archlinux.org/task/35274 + #patch -Np1 -i "${srcdir}/freetype-2.4.11-enable-sph.patch" +} + +build() { + cd "${srcdir}/freetype-${pkgver}" + + # PNG support is useless if FT_CONFIG_OPTION_USE_PNG is disabled + ./configure --prefix=/usr --disable-static \ + --without-png + + make +} + +check() { + cd "${srcdir}/freetype-${pkgver}" + make -k check +} + +package() { + cd "${srcdir}/freetype-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: testing-x86_64/freetype-2.2.1-enable-valid.patch =================================================================== --- testing-x86_64/freetype-2.2.1-enable-valid.patch 2013-06-19 22:47:10 UTC (rev 188770) +++ testing-x86_64/freetype-2.2.1-enable-valid.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -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. - # Copied: freetype2/repos/testing-x86_64/freetype-2.2.1-enable-valid.patch (from rev 188770, freetype2/trunk/freetype-2.2.1-enable-valid.patch) =================================================================== --- testing-x86_64/freetype-2.2.1-enable-valid.patch (rev 0) +++ testing-x86_64/freetype-2.2.1-enable-valid.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -0,0 +1,20 @@ +--- 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: testing-x86_64/freetype-2.3.0-enable-spr.patch =================================================================== --- testing-x86_64/freetype-2.3.0-enable-spr.patch 2013-06-19 22:47:10 UTC (rev 188770) +++ testing-x86_64/freetype-2.3.0-enable-spr.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -1,11 +0,0 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ - /* 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 - - - /*************************************************************************/ Copied: freetype2/repos/testing-x86_64/freetype-2.3.0-enable-spr.patch (from rev 188770, freetype2/trunk/freetype-2.3.0-enable-spr.patch) =================================================================== --- testing-x86_64/freetype-2.3.0-enable-spr.patch (rev 0) +++ testing-x86_64/freetype-2.3.0-enable-spr.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -0,0 +1,11 @@ +--- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 ++++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 +@@ -92,7 +92,7 @@ + /* 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 + + + /*************************************************************************/ Deleted: testing-x86_64/freetype-2.4.11-enable-sph.patch =================================================================== --- testing-x86_64/freetype-2.4.11-enable-sph.patch 2013-06-19 22:47:10 UTC (rev 188770) +++ testing-x86_64/freetype-2.4.11-enable-sph.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -1,13 +0,0 @@ -diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h -index a73fff4..0a081bf 100644 ---- i/include/freetype/config/ftoption.h -+++ w/include/freetype/config/ftoption.h -@@ -577,7 +577,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 - - - /*************************************************************************/ Copied: freetype2/repos/testing-x86_64/freetype-2.4.11-enable-sph.patch (from rev 188770, freetype2/trunk/freetype-2.4.11-enable-sph.patch) =================================================================== --- testing-x86_64/freetype-2.4.11-enable-sph.patch (rev 0) +++ testing-x86_64/freetype-2.4.11-enable-sph.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -0,0 +1,13 @@ +diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h +index a73fff4..0a081bf 100644 +--- i/include/freetype/config/ftoption.h ++++ w/include/freetype/config/ftoption.h +@@ -577,7 +577,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: testing-x86_64/freetype-2.4.13-disable-old-cff-engine.patch =================================================================== --- testing-x86_64/freetype-2.4.13-disable-old-cff-engine.patch 2013-06-19 22:47:10 UTC (rev 188770) +++ testing-x86_64/freetype-2.4.13-disable-old-cff-engine.patch 2013-06-19 22:48:17 UTC (rev 188771) @@ -1,13 +0,0 @@ -diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h -index d162780..0883c69 100644 ---- i/include/freetype/config/ftoption.h -+++ w/include/freetype/config/ftoption.h -@@ -765,7 +765,7 @@ FT_BEGIN_HEADER - /* switch between the two engines using the `hinting-engine' property of */ - /* the cff driver module. */ - /* */ --#define CFF_CONFIG_OPTION_OLD_ENGINE -+/* #define CFF_CONFIG_OPTION_OLD_ENGINE */ - - - /*************************************************************************/