diff options
| author | Sergey Lapin <slapinid@gmail.com> | 2008-03-03 11:19:39 +0000 |
|---|---|---|
| committer | Sergey Lapin <slapinid@gmail.com> | 2008-03-03 11:19:39 +0000 |
| commit | 07c0de10dddece15b5a88e76ec94a9abc985b9cd (patch) | |
| tree | 340de59696786aaa35070e7615700bf0bb491833 /packages/python/python-2.5.1/fix-tkinter-detection.patch | |
| parent | fd03b5166557844135feef144c2d78470f71f7e6 (diff) | |
| parent | 34c6339ee471446c0231675f9fc83d4a419d53c3 (diff) | |
merge of '6bfc098b36170550230dc57120c75b31480dc6b3'
and 'abcca41fb7edac5318b0cb0266d5f0c167f87c2f'
Diffstat (limited to 'packages/python/python-2.5.1/fix-tkinter-detection.patch')
| -rw-r--r-- | packages/python/python-2.5.1/fix-tkinter-detection.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/packages/python/python-2.5.1/fix-tkinter-detection.patch b/packages/python/python-2.5.1/fix-tkinter-detection.patch deleted file mode 100644 index 93bd343381..0000000000 --- a/packages/python/python-2.5.1/fix-tkinter-detection.patch +++ /dev/null @@ -1,41 +0,0 @@ - -# -# 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) |