Merge branch 'hotfix-matplotlib' into testing-testapps-rework

Author: opacam

pythonforandroid/recipes/matplotlib/__init__.py

@@ -32,7 +32,7 @@ def generate_libraries_pc_files(self, arch):
 
         Because, for unix platforms, the mpl install script uses `pkg-config`
         to detect libraries installed in non standard locations (our case...
-        well...we don't event install the libraries...so we must trick a little
+        well...we don't even install the libraries...so we must trick a little
         the mlp install).
         """
         pkg_config_path = self.get_recipe_env(arch)['PKG_CONFIG_PATH']
@@ -71,7 +71,7 @@ def download_web_backend_dependencies(self, arch):
         in our CI tests, so we download this package at the expected location
         by the mpl install script which is defined by the environ variable
         `XDG_CACHE_HOME` (we modify that one in our `get_recipe_env` so it will
-        be the same regardles of the host platform).
+        be the same regardless of the host platform).
         """
 
         env = self.get_recipe_env(arch)

pythonforandroid/recipes/matplotlib/mpl_android_fixes.patch

@@ -1,5 +1,5 @@
 --- matplotlib-3.1.1/setupext.py.orig	2019-12-31 01:25:00.000000000 +0100
-+++ matplotlib-3.1.1/setupext.py	2020-01-04 15:30:50.453260814 +0100
++++ matplotlib-3.1.1/setupext.py	2020-03-01 21:12:41.493350250 +0100
 @@ -604,8 +604,7 @@ class Numpy(SetupPackage):
      name = "numpy"
 
@@ -10,19 +10,15 @@
          ext.define_macros.extend([
              # Ensure that PY_ARRAY_UNIQUE_SYMBOL is uniquely defined for each
              # extension.
-@@ -617,10 +616,10 @@ class Numpy(SetupPackage):
+@@ -617,7 +616,7 @@ class Numpy(SetupPackage):
          ])
 
      def get_setup_requires(self):
 -        return ['numpy>=1.11']
 +        return []  # don't need it for p4a, due to above changes
 
      def get_install_requires(self):
--        return ['numpy>=1.11']
-+        return ['numpy==1.16.4']  # to match p4a's target version
- 
- 
- class LibAgg(SetupPackage):
+         return ['numpy>=1.11']
 @@ -674,7 +673,7 @@ class FreeType(SetupPackage):
              if sys.platform == 'win32':
                  libfreetype = 'libfreetype.lib'