summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Rameau2009-09-01 14:18:19 +0200
committerQuentin Rameau2009-09-01 14:18:19 +0200
commitbb0b308b38e960738db6aeeebfa159dae9745e71 (patch)
treec162323b4d91c0d852f1c1dec68cf8a7bbefd36f
parent4dcff6714daf14c3538aa39e1458abec2ddd81ec (diff)
devel/python: added support for tk/tcl 8.6
-rw-r--r--devel/python/HISTORY5
-rwxr-xr-xdevel/python/PRE_BUILD3
-rw-r--r--devel/python/Python-2.6.2_tcl-tk-8.6.patch14
3 files changed, 22 insertions, 0 deletions
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index cf922375f2..c375778eb7 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,7 @@
+2009-09-01 Quentin Rameau <quinq@sourcemage.org>
+ * PRE_BUILD, Python-2.6.2_tcl-tk-8.6.patch: added,
+ make tk/tcl 8.6 detected by setup
+
2009-08-29 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Disable staging with castfs (Bug #15375)
@@ -266,3 +270,4 @@
2002-03-19 Julian v. Bock <julian@wongr.net>
* DETAILS: update version to 2.2.1c1.
+
diff --git a/devel/python/PRE_BUILD b/devel/python/PRE_BUILD
new file mode 100755
index 0000000000..02384f6ebf
--- /dev/null
+++ b/devel/python/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < ${SPELL_DIRECTORY}/Python-2.6.2_tcl-tk-8.6.patch
diff --git a/devel/python/Python-2.6.2_tcl-tk-8.6.patch b/devel/python/Python-2.6.2_tcl-tk-8.6.patch
new file mode 100644
index 0000000000..61429430d7
--- /dev/null
+++ b/devel/python/Python-2.6.2_tcl-tk-8.6.patch
@@ -0,0 +1,14 @@
+diff -Naur Python-2.6.2.orig/setup.py Python-2.6.2/setup.py
+--- Python-2.6.2.orig/setup.py 2009-03-31 20:20:48.000000000 +0200
++++ Python-2.6.2/setup.py 2009-09-01 04:15:59.928688429 +0200
+@@ -1541,8 +1541,8 @@
+ # 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',
+- '82', '8.1', '81', '8.0', '80']:
++ for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
++ '8.2', '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)
+ if tklib and tcllib: