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

Author: opacam

ci/constants.py

@@ -54,7 +54,6 @@ class TargetPython(Enum):
     'websocket-client',
     'zeroconf',
     'zope',
-    'matplotlib',  # https://github.com/kivy/python-for-android/issues/1900
 ])
 BROKEN_RECIPES_PYTHON3 = set([
     'brokenrecipe',

pythonforandroid/recipes/matplotlib/__init__.py

@@ -54,11 +54,15 @@ def generate_libraries_pc_files(self, arch):
             # read template file into buffer
             with open(pc_template_file) as template_file:
                 text_buffer = template_file.read()
-            # set the library absolute path
+            # set the library absolute path and library version
+            lib_recipe = self.get_recipe(lib_name, self.ctx)
             text_buffer = text_buffer.replace(
-                'path_to_built',
-                self.get_recipe(lib_name, self.ctx).get_build_dir(arch.arch),
+                'path_to_built', lib_recipe.get_build_dir(arch.arch),
             )
+            text_buffer = text_buffer.replace(
+                'library_version', lib_recipe.version,
+            )
+
             # 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:

pythonforandroid/recipes/matplotlib/libfreetype.pc.template

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/objs/.libs
 
 Name: freetype2
 Description: The freetype2 library
-Version: 2.5.5
+Version: library_version
 Cflags: -I${includedir}
 Libs: -L${libdir} -lfreetype

pythonforandroid/recipes/matplotlib/libpng.pc.template

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/.libs
 
 Name: libpng
 Description: The png library
-Version: 1.6.37
+Version: library_version
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpng16

pythonforandroid/recipes/png/__init__.py

@@ -7,8 +7,8 @@
 
 class PngRecipe(Recipe):
     name = 'png'
-    version = 'v1.6.37'
-    url = 'https://github.com/glennrp/libpng/archive/{version}.zip'
+    version = '1.6.37'
+    url = 'https://github.com/glennrp/libpng/archive/v{version}.zip'
     built_libraries = {'libpng16.so': '.libs'}
 
     def build_arch(self, arch):