Fix matplotlib and update to v3.1.3

pythonforandroid/recipes/matplotlib/__init__.py

@@ -1,26 +1,94 @@
 
+from pythonforandroid.logger import info_notify
 from pythonforandroid.recipe import CppCompiledComponentsPythonRecipe
+from pythonforandroid.util import ensure_dir
 
 from os.path import join
 
 
 class MatplotlibRecipe(CppCompiledComponentsPythonRecipe):
 
-    version = '3.0.3'
+    version = '3.1.3'
     url = 'https://github.com/matplotlib/matplotlib/archive/v{version}.zip'
 
     depends = ['numpy', 'png', 'setuptools', 'freetype', 'kiwisolver']
+    conflicts = ['python2']
 
     python_depends = ['pyparsing', 'cycler', 'python-dateutil']
 
     # We need to patch to:
-    # - make mpl build against the same numpy version as the numpy recipe
-    #   (this could be done better by setting the target version dynamically)
-    # - prevent mpl trying to build TkAgg, which wouldn't work on Android anyway but has build issues
+    # - make mpl install work without importing numpy
+    # - make mpl use shared libraries for freetype and png
+    # - make mpl link to png16, to match p4a library name for png
+    # - prevent mpl trying to build TkAgg, which wouldn't work
+    #   on Android anyway but has build issues
     patches = ['mpl_android_fixes.patch']
 
     call_hostpython_via_targetpython = False
 
+    def generate_libraries_pc_files(self, arch):
+        """
+        Create *.pc files for libraries that `matplotib` depends on.
+
+        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 even install the libraries...so we must trick a little
+        the mlp install).
+        """
+        pkg_config_path = self.get_recipe_env(arch)['PKG_CONFIG_PATH']
+        ensure_dir(pkg_config_path)
+
+        lib_to_pc_file = {
+            # `pkg-config` search for version freetype2.pc, our current
+            # version for freetype, but we have our recipe named without
+            # the version...so we add it in here for our pc file
+            'freetype': 'freetype2.pc',
+            'png': 'png.pc',
+        }
+
+        for lib_name in {'freetype', 'png'}:
+            pc_template_file = join(
+                self.get_recipe_dir(),
+                f'lib{lib_name}.pc.template'
+            )
+            # read template file into buffer
+            with open(pc_template_file) as template_file:
+                text_buffer = template_file.read()
+            # set the library absolute path
+            text_buffer = text_buffer.replace(
+                'path_to_built',
+                self.get_recipe(lib_name, self.ctx).get_build_dir(arch.arch),
+            )
+            # write the library pc file into our defined dir `PKG_CONFIG_PATH`
+            pc_dest_file = join(pkg_config_path, lib_to_pc_file[lib_name])
+            with open(pc_dest_file, 'w') as pc_file:
+                pc_file.write(text_buffer)
+
+    def download_web_backend_dependencies(self, arch):
+        """
+        During building, host needs to download the jquery-ui package (in order
+        to make it work the mpl web backend). This operation seems to fail
+        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).
+        """
+
+        env = self.get_recipe_env(arch)
+
+        info_notify('Downloading jquery-ui for matplatlib web backend')
+        # We use the same jquery-ui version than mpl's setup.py script,
+        # inside function `_download_jquery_to`
+        jquery_sha = (
+            'f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d'
+        )
+        url = f'https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip'
+        target_file = join(env['XDG_CACHE_HOME'], 'matplotlib', jquery_sha)
+
+        info_notify(f'Will download into {env["XDG_CACHE_HOME"]}')
+        ensure_dir(join(env['XDG_CACHE_HOME'], 'matplotlib'))
+        self.download_file(url, target_file)
+
     def prebuild_arch(self, arch):
         with open(join(self.get_recipe_dir(), 'setup.cfg.template')) as fileh:
             setup_cfg = fileh.read()
@@ -29,5 +97,64 @@ def prebuild_arch(self, arch):
             fileh.write(setup_cfg.format(
                 ndk_sysroot_usr=join(self.ctx.ndk_dir, 'sysroot', 'usr')))
 
+        self.generate_libraries_pc_files(arch)
+        self.download_web_backend_dependencies(arch)
+
+    def get_recipe_env(self, arch=None, with_flags_in_cc=True):
+        env = super().get_recipe_env(arch, with_flags_in_cc)
+        if self.need_stl_shared:
+            # matplotlib compile flags does not honor the standard flags:
+            # `CPPFLAGS` and `LDLIBS`, so we put in `CFLAGS` and `LDFLAGS` to
+            # correctly link with the `c++_shared` library
+            env['CFLAGS'] += ' -I{}'.format(self.stl_include_dir)
+            env['CFLAGS'] += ' -frtti -fexceptions'
+
+            env['LDFLAGS'] += ' -L{}'.format(self.get_stl_lib_dir(arch))
+            env['LDFLAGS'] += ' -l{}'.format(self.stl_lib_name)
+
+        # we modify `XDG_CACHE_HOME` to download `jquery-ui` into that folder,
+        # or mpl install will fail when trying to download/install it, but if
+        # we have the proper package already downloaded, it will use the cached
+        # package to successfully finish the installation.
+        # Note: this may not be necessary for some local systems, but it is
+        #       for our CI providers: `gh-actions` and travis, which will
+        #       fail trying to download the `jquery-ui` package
+        env['XDG_CACHE_HOME'] = join(self.get_build_dir(arch), 'p4a_files')
+        # we make use of the same directory than `XDG_CACHE_HOME`, for our
+        # custom library pc files, so we have all the install files that we
+        # generate at the same place
+        env['PKG_CONFIG_PATH'] = env['XDG_CACHE_HOME']
+
+        # We set a new environ variable `NUMPY_INCLUDES` to be able to tell
+        # the matplotlib script where to find our numpy without importing it
+        # (which will fail, because numpy isn't installed in our hostpython)
+        env['NUMPY_INCLUDES'] = join(
+            self.ctx.get_site_packages_dir(),
+            'numpy', 'core', 'include',
+        )
+
+        # creating proper *.pc files for our libraries does not seem enough to
+        # success with our build (without depending on system development
+        # libraries), but if we tell the compiler where to find our libraries
+        # and includes, then the install success :)
+        png = self.get_recipe('png', self.ctx)
+        env['CFLAGS'] += f' -I{png.get_build_dir(arch)}'
+        env['LDFLAGS'] += f' -L{join(png.get_build_dir(arch.arch), ".libs")}'
+
+        freetype = self.get_recipe('freetype', self.ctx)
+        free_lib_dir = join(freetype.get_build_dir(arch.arch), 'objs', '.libs')
+        free_inc_dir = join(freetype.get_build_dir(arch.arch), 'include')
+        env['CFLAGS'] += f' -I{free_inc_dir}'
+        env['LDFLAGS'] += f' -L{free_lib_dir}'
+
+        # `freetype` could be built with `harfbuzz` support,
+        # so we also include the necessary flags...just to be sure
+        if 'harfbuzz' in self.ctx.recipe_build_order:
+            harfbuzz = self.get_recipe('harfbuzz', self.ctx)
+            harf_build = harfbuzz.get_build_dir(arch.arch)
+            env['CFLAGS'] += f' -I{harf_build} -I{join(harf_build, "src")}'
+            env['LDFLAGS'] += f' -L{join(harf_build, "src", ".libs")}'
+        return env
+
 
 recipe = MatplotlibRecipe()

pythonforandroid/recipes/matplotlib/libfreetype.pc.template

@@ -0,0 +1,10 @@
+prefix=path_to_built
+exec_prefix=${prefix}
+includedir=${prefix}/include
+libdir=${exec_prefix}/objs/.libs
+
+Name: freetype2
+Description: The freetype2 library
+Version: 2.5.5
+Cflags: -I${includedir}
+Libs: -L${libdir} -lfreetype

pythonforandroid/recipes/matplotlib/libpng.pc.template

@@ -0,0 +1,10 @@
+prefix=path_to_built
+exec_prefix=${prefix}
+includedir=${prefix}
+libdir=${exec_prefix}/.libs
+
+Name: libpng
+Description: The png library
+Version: 1.6.37
+Cflags: -I${includedir}
+Libs: -L${libdir} -lpng16

pythonforandroid/recipes/matplotlib/mpl_android_fixes.patch

@@ -1,29 +1,64 @@
-diff --git a/setupext.py b/setupext.py
-index fc82d5d..2067db0 100644
---- a/setupext.py
-+++ b/setupext.py
-@@ -1004,10 +1004,10 @@ class Numpy(SetupPackage):
-         ext.define_macros.append(('__STDC_FORMAT_MACROS', 1))
-
+--- 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
+@@ -604,8 +604,7 @@ class Numpy(SetupPackage):
+     name = "numpy"
+
+     def add_flags(self, ext):
+-        import numpy as np
+-        ext.include_dirs.append(np.get_include())
++        ext.include_dirs.append(os.environ['NUMPY_INCLUDES'])
+         ext.define_macros.extend([
+             # Ensure that PY_ARRAY_UNIQUE_SYMBOL is uniquely defined for each
+             # extension.
+@@ -617,10 +616,10 @@ class Numpy(SetupPackage):
+         ])
+
      def get_setup_requires(self):
--        return ['numpy>=1.10.0']
-+        return ['numpy==1.16.4']  # to match p4a's target version
-
+-        return ['numpy>=1.11']
++        return []  # don't need it for p4a, due to above changes
+ 
      def get_install_requires(self):
--        return ['numpy>=1.10.0']
+-        return ['numpy>=1.11']
 +        return ['numpy==1.16.4']  # to match p4a's target version
-
-
+ 
+ 
  class LibAgg(SetupPackage):
-@@ -1443,9 +1443,10 @@ class BackendAgg(OptionalBackendPackage):
-
+@@ -674,7 +673,7 @@ class FreeType(SetupPackage):
+             if sys.platform == 'win32':
+                 libfreetype = 'libfreetype.lib'
+             else:
+-                libfreetype = 'libfreetype.a'
++                libfreetype = 'libfreetype.so'
+             ext.extra_objects.insert(
+                 0, os.path.join(src_path, 'objs', '.libs', libfreetype))
+             ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
+@@ -701,7 +700,7 @@ class FreeType(SetupPackage):
+         if sys.platform == 'win32':
+             libfreetype = 'libfreetype.lib'
+         else:
+-            libfreetype = 'libfreetype.a'
++            libfreetype = 'libfreetype.so'
+
+         # bailing because it is already built
+         if os.path.isfile(os.path.join(
+@@ -830,7 +829,7 @@ class Png(SetupPackage):
+             ext, 'libpng',
+             atleast_version='1.2',
+             alt_exec=['libpng-config', '--ldflags'],
+-            default_libraries=['png', 'z'])
++            default_libraries=['png16', 'z'])  # adapted to p4a's png library
+         Numpy().add_flags(ext)
+         return ext
+
+@@ -957,9 +956,10 @@ class BackendAgg(OptionalBackendPackage)
+
  class BackendTkAgg(OptionalBackendPackage):
      name = "tkagg"
 -    force = True
 +    force = False
-
+ 
      def check(self):
 +        raise CheckFailed("Disabled by patching during Android build")  # tk doesn't work on Android but causes build problems
-         return "installing; run-time loading from Python Tcl / Tk"
-
+         return "installing; run-time loading from Python Tcl/Tk"
+ 
      def get_extension(self):