From 8e60ad8c6da6da9ca84c7c816f886e9a0d2033b1 Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Thu, 3 Apr 2014 22:35:35 +0900 Subject: [PATCH] Fix build of Tkinter with Tcl/Tk 8.6 (fixes #131) --- .../patches/2.6.6/Python-2.6.6/003_tk86.patch | 12 ++++++++++++ .../patches/2.6.7/Python-2.6.7/003_tk86.patch | 12 ++++++++++++ .../patches/2.6.8/Python-2.6.8/003_tk86.patch | 12 ++++++++++++ .../patches/2.6.9/Python-2.6.9/003_tk86.patch | 12 ++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 plugins/python-build/share/python-build/patches/2.6.6/Python-2.6.6/003_tk86.patch create mode 100644 plugins/python-build/share/python-build/patches/2.6.7/Python-2.6.7/003_tk86.patch create mode 100644 plugins/python-build/share/python-build/patches/2.6.8/Python-2.6.8/003_tk86.patch create mode 100644 plugins/python-build/share/python-build/patches/2.6.9/Python-2.6.9/003_tk86.patch diff --git a/plugins/python-build/share/python-build/patches/2.6.6/Python-2.6.6/003_tk86.patch b/plugins/python-build/share/python-build/patches/2.6.6/Python-2.6.6/003_tk86.patch new file mode 100644 index 00000000..71e20d56 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.6.6/Python-2.6.6/003_tk86.patch @@ -0,0 +1,12 @@ +diff -r -u ../Python-2.6.9.orig/setup.py ./setup.py +--- ../Python-2.6.9.orig/setup.py 2013-10-30 00:04:39.000000000 +0900 ++++ ./setup.py 2014-04-03 22:28:49.122061684 +0900 +@@ -1675,7 +1675,7 @@ + # The versions with dots are used on Unix, and the versions without + # dots on Windows, for detection by cygwin. + tcllib = tklib = tcl_includes = tk_includes = None +- for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2', ++ for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83', + '82', '8.1', '81', '8.0', '80']: + tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version) + tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version) diff --git a/plugins/python-build/share/python-build/patches/2.6.7/Python-2.6.7/003_tk86.patch b/plugins/python-build/share/python-build/patches/2.6.7/Python-2.6.7/003_tk86.patch new file mode 100644 index 00000000..71e20d56 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.6.7/Python-2.6.7/003_tk86.patch @@ -0,0 +1,12 @@ +diff -r -u ../Python-2.6.9.orig/setup.py ./setup.py +--- ../Python-2.6.9.orig/setup.py 2013-10-30 00:04:39.000000000 +0900 ++++ ./setup.py 2014-04-03 22:28:49.122061684 +0900 +@@ -1675,7 +1675,7 @@ + # The versions with dots are used on Unix, and the versions without + # dots on Windows, for detection by cygwin. + tcllib = tklib = tcl_includes = tk_includes = None +- for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2', ++ for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83', + '82', '8.1', '81', '8.0', '80']: + tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version) + tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version) diff --git a/plugins/python-build/share/python-build/patches/2.6.8/Python-2.6.8/003_tk86.patch b/plugins/python-build/share/python-build/patches/2.6.8/Python-2.6.8/003_tk86.patch new file mode 100644 index 00000000..71e20d56 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.6.8/Python-2.6.8/003_tk86.patch @@ -0,0 +1,12 @@ +diff -r -u ../Python-2.6.9.orig/setup.py ./setup.py +--- ../Python-2.6.9.orig/setup.py 2013-10-30 00:04:39.000000000 +0900 ++++ ./setup.py 2014-04-03 22:28:49.122061684 +0900 +@@ -1675,7 +1675,7 @@ + # The versions with dots are used on Unix, and the versions without + # dots on Windows, for detection by cygwin. + tcllib = tklib = tcl_includes = tk_includes = None +- for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2', ++ for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83', + '82', '8.1', '81', '8.0', '80']: + tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version) + tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version) diff --git a/plugins/python-build/share/python-build/patches/2.6.9/Python-2.6.9/003_tk86.patch b/plugins/python-build/share/python-build/patches/2.6.9/Python-2.6.9/003_tk86.patch new file mode 100644 index 00000000..71e20d56 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.6.9/Python-2.6.9/003_tk86.patch @@ -0,0 +1,12 @@ +diff -r -u ../Python-2.6.9.orig/setup.py ./setup.py +--- ../Python-2.6.9.orig/setup.py 2013-10-30 00:04:39.000000000 +0900 ++++ ./setup.py 2014-04-03 22:28:49.122061684 +0900 +@@ -1675,7 +1675,7 @@ + # The versions with dots are used on Unix, and the versions without + # dots on Windows, for detection by cygwin. + tcllib = tklib = tcl_includes = tk_includes = None +- for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2', ++ for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83', + '82', '8.1', '81', '8.0', '80']: + tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version) + tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)