Update to 2.6.5

6 files changed, 175 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37c8ee26d14e..1b7a53f7e9fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Feb 11 15:14:43 UTC 2016
+# Tue Jul 12 15:39:24 UTC 2016
 pkgbase = mingw-w64-freetype2-bootstrap
-	pkgdesc = TrueType font rendering library (mingw-w64 bootstrap)
-	pkgver = 2.6.3
+	pkgdesc = TrueType font rendering library (mingw-w64)
+	pkgver = 2.6.5
 	pkgrel = 1
 	url = http://www.freetype.org/
 	arch = any
@@ -16,22 +16,24 @@ pkgbase = mingw-w64-freetype2-bootstrap
 	provides = mingw-w64-freetype2
 	conflicts = mingw-w64-freetype
 	conflicts = mingw-w64-freetype2
+	replaces = mingw-w64-freetype
+	replaces = mingw-w64-freetype2
 	options = !strip
 	options = !buildflags
 	options = !libtool
 	options = staticlibs
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.6.3.tar.bz2
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.6.3.tar.bz2.sig
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.6.5.tar.bz2
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.6.5.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 = 6c98bd5d0be313207c37ca23d25faf983486aee5
+	source = 0003-Make-subpixel-hinting-mode-configurable.patch
+	source = 0004-Keep-default-interpreter-version-as-35.patch
+	sha1sums = 5db38ae2308c5a2c519c8e071e98b70d61585201
 	sha1sums = SKIP
-	sha1sums = 1c7bc438df0428a63f881e7e4343b22c5b09ecb1
-	sha1sums = e2d2b8c4847ab9cfd497179c7140835e99ece711
-	sha1sums = ebe3d7a6fc41304a77c23cb56e94dc718146d963
-	sha1sums = f50c70080f3fbee45b9c4264d8ae37eb4f1ac335
+	sha1sums = e1fde7854d2a64868a5eef07415ad23c339fc630
+	sha1sums = 7da3af8e1e002e39a247c37a05a10beb576007d6
+	sha1sums = c64ba9d37732fc75de7817d1d679a3e38efdb4cb
+	sha1sums = 1f30feeba9c51c9ec745bd29ef07beccf9544338
 
 pkgname = mingw-w64-freetype2-bootstrap
 
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 4ed7dd81b173..55288708b19f 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,4 +1,4 @@
-From 27f765b5f41638de36de728e9018a1400b0be615 Mon Sep 17 00:00:00 2001
+From a7e32953f291c39a8286b87516cd0c0516c2c89b 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
@@ -8,7 +8,7 @@ Subject: [PATCH 1/4] Enable table validation modules
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.cfg b/modules.cfg
-index 2984e51..a5db21d 100644
+index d677565a2bc2b5a2..f19cbec33384a86f 100644
 --- a/modules.cfg
 +++ b/modules.cfg
 @@ -110,7 +110,7 @@ RASTER_MODULES += smooth
@@ -30,5 +30,5 @@ index 2984e51..a5db21d 100644
  # Auxiliary PostScript driver component to share common code.
  #
 -- 
-2.6.0
+2.9.0
 
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index acc0475c0bd7..d70b4f0e2cf6 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -1,4 +1,4 @@
-From 27d96091b2bb0a825cbd62a332ef918f39c6126f Mon Sep 17 00:00:00 2001
+From 6a8bbe968954bcc54fdfcd5a71c7632370e3066a 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
@@ -8,7 +8,7 @@ Subject: [PATCH 2/4] Enable subpixel rendering
  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
+index 2556c64d9d6c0838..8e58403529f597e5 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
 @@ -92,7 +92,7 @@ FT_BEGIN_HEADER
@@ -21,5 +21,5 @@ index 4970945..ab407e3 100644
  
    /*************************************************************************/
 -- 
-2.6.0
+2.9.0
 
diff --git a/0003-Make-subpixel-hinting-mode-configurable.patch b/0003-Make-subpixel-hinting-mode-configurable.patch
new file mode 100644
index 000000000000..c1441dbef1d3
--- /dev/null
+++ b/0003-Make-subpixel-hinting-mode-configurable.patch
@@ -0,0 +1,88 @@
+From be997becc28dfbf2077cca55dc9a6a090d13e22a Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Wed, 15 Jun 2016 14:10:20 +0200
+Subject: [PATCH 3/4] Make subpixel hinting mode configurable
+
+---
+ include/freetype/config/ftoption.h |  2 +-
+ src/truetype/ttobjs.c              | 37 +++++++++++++++++++++++++++++++++++++
+ 2 files changed, 38 insertions(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 8e58403529f597e5..197e15cdc3cc1e74 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -632,7 +632,7 @@ FT_BEGIN_HEADER
+   /*                                                                       */
+ /* #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     ( 1 | 2 )
+ 
+ 
+   /*************************************************************************/
+diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
+index ed3be2dbee79427c..d89f92e94d0e816b 100644
+--- a/src/truetype/ttobjs.c
++++ b/src/truetype/ttobjs.c
+@@ -36,6 +36,9 @@
+ #include "ttgxvar.h"
+ #endif
+ 
++#include <stdlib.h>
++#include <errno.h>
++
+   /*************************************************************************/
+   /*                                                                       */
+   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
+@@ -1286,6 +1289,7 @@
+ #ifdef TT_USE_BYTECODE_INTERPRETER
+ 
+     TT_Driver  driver = (TT_Driver)ttdriver;
++    const char *envval;
+ 
+     driver->interpreter_version = TT_INTERPRETER_VERSION_35;
+ #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
+@@ -1295,6 +1299,39 @@
+     driver->interpreter_version = TT_INTERPRETER_VERSION_40;
+ #endif
+ 
++    errno = 0;
++    envval = getenv( "FT2_SUBPIXEL_HINTING" );
++    if ( envval )
++    {
++      char *endptr = NULL;
++      unsigned long value = strtoul( envval, &endptr, 10 );
++
++      if ( !errno && endptr && !*endptr )
++      {
++        switch( value )
++        {
++        case 0:
++          driver->interpreter_version = TT_INTERPRETER_VERSION_35;
++          break;
++
++#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
++        case 1:
++          driver->interpreter_version = TT_INTERPRETER_VERSION_38;
++          break;
++#endif
++
++#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
++        case 2:
++          driver->interpreter_version = TT_INTERPRETER_VERSION_40;
++          break;
++#endif
++
++        default:
++          break;
++        }
++      }
++    }
++
+ #else /* !TT_USE_BYTECODE_INTERPRETER */
+ 
+     FT_UNUSED( ttdriver );
+-- 
+2.9.0
+
diff --git a/0004-Keep-default-interpreter-version-as-35.patch b/0004-Keep-default-interpreter-version-as-35.patch
new file mode 100644
index 000000000000..ba188537f11e
--- /dev/null
+++ b/0004-Keep-default-interpreter-version-as-35.patch
@@ -0,0 +1,29 @@
+From 88e7474320b8d2b5333e276b8b1771bc2690c43f Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 12 Jul 2016 12:47:57 +0200
+Subject: [PATCH 4/4] Keep default interpreter version as 35
+
+---
+ src/truetype/ttobjs.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
+index d89f92e94d0e816b..efca66fc21c0287a 100644
+--- a/src/truetype/ttobjs.c
++++ b/src/truetype/ttobjs.c
+@@ -1292,12 +1292,6 @@
+     const char *envval;
+ 
+     driver->interpreter_version = TT_INTERPRETER_VERSION_35;
+-#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
+-    driver->interpreter_version = TT_INTERPRETER_VERSION_38;
+-#endif
+-#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+-    driver->interpreter_version = TT_INTERPRETER_VERSION_40;
+-#endif
+ 
+     errno = 0;
+     envval = getenv( "FT2_SUBPIXEL_HINTING" );
+-- 
+2.9.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 16838f27f0db..7cc22f3fc73d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,60 @@
 # Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
 pkgname=mingw-w64-freetype2-bootstrap
-pkgver=2.6.3
+pkgver=2.6.5
 pkgrel=1
-pkgdesc="TrueType font rendering library (mingw-w64 bootstrap)"
+pkgdesc="TrueType font rendering library (mingw-w64)"
 arch=('any')
 url="http://www.freetype.org/"
 license=('GPL')
-# adding harfbuzz for improved OpenType features auto-hinting
-# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
 depends=(mingw-w64-crt mingw-w64-zlib mingw-w64-bzip2)
 makedepends=(mingw-w64-gcc mingw-w64-configure)
-provides=(mingw-w64-freetype ${pkgname%-bootstrap})
-conflicts=(mingw-w64-freetype ${pkgname%-bootstrap})
+provides=(mingw-w64-freetype)
+replaces=(mingw-w64-freetype)
+conflicts=(mingw-w64-freetype)
 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)
+        0003-Make-subpixel-hinting-mode-configurable.patch
+        0004-Keep-default-interpreter-version-as-35.patch)
 options=(!strip !buildflags !libtool staticlibs)
-sha1sums=('6c98bd5d0be313207c37ca23d25faf983486aee5'
+sha1sums=('5db38ae2308c5a2c519c8e071e98b70d61585201'
           'SKIP'
-          '1c7bc438df0428a63f881e7e4343b22c5b09ecb1'
-          'e2d2b8c4847ab9cfd497179c7140835e99ece711'
-          'ebe3d7a6fc41304a77c23cb56e94dc718146d963'
-          'f50c70080f3fbee45b9c4264d8ae37eb4f1ac335')
+          'e1fde7854d2a64868a5eef07415ad23c339fc630'
+          '7da3af8e1e002e39a247c37a05a10beb576007d6'
+          'c64ba9d37732fc75de7817d1d679a3e38efdb4cb'
+          '1f30feeba9c51c9ec745bd29ef07beccf9544338')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
+if [[ $pkgname = "mingw-w64-freetype2-bootstrap" ]]; then
+  _provides=${pkgname%-bootstrap}
+else
+  _provides=${pkgname}-bootstrap
+  # adding harfbuzz for improved OpenType features auto-hinting
+  # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+  depends+=(mingw-w64-harfbuzz)
+fi
+provides+=(${_provides})
+replaces+=(${_provides})
+conflicts+=(${_provides})
+
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 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"
+  patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+  patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+
+  # Provide a way to set the default subpixel hinting mode
+  # at runtime, without depending on the application to do so.
+  patch -Np1 -i ../0003-Make-subpixel-hinting-mode-configurable.patch
+
+  # Keep the classic subpixel hinting mode as default, as expected
+  # by upstream for the 2.6 series
+  patch -Np1 -i ../0004-Keep-default-interpreter-version-as-35.patch
 }
 
 build() {