Date: Tuesday, October 6, 2015 @ 04:39:01
Author: fyan
Revision: 143032
upgpkg: lib32-freetype2 2.6.1-1
sync with [extra]
Added:
lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch
lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch
lib32-freetype2/trunk/0003-Enable-subpixel-hinting.patch
lib32-freetype2/trunk/0004-Mask-subpixel-hinting-with-an-env-var.patch
Modified:
lib32-freetype2/trunk/PKGBUILD
Deleted:
lib32-freetype2/trunk/env_FT2_SUBPIXEL_HINTING.diff
lib32-freetype2/trunk/freetype-2.2.1-enable-valid.patch
lib32-freetype2/trunk/freetype-2.5.1-enable-sph.patch
lib32-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 | 30 +++++++++---------
env_FT2_SUBPIXEL_HINTING.diff | 18 -----------
freetype-2.2.1-enable-valid.patch | 20 ------------
freetype-2.5.1-enable-sph.patch | 13 --------
freetype-2.5.1-enable-spr.patch | 13 --------
9 files changed, 130 insertions(+), 79 deletions(-)
Added: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch (rev 0)
+++ 0001-Enable-table-validation-modules.patch 2015-10-06 02:39:01 UTC (rev
143032)
@@ -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
+
Added: 0002-Enable-subpixel-rendering.patch
===================================================================
--- 0002-Enable-subpixel-rendering.patch (rev 0)
+++ 0002-Enable-subpixel-rendering.patch 2015-10-06 02:39:01 UTC (rev
143032)
@@ -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
+
Added: 0003-Enable-subpixel-hinting.patch
===================================================================
--- 0003-Enable-subpixel-hinting.patch (rev 0)
+++ 0003-Enable-subpixel-hinting.patch 2015-10-06 02:39:01 UTC (rev 143032)
@@ -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
+
Added: 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-10-06 02:39:01 UTC
(rev 143032)
@@ -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-06 02:25:44 UTC (rev 143031)
+++ PKGBUILD 2015-10-06 02:39:01 UTC (rev 143032)
@@ -4,40 +4,40 @@
_pkgbasename=freetype2
pkgname=lib32-$_pkgbasename
-pkgver=2.6
+pkgver=2.6.1
pkgrel=1
pkgdesc="TrueType font rendering library (32-bit)"
arch=(x86_64)
license=('GPL')
-url="http://freetype.sourceforge.net";
+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}
- 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)
-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')
+ '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"
+ 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-06 02:25:44 UTC (rev 143031)
+++ env_FT2_SUBPIXEL_HINTING.diff 2015-10-06 02:39:01 UTC (rev 143032)
@@ -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: freetype-2.2.1-enable-valid.patch
===================================================================
--- freetype-2.2.1-enable-valid.patch 2015-10-06 02:25:44 UTC (rev 143031)
+++ freetype-2.2.1-enable-valid.patch 2015-10-06 02:39:01 UTC (rev 143032)
@@ -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-06 02:25:44 UTC (rev 143031)
+++ freetype-2.5.1-enable-sph.patch 2015-10-06 02:39:01 UTC (rev 143032)
@@ -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-06 02:25:44 UTC (rev 143031)
+++ freetype-2.5.1-enable-spr.patch 2015-10-06 02:39:01 UTC (rev 143032)
@@ -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
-
-
- /*************************************************************************/
