python-matplotlib: Update to 2.1.2

mingw-w64-python-matplotlib/setupext.py.patch

@@ -1,6 +1,6 @@
---- matplotlib-2.0.0/setupext.py.orig	2017-02-15 14:30:26 +0900
-+++ matplotlib-2.0.0/setupext.py	2017-02-15 14:30:37 +0900
-@@ -21,6 +21,8 @@
+--- matplotlib-2.1.2/setupext.py.orig	2018-01-18 07:21:34.000000000 +0300
++++ matplotlib-2.1.2/setupext.py	2018-01-25 08:37:44.104394400 +0300
+@@ -22,6 +22,8 @@
  
  PY3min = (sys.version_info[0] >= 3)
  
@@ -9,7 +9,7 @@
  
  def _get_home():
      """Find user's home directory if possible.
-@@ -68,9 +70,17 @@
+@@ -70,9 +72,17 @@
  # md5 hash of the freetype tarball
  LOCAL_FREETYPE_HASH = '348e667d728c597360e4a87c16556597'
  
@@ -28,7 +28,7 @@
      else:
          from subprocess import getstatusoutput
  
-@@ -148,9 +158,10 @@
+@@ -150,9 +160,10 @@
      Returns `True` if `filename` can be found in one of the
      directories in `include_dirs`.
      """
@@ -40,7 +40,7 @@
          if os.path.exists(os.path.join(dir, filename)):
              return True
      return False
-@@ -261,6 +272,7 @@
+@@ -275,6 +286,7 @@
      """
      ext = DelayedExtension(name, files, *args, **kwargs)
      for dir in get_base_dirs():
@@ -48,7 +48,7 @@
          include_dir = os.path.join(dir, 'include')
          if os.path.exists(include_dir):
              ext.include_dirs.append(include_dir)
-@@ -296,7 +308,7 @@
+@@ -310,7 +322,7 @@
          """
          Determines whether pkg-config exists on this machine.
          """
@@ -57,7 +57,7 @@
              self.has_pkgconfig = False
          else:
              try:
-@@ -305,7 +317,7 @@
+@@ -319,7 +331,7 @@
                  self.pkg_config = 'pkg-config'
  
              self.set_pkgconfig_path()
@@ -66,7 +66,7 @@
              self.has_pkgconfig = (status == 0)
              if not self.has_pkgconfig:
                  print("IMPORTANT WARNING:")
-@@ -346,7 +358,7 @@
+@@ -360,7 +372,7 @@
              command = "{0} --libs --cflags ".format(executable)
  
              try:
@@ -75,7 +75,7 @@
                                        stderr=subprocess.STDOUT)
              except subprocess.CalledProcessError:
                  pass
-@@ -356,11 +368,16 @@
+@@ -370,11 +382,16 @@
                  for token in output.split():
                      attr = flag_map.get(token[:2])
                      if attr is not None:
@@ -93,7 +93,7 @@
                  for include in default_include_dirs:
                      dir = os.path.join(base, include)
                      if os.path.exists(dir):
-@@ -382,7 +399,7 @@
+@@ -396,7 +413,7 @@
              return None
  
          status, output = getstatusoutput(
@@ -102,13 +102,16 @@
          if status == 0:
              return output
          return None
-@@ -958,11 +975,11 @@
+@@ -1042,14 +1059,14 @@
          if options.get('local_freetype'):
              return "Using local version for testing"
  
 -        if sys.platform == 'win32':
 +        if sys.platform == 'win32' and not MSYS:
-             check_include_file(get_include_dirs(), 'ft2build.h', 'freetype')
+             try:
+                 check_include_file(get_include_dirs(), 'ft2build.h', 'freetype')
+             except CheckFailed:
+                 check_include_file(get_include_dirs(), 'freetype2\\ft2build.h', 'freetype')
              return 'Using unknown version found on system.'
  
 -        status, output = getstatusoutput("freetype-config --ftversion")
@@ -116,7 +119,7 @@
          if status == 0:
              version = output
          else:
-@@ -987,6 +1004,8 @@
+@@ -1074,6 +1091,8 @@
              return version
          # Return the first version found in the include dirs.
          for include_dir in ext.include_dirs:
@@ -125,8 +128,8 @@
              header_fname = os.path.join(include_dir, 'freetype.h')
              if os.path.exists(header_fname):
                  major, minor, patch = 0, 0, 0
-@@ -1136,11 +1155,11 @@
-     name = "png"
+@@ -1284,11 +1303,11 @@
+         }
  
      def check(self):
 -        if sys.platform == 'win32':
@@ -139,7 +142,7 @@
          if status == 0:
              version = output
          else:
-@@ -1602,7 +1621,7 @@
+@@ -1708,7 +1727,7 @@
          return ext
  
      def add_flags(self, ext):
@@ -148,7 +151,7 @@
              def getoutput(s):
                  ret = os.popen(s).read().strip()
                  return ret
-@@ -1657,7 +1676,7 @@
+@@ -1763,7 +1782,7 @@
                  'm' in ext.libraries):
                  ext.libraries.remove('m')
  
@@ -157,7 +160,7 @@
              pkg_config.setup_extension(ext, 'pygtk-2.0')
              pkg_config.setup_extension(ext, 'gtk+-2.0')
  
-@@ -2060,7 +2079,7 @@
+@@ -2182,7 +2201,7 @@
  
      def check(self):
          try:
@@ -166,7 +169,7 @@
                                    stderr=subprocess.STDOUT)
              return "version %s" % output.splitlines()[1].decode().split()[-1]
          except (IndexError, ValueError, subprocess.CalledProcessError):
-@@ -2072,14 +2091,14 @@
+@@ -2194,14 +2213,14 @@
      optional = True
  
      def check(self):
@@ -183,7 +186,7 @@
                  output = check_output(command, shell=True,
                                        stderr=subprocess.STDOUT)
                  return "version %s" % output.decode()[:-1]
-@@ -2095,7 +2114,7 @@
+@@ -2217,7 +2236,7 @@
  
      def check(self):
          try:
@@ -192,7 +195,7 @@
                                    stderr=subprocess.STDOUT)
              line = output.splitlines()[0].decode()
              pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
-@@ -2111,7 +2130,7 @@
+@@ -2233,7 +2252,7 @@
  
      def check(self):
          try: