Use freetype 2.6.1

mdboom · mdboom · commit 420cd8e9c64d · 2015-11-05T11:42:23.000-05:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1501,7 +1501,7 @@ def _init_tests():
 
     # The version of FreeType to install locally for running the
     # tests.  This must match the value in `setupext.py`
-    LOCAL_FREETYPE_VERSION = '2.5.2'
+    LOCAL_FREETYPE_VERSION = '2.6.1'
 
     from matplotlib import ft2font
     if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
diff --git a/setupext.py b/setupext.py
@@ -23,9 +23,9 @@
 # This is the version of FreeType to use when building a local
 # version.  It must match the value in
 # lib/matplotlib.__init__.py
-LOCAL_FREETYPE_VERSION = '2.5.2'
+LOCAL_FREETYPE_VERSION = '2.6.1'
 # md5 hash of the freetype tarball
-LOCAL_FREETYPE_HASH = '004320381043d275c4e28bbacf05a1b7'
+LOCAL_FREETYPE_HASH = '348e667d728c597360e4a87c16556597'
 
 if sys.platform != 'win32':
     if sys.version_info[0] < 3:
@@ -1003,9 +1003,8 @@ def do_custom_build(self):
         subprocess.check_call(
             ['tar', 'zxf', tarball], cwd='build')
         subprocess.check_call(
-            [cflags +
-             './configure --without-zlib --without-bzip2 --without-png'],
-            shell=True, cwd=src_path)
+            [cflags + './configure --with-zlib=no --with-bzip2=no '
+             '--with-png=no --with-harfbuzz=no'], shell=True, cwd=src_path)
         subprocess.check_call(
             [cflags + 'make'], shell=True, cwd=src_path)
 
