diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-02-28 12:58:30 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-02-28 12:58:30 +0000 |
| commit | 451d60a2572fceff010ec887951c05548c7dcc1c (patch) | |
| tree | d5276568e132df52d4d96e61868717ac51f44841 /packages/python/python-2.5.2/fix-tkinter-detection.patch | |
| parent | 18a21d79505d162c24a404b865d03072430ec717 (diff) | |
| parent | f66378d955987691415e8f4786f87f92f5303241 (diff) | |
merge of '452ba8f483cc1f311d5139e2d406dd21e8edcce5'
and '524fc96258564567524a1295bfdf65c2a25da5d7'
Diffstat (limited to 'packages/python/python-2.5.2/fix-tkinter-detection.patch')
| -rw-r--r-- | packages/python/python-2.5.2/fix-tkinter-detection.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/packages/python/python-2.5.2/fix-tkinter-detection.patch b/packages/python/python-2.5.2/fix-tkinter-detection.patch new file mode 100644 index 0000000000..93bd343381 --- /dev/null +++ b/packages/python/python-2.5.2/fix-tkinter-detection.patch @@ -0,0 +1,41 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: Python-2.5.1/setup.py +=================================================================== +--- Python-2.5.1.orig/setup.py ++++ Python-2.5.1/setup.py +@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext): + dotversion = dotversion[:-1] + '.' + dotversion[-1] + tcl_include_sub = [] + tk_include_sub = [] +- for dir in inc_dirs: ++ for dir in [os.getenv("STAGING_INCDIR")]: + tcl_include_sub += [dir + os.sep + "tcl" + dotversion] + tk_include_sub += [dir + os.sep + "tk" + dotversion] + tk_include_sub += tcl_include_sub +@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs) |