Merge pull request kivy#597 from kived/fix-mysqldb-patching

kived · kived · commit f740fbae010a · 2016-01-14T10:13:42.000-06:00
fix mysqldb patching
diff --git a/pythonforandroid/recipes/mysqldb/__init__.py b/pythonforandroid/recipes/mysqldb/__init__.py
@@ -15,6 +15,19 @@ class MysqldbRecipe(CompiledComponentsPythonRecipe):
 
 	# call_hostpython_via_targetpython = False
 
+	def convert_newlines(self, filename):
+		print('converting newlines in {}'.format(filename))
+		with open(filename, 'rb') as f:
+			data = f.read()
+		with open(filename, 'wb') as f:
+			f.write(data.replace(b'\r\n', b'\n').replace(b'\r', b'\n'))
+
+	def prebuild_arch(self, arch):
+		super(MysqldbRecipe, self).prebuild_arch(arch)
+		setupbase = join(self.get_build_dir(arch.arch), 'setup')
+		self.convert_newlines(setupbase + '.py')
+		self.convert_newlines(setupbase + '_posix.py')
+
 	def get_recipe_env(self, arch=None):
 		env = super(MysqldbRecipe, self).get_recipe_env(arch)
 
diff --git a/pythonforandroid/recipes/mysqldb/disable-zip.patch b/pythonforandroid/recipes/mysqldb/disable-zip.patch
@@ -1,5 +1,5 @@
 --- mysqldb/setup.py	2014-01-02 13:52:50.000000000 -0600
-+++ b/setup.py	2016-01-11 15:25:09.375114016 -0600
++++ b/setup.py	2016-01-13 15:48:36.781216443 -0600
 @@ -18,4 +18,5 @@
  metadata['ext_modules'] = [
      setuptools.Extension(sources=['_mysql.c'], **options)]
diff --git a/pythonforandroid/recipes/mysqldb/override-mysql-config.patch b/pythonforandroid/recipes/mysqldb/override-mysql-config.patch
@@ -1,5 +1,5 @@
 --- mysqldb/setup_posix.py	2014-01-02 13:52:50.000000000 -0600
-+++ b/setup_posix.py	2016-01-11 14:38:33.603528571 -0600
++++ b/setup_posix.py	2016-01-13 15:48:18.732883429 -0600
 @@ -13,17 +13,7 @@
      return "-%s" % f
  
