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-104-optional-tk.patch | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'package/python/python-104-optional-tk.patch') diff --git a/package/python/python-104-optional-tk.patch b/package/python/python-104-optional-tk.patch index 3e0dd16002..2e469ab481 100644 --- a/package/python/python-104-optional-tk.patch +++ b/package/python/python-104-optional-tk.patch @@ -12,28 +12,26 @@ Index: b/Makefile.pre.in =================================================================== --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -934,8 +934,7 @@ +@@ -928,7 +928,7 @@ plat-mac/lib-scriptpackages/SystemEvents \ plat-mac/lib-scriptpackages/Terminal PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages --LIBSUBDIRS= lib-tk \ -- site-packages \ +-LIBSUBDIRS= lib-tk site-packages \ +LIBSUBDIRS= site-packages \ encodings compiler hotshot \ email email/mime \ json \ -@@ -947,9 +946,7 @@ +@@ -941,8 +941,7 @@ lib-old \ curses $(MACHDEPS) -TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ -- lib-tk/test/test_ttk \ -- test test/audiodata test/data \ +- lib-tk/test/test_ttk test test/audiodata test/data \ +TESTSUBDIRS = test test/audiodata test/data \ - test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \ - test/tracedmodules \ - email/test email/test/data \ -@@ -980,6 +977,12 @@ + test/cjkencodings test/decimaltestdata test/xmltestdata \ + test/imghdrdata \ + test/subprocessdata \ +@@ -976,6 +975,12 @@ TESTSUBDIRS += sqlite3/test endif @@ -50,7 +48,7 @@ Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac -@@ -2622,6 +2622,15 @@ +@@ -2620,6 +2620,15 @@ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi -- cgit v1.2.3