2.6.1-1.1

8 files changed, 163 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25f33f11405e..4e31fad444c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = libx32-freetype2
 	pkgdesc = TrueType font rendering library (x32 ABI)
-	pkgver = 2.5.3
-	pkgrel = 1
-	url = http://freetype.sourceforge.net
+	pkgver = 2.6.1
+	pkgrel = 1.1
+	url = http://www.freetype.org/
 	arch = x86_64
 	license = GPL
 	makedepends = gcc-multilib-x32
@@ -11,15 +11,18 @@ pkgbase = libx32-freetype2
 	depends = libx32-libpng
 	depends = libx32-harfbuzz
 	depends = freetype2
-	options = !libtool
-	source = http://downloads.sourceforge.net/sourceforge/freetype/freetype-2.5.3.tar.bz2
-	source = http://downloads.sourceforge.net/sourceforge/freetype/freetype-2.5.3.tar.bz2.sig
-	source = freetype-2.5.1-enable-spr.patch
-	source = freetype-2.2.1-enable-valid.patch
-	md5sums = d6b60f06bfc046e43ab2a6cbfd171d65
-	md5sums = SKIP
-	md5sums = 80a14cce234f3f190cd936ca9060c398
-	md5sums = 214119610444c9b02766ccee5e220680
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.6.1.tar.bz2
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.6.1.tar.bz2.sig
+	source = 0001-Enable-table-validation-modules.patch
+	source = 0002-Enable-subpixel-rendering.patch
+	source = 0003-Enable-subpixel-hinting.patch
+	source = 0004-Mask-subpixel-hinting-with-an-env-var.patch
+	sha1sums = 393447fbf64c107b20a1ccc9e9a9a52f39786ae0
+	sha1sums = SKIP
+	sha1sums = 1c7bc438df0428a63f881e7e4343b22c5b09ecb1
+	sha1sums = e2d2b8c4847ab9cfd497179c7140835e99ece711
+	sha1sums = ebe3d7a6fc41304a77c23cb56e94dc718146d963
+	sha1sums = f50c70080f3fbee45b9c4264d8ae37eb4f1ac335
 
 pkgname = libx32-freetype2
 
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
new file mode 100644
index 000000000000..4ed7dd81b173
--- /dev/null
+++ b/0001-Enable-table-validation-modules.patch
@@ -0,0 +1,34 @@
+From 27f765b5f41638de36de728e9018a1400b0be615 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@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
+
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
new file mode 100644
index 000000000000..acc0475c0bd7
--- /dev/null
+++ b/0002-Enable-subpixel-rendering.patch
@@ -0,0 +1,25 @@
+From 27d96091b2bb0a825cbd62a332ef918f39c6126f Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@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
+
diff --git a/0003-Enable-subpixel-hinting.patch b/0003-Enable-subpixel-hinting.patch
new file mode 100644
index 000000000000..00a5c2f79f3b
--- /dev/null
+++ b/0003-Enable-subpixel-hinting.patch
@@ -0,0 +1,25 @@
+From f96a1d21d787b173d6293330fbf782b977194aa7 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@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
+
diff --git a/0004-Mask-subpixel-hinting-with-an-env-var.patch b/0004-Mask-subpixel-hinting-with-an-env-var.patch
new file mode 100644
index 000000000000..ec8910488cb3
--- /dev/null
+++ b/0004-Mask-subpixel-hinting-with-an-env-var.patch
@@ -0,0 +1,31 @@
+From bb5ece9c6773145c8342107bd32fcacbc4b212ab Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@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
+
diff --git a/PKGBUILD b/PKGBUILD
index c893c59781a5..d3091bae384b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,44 @@
-# $Id: PKGBUILD 107112 2014-03-12 16:52:44Z bluewind $
+# $Id: PKGBUILD 143033 2015-10-06 02:39:33Z fyan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # x32 Maintainer: Fantix King <fantix.king at gmail.com>
 
 _pkgbasename=freetype2
 pkgname=libx32-$_pkgbasename
-pkgver=2.5.3
-pkgrel=1
+pkgver=2.6.1
+pkgrel=1.1
 pkgdesc="TrueType font rendering library (x32 ABI)"
 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=('libx32-zlib' 'libx32-bzip2' 'libx32-libpng' 'libx32-harfbuzz' $_pkgbasename)
 makedepends=(gcc-multilib-x32)
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2{,.sig}
-        freetype-2.5.1-enable-spr.patch
-        freetype-2.2.1-enable-valid.patch)
-md5sums=('d6b60f06bfc046e43ab2a6cbfd171d65'
-         'SKIP'
-         '80a14cce234f3f190cd936ca9060c398'
-         '214119610444c9b02766ccee5e220680')
+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}/freetype-2.5.1-enable-spr.patch"
-  patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.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}/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() {
@@ -34,15 +47,17 @@ build() {
   export PKG_CONFIG_PATH="/usr/libx32/pkgconfig"
 
   cd "${srcdir}/freetype-${pkgver}"
-
   ./configure --prefix=/usr --libdir=/usr/libx32
   make
 }
 
-package() {
+check() {
   cd "${srcdir}/freetype-${pkgver}"
+  make -k check
+}
 
+package() {
+  cd "${srcdir}/freetype-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  rm -r "${pkgdir}"/usr/{include,share,bin}
 }
diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch
deleted file mode 100644
index c78b6b70f6f5..000000000000
--- a/freetype-2.2.1-enable-valid.patch
+++ /dev/null
@@ -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.
- #
diff --git a/freetype-2.5.1-enable-spr.patch b/freetype-2.5.1-enable-spr.patch
deleted file mode 100644
index 0d300a8dfcb0..000000000000
--- a/freetype-2.5.1-enable-spr.patch
+++ /dev/null
@@ -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
- 
- 
-   /*************************************************************************/