From 4d9ae3daf608f1a1ee4afe8e69043b5a06443a37 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 28 Jun 2014 23:52:21 +0200 Subject: python: bump to Python 2.7.7 Status of patches: - python-013-fix-readline-6.3.patch is removed, as it was a backport from an upstream fix. - all other patches are updated, with no special changes other than solving minor conflicts. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/python/python-106-optional-expat.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'package/python/python-106-optional-expat.patch') diff --git a/package/python/python-106-optional-expat.patch b/package/python/python-106-optional-expat.patch index 9eee2cd97..c1de887f7 100644 --- a/package/python/python-106-optional-expat.patch +++ b/package/python/python-106-optional-expat.patch @@ -19,16 +19,16 @@ Index: b/Makefile.pre.in =================================================================== --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -940,7 +940,7 @@ - json \ +@@ -935,7 +935,7 @@ logging bsddb csv importlib wsgiref \ - ctypes ctypes/macholib idlelib idlelib/Icons \ + ctypes ctypes/macholib \ + idlelib idlelib/Icons \ - distutils distutils/command $(XMLLIBSUBDIRS) \ + distutils distutils/command \ multiprocessing multiprocessing/dummy \ unittest \ lib-old \ -@@ -987,6 +987,10 @@ +@@ -985,6 +985,10 @@ LIBSUBDIRS += curses endif @@ -43,7 +43,7 @@ Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac -@@ -2278,13 +2278,21 @@ +@@ -2276,13 +2276,21 @@ AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -74,7 +74,7 @@ Index: b/setup.py =================================================================== --- a/setup.py +++ b/setup.py -@@ -1457,7 +1457,7 @@ +@@ -1469,7 +1469,7 @@ # # More information on Expat can be found at www.libexpat.org. # -- cgit v1.2.3