org.handhelds.familiar/packages/python/python-2.4.2/fix-tkinter-detection.patch

   1
   2 #
   3 # Patch managed by http://www.holgerschurig.de/patcher.html
   4 #
   5
   6 --- Python-2.4.1/setup.py~fix-tkinter-detection
   7 +++ Python-2.4.1/setup.py
   8 @@ -999,7 +999,7 @@
   9                  dotversion = dotversion[:-1] + '.' + dotversion[-1]
  10              tcl_include_sub = []
  11              tk_include_sub = []
  12 -            for dir in inc_dirs:
  13 +            for dir in [os.getenv("STAGING_INCDIR")]:
  14                  tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
  15                  tk_include_sub += [dir + os.sep + "tk" + dotversion]
  16              tk_include_sub += tcl_include_sub
  17 @@ -1018,22 +1018,6 @@
  18              if dir not in include_dirs:
  19                  include_dirs.append(dir)
  20
  21 -        # Check for various platform-specific directories
  22 -        if platform == 'sunos5':
  23 -            include_dirs.append('/usr/openwin/include')
  24 -            added_lib_dirs.append('/usr/openwin/lib')
  25 -        elif os.path.exists('/usr/X11R6/include'):
  26 -            include_dirs.append('/usr/X11R6/include')
  27 -            added_lib_dirs.append('/usr/X11R6/lib64')
  28 -            added_lib_dirs.append('/usr/X11R6/lib')
  29 -        elif os.path.exists('/usr/X11R5/include'):
  30 -            include_dirs.append('/usr/X11R5/include')
  31 -            added_lib_dirs.append('/usr/X11R5/lib')
  32 -        else:
  33 -            # Assume default location for X11
  34 -            include_dirs.append('/usr/X11/include')
  35 -            added_lib_dirs.append('/usr/X11/lib')
  36 -
  37          # If Cygwin, then verify that X is installed before proceeding
  38          if platform == 'cygwin':
  39              x11_inc = find_file('X11/Xlib.h', [], include_dirs)