sigrok-cross-android: Bump VER_SIGROK_FIRMWARE_FX2LAFW to 0.1.6.

[sigrok-util.git] / cross-compile / android / Python-3.3.3.patch

diff --git a/cross-compile/android/Python-3.3.3.patch b/cross-compile/android/Python-3.3.3.patch
index 7a71928c1b676b5f72ea53c75c857031e7d1ac41..70cb7355d42d9e8d8a33379efbcaed16e8cc0d63 100644 (file)
--- a/cross-compile/android/Python-3.3.3.patch
+++ b/cross-compile/android/Python-3.3.3.patch
@@ -188,3 +188,33 @@ index 832df53..c43e5e9 100644
      SETS(setIndex++, "");
  #else
      SETS(setIndex++, p->pw_gecos);
+--- a/Python/bltinmodule.c 2014-04-13 10:14:13.053260705 +0200
++++ b/Python/bltinmodule.c     2014-04-26 15:18:24.094444817 +0200
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_MBCS
+ const char *Py_FileSystemDefaultEncoding = "mbcs";
+ int Py_HasFileSystemDefaultEncoding = 1;
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__ANDROID__)
+ const char *Py_FileSystemDefaultEncoding = "utf-8";
+ int Py_HasFileSystemDefaultEncoding = 1;
+ #else
+--- a/Lib/locale.py 2014-04-26 14:35:53.243526608 +0200
++++ b/Lib/locale.py    2014-04-26 14:36:53.752085946 +0200
+@@ -46,6 +46,7 @@
+ try:
+ 
+     from _locale import *
++    raise ImportError("")
+ 
+ except ImportError:
+ 
+--- a/Misc/python.pc.in 2014-04-26 23:16:09.108514880 +0200
++++ b/Misc/python.pc.in        2014-04-26 23:24:48.845467012 +0200
+@@ -9,5 +9,5 @@
+ Requires: 
+ Version: @VERSION@
+ Libs.private: @LIBS@
+-Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
++Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ -lz
+ Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@