Merge remote-tracking branch 'upstream/develop' into enable_androidx

Author: RobertFlatt

pythonforandroid/bootstraps/common/build/jni/application/src/start.c

@@ -229,9 +229,9 @@ int main(int argc, char *argv[]) {
       "        self.__buffer = ''\n"
       "    def write(self, s):\n"
       "        s = self.__buffer + s\n"
-      "        lines = s.split(\"\\n\")\n"
+      "        lines = s.split('\\n')\n"
       "        for l in lines[:-1]:\n"
-      "            androidembed.log(l)\n"
+      "            androidembed.log(l.replace('\\x00', ''))\n"
       "        self.__buffer = lines[-1]\n"
       "    def flush(self):\n"
       "        return\n"

pythonforandroid/recipe.py

@@ -9,6 +9,7 @@
 import sh
 import shutil
 import fnmatch
+import urllib.request
 from urllib.request import urlretrieve
 from os import listdir, unlink, environ, mkdir, curdir, walk
 from sys import stdout
@@ -23,6 +24,11 @@
 from pythonforandroid.util import load_source as import_recipe
 
 
+url_opener = urllib.request.build_opener()
+url_orig_headers = url_opener.addheaders
+urllib.request.install_opener(url_opener)
+
+
 class RecipeMeta(type):
     def __new__(cls, name, bases, dct):
         if name != 'Recipe':
@@ -206,6 +212,8 @@ def report_hook(index, blksize, size):
             seconds = 1
             while True:
                 try:
+                    # jqueryui.com returns a 403 w/ the default user agent
+                    url_opener.addheaders = [('User-agent', 'Mozilla/5.0')]
                     urlretrieve(url, target, report_hook)
                 except OSError as e:
                     attempts += 1
@@ -215,6 +223,8 @@ def report_hook(index, blksize, size):
                     time.sleep(seconds)
                     seconds *= 2
                     continue
+                finally:
+                    url_opener.addheaders = url_orig_headers
                 break
             return target
         elif parsed_url.scheme in ('git', 'git+file', 'git+ssh', 'git+http', 'git+https'):

pythonforandroid/recipes/groestlcoin_hash/__init__.py

@@ -4,7 +4,7 @@
 class GroestlcoinHashRecipe(CythonRecipe):
     version = '1.0.1'
     url = 'https://github.com/Groestlcoin/groestlcoin-hash-python/archive/{version}.tar.gz'
-    depends = []
+    depends = ['setuptools']
     cythonize = False
 
 

pythonforandroid/recipes/sdl2_ttf/__init__.py

@@ -2,7 +2,7 @@
 
 
 class LibSDL2TTF(BootstrapNDKRecipe):
-    version = '2.0.14'
+    version = '2.0.15'
     url = 'https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-{version}.tar.gz'
     dir_name = 'SDL2_ttf'
 

setup.py

@@ -11,7 +11,8 @@
 packages = find_packages()
 
 package_data = {'': ['*.tmpl',
-                     '*.patch', ], }
+                     '*.patch',
+                     '*.diff', ], }
 
 data_files = []