Update to 2.7

7 files changed, 111 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a2adbc58da5..d1a663214a2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jul 12 15:38:56 UTC 2016
+# Fri Sep 23 15:25:02 UTC 2016
 pkgbase = mingw-w64-freetype2
 	pkgdesc = TrueType font rendering library (mingw-w64)
-	pkgver = 2.6.5
+	pkgver = 2.7
 	pkgrel = 1
 	url = http://www.freetype.org/
 	arch = any
@@ -23,18 +23,11 @@ pkgbase = mingw-w64-freetype2
 	options = !buildflags
 	options = !libtool
 	options = staticlibs
-	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 = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.tar.bz2
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.tar.bz2.sig
 	source = 0001-Enable-table-validation-modules.patch
 	source = 0002-Enable-subpixel-rendering.patch
-	source = 0003-Make-subpixel-hinting-mode-configurable.patch
-	source = 0004-Keep-default-interpreter-version-as-35.patch
-	sha1sums = 5db38ae2308c5a2c519c8e071e98b70d61585201
-	sha1sums = SKIP
-	sha1sums = e1fde7854d2a64868a5eef07415ad23c339fc630
-	sha1sums = 7da3af8e1e002e39a247c37a05a10beb576007d6
-	sha1sums = c64ba9d37732fc75de7817d1d679a3e38efdb4cb
-	sha1sums = 1f30feeba9c51c9ec745bd29ef07beccf9544338
+	source = 0003-Enable-infinality-subpixel-hinting.patch
 
 pkgname = mingw-w64-freetype2
 
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 55288708b19f..3e9451fa8b82 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,34 +1,34 @@
-From a7e32953f291c39a8286b87516cd0c0516c2c89b Mon Sep 17 00:00:00 2001
+From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 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
+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 d677565a2bc2b5a2..f19cbec33384a86f 100644
+index f30049c38cc45159..7b8e50fe1b34584a 100644
 --- a/modules.cfg
 +++ b/modules.cfg
-@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
- AUX_MODULES += cache
- 
+@@ -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).
  #
-@@ -129,7 +129,7 @@ AUX_MODULES += bzip2
- 
+@@ -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.0
+2.9.3
 
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index d70b4f0e2cf6..dfb57966e2ff 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -1,17 +1,17 @@
-From 6a8bbe968954bcc54fdfcd5a71c7632370e3066a Mon Sep 17 00:00:00 2001
+From 96f09f08417887b2618c177bccfb6da2906568d9 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
+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 2556c64d9d6c0838..8e58403529f597e5 100644
+index 90c123ef93e9ea04..67a361dd41e0b026 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
+@@ -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.                */
    /*                                                                       */
@@ -21,5 +21,5 @@ index 2556c64d9d6c0838..8e58403529f597e5 100644
  
    /*************************************************************************/
 -- 
-2.9.0
+2.9.3
 
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
new file mode 100644
index 000000000000..bbfa2a2cd8c0
--- /dev/null
+++ b/0003-Enable-infinality-subpixel-hinting.patch
@@ -0,0 +1,27 @@
+From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@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
+
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 ea25ce391c5c..8e27ce1bb48f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.
 
 pkgname=mingw-w64-freetype2
-pkgver=2.6.5
+pkgver=2.7
 pkgrel=1
 pkgdesc="TrueType font rendering library (mingw-w64)"
 arch=('any')
@@ -18,15 +18,13 @@ 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-Make-subpixel-hinting-mode-configurable.patch
-        0004-Keep-default-interpreter-version-as-35.patch)
+        0003-Enable-infinality-subpixel-hinting.patch)
 options=(!strip !buildflags !libtool staticlibs)
-sha1sums=('5db38ae2308c5a2c519c8e071e98b70d61585201'
+ha1sums=('f251029d5ab542a96dd4531605fe577185077560'
           'SKIP'
-          'e1fde7854d2a64868a5eef07415ad23c339fc630'
-          '7da3af8e1e002e39a247c37a05a10beb576007d6'
-          'c64ba9d37732fc75de7817d1d679a3e38efdb4cb'
-          '1f30feeba9c51c9ec745bd29ef07beccf9544338')
+          'b31882ef5e8447e761acee1c4a44c0630cd4d465'
+          'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
+          '41d27140fd590945e22e012c9dce62de3d6f11e6')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
 if [[ $pkgname = "mingw-w64-freetype2-bootstrap" ]]; then
@@ -36,25 +34,19 @@ else
   # adding harfbuzz for improved OpenType features auto-hinting
   # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
   depends+=(mingw-w64-harfbuzz)
+  replaces+=(${_provides})
 fi
 provides+=(${_provides})
-replaces+=(${_provides})
 conflicts+=(${_provides})
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}/freetype-${pkgver}"
+
   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
+  patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
 }
 
 build() {