#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- Python-2.4.1/setup.py~fix-tkinter-detection
+++ Python-2.4.1/setup.py
@@ -999,7 +999,7 @@
                 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
@@ -1018,22 +1018,6 @@
             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)
/python-2.4.4?h=rm&amp;id=a22f97e5c43501ceed138b3187c94db5760a3f96'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/python/python-2.4.4?h=rm&amp;id=a22f97e5c43501ceed138b3187c94db5760a3f96'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/python/python-2.4.4?h=rm&amp;id=a22f97e5c43501ceed138b3187c94db5760a3f96'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/python/python-2.4.4'>
<input type='hidden' name='h' value='rm'/><input type='hidden' name='id' value='a22f97e5c43501ceed138b3187c94db5760a3f96'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/multitech-oe.git/log/?h=rm&amp;id=a22f97e5c43501ceed138b3187c94db5760a3f96'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?h=rm&amp;id=a22f97e5c43501ceed138b3187c94db5760a3f96'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/python?h=rm&amp;id=a22f97e5c43501ceed138b3187c94db5760a3f96'>python</a>/<a href='/cgit/multitech-oe.git/log/packages/python/python-2.4.4?h=rm&amp;id=a22f97e5c43501ceed138b3187c94db5760a3f96'>python-2.4.4</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/cgit/multitech-oe.git/log/packages/python/python-2.4.4?h=rm&amp;id=a22f97e5c43501ceed138b3187c94db5760a3f96&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
<tr><td><span title='2006-12-25 00:13:17 +0000'>2006-12-25</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/python/python-2.4.4?h=rm&amp;id=5867a6e1cef42d662a79bf96f1412342a1608b3f'>python: update to 2.4.4</a></td><td>Michael Lauer</td><td>6</td></tr>
=f907777709b20d8d73e3587026296a6616262229'>remove extra whitespace at end-of-line in about 900 bb files.</a></td><td>Rolf Leggewie</td><td>1</td></tr>
sky</td><td>1</td></tr>
<tr><td><span title='2007-07-04 23:51:53 +0000'>2007-07-04</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=74483949144780cf56a850628b6405520911c204'>udev: Stop questionable device-specific hacks from contaminating PACKAGE_ARCH.</a></td><td>Paul Sokolovsky</td><td>4</td></tr>
<tr><td><span title='2007-06-30 01:08:18 +0000'>2007-06-30</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=a094b031e47ff43bbddab0c7e54681f0102febcd'>udev 092, 097, 100: Stop booting semi-configured system in case of random min...</a></td><td>Paul Sokolovsky</td><td>3</td></tr>
<tr><td><span title='2007-06-30 01:01:24 +0000'>2007-06-30</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=59ccb6c5a398e38530a3b84f0f82f82c5c77c1b6'>udev: Stop booting semi-configured system in case of random miniscule errors.</a></td><td>Paul Sokolovsky</td><td>4</td></tr>
<tr><td><span title='2007-06-18 01:30:35 +0000'>2007-06-18</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=757a2844d6d1a555713785e7178be6d7cfc16f82'>udev: Cut down default /dev tmpfs size from 10Mb to 2Mb, to preclude DoS.</a></td><td>Paul Sokolovsky</td><td>1</td></tr>
<tr><td><span title='2007-06-18 01:28:43 +0000'>2007-06-18</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=df5e6aef5a144a42bd9d42d514ed8d518671ea4d'>udev: Cut down default /dev tmpfs size from 10Mb to 2Mb, to preclude DoS.</a></td><td>Paul Sokolovsky</td><td>6</td></tr>
<tr><td><span title='2007-06-14 15:35:47 +0000'>2007-06-14</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=4370c214334ef399b8b6b0204a7ea63366df4855'>udev: disable parallel compilation</a></td><td>Rolf Leggewie</td><td>1</td></tr>
<tr><td><span title='2007-06-12 13:20:49 +0000'>2007-06-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=eb2affaeeed8c2c6c407bf2181b1d873f9c7e1e8'>udev: make only udev RPROVIDE hotplug not all packages (from Poky)</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2007-02-21 21:27:41 +0000'>2007-02-21</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=56b783548b3573459c4fddb695699eab0ecb4230'>udev: Fixup slight mistake in previous commit, bump PR</a></td><td>Oyvind Repvik</td><td>3</td></tr>
<tr><td><span title='2007-02-21 20:44:06 +0000'>2007-02-21</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=d46c1b4af2eb876e742c70e520612629745edb09'>udev: Fixup etc-&gt;sysconfdir, make sure sysconfdir/udev exists before writing ...</a></td><td>Oyvind Repvik</td><td>3</td></tr>
<tr><td><span title='2006-12-31 13:13:53 +0000'>2006-12-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=f907777709b20d8d73e3587026296a6616262229'>remove extra whitespace at end-of-line in about 900 bb files.</a></td><td>Rolf Leggewie</td><td>3</td></tr>
<tr><td><span title='2006-12-28 16:58:05 +0000'>2006-12-28</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=b9801e4001adb190aaa618feffc3db3d16d3786d'>udev: Update touchscreen rule so it doesn't require the touchscreen to have E...</a></td><td>Richard Purdie</td><td>6</td></tr>
<tr><td><span title='2006-12-12 14:45:04 +0000'>2006-12-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=288adb52fd3f802deafa9b19257b3eff610f97b2'>many files: KERNELORG_MIRROR variable created</a></td><td>Marcin Juszkiewicz</td><td>3</td></tr>
<tr><td><span title='2006-11-28 15:14:48 +0000'>2006-11-28</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=85fd8977a23877d01352fdbd87998a36a0bbe0ff'>udev: merge stuff from 097 and 100 into udev.inc, add do_stage from poky, bum...</a></td><td>Koen Kooi</td><td>4</td></tr>
<tr><td><span title='2006-11-07 12:02:31 +0000'>2006-11-07</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=3b7d18f95dbaaca9faa1ffcc9a780431e7351902'>udev: Auto-add the rootfs partition to mount.blacklist via postinst to work a...</a></td><td>Matthias Hentges</td><td>4</td></tr>
<tr><td><span title='2006-10-31 15:54:33 +0000'>2006-10-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=191f6ccfc8a95aae3cddf729ba27175e6e1fcda4'>udev: fix udev rule for SAMSUNG UARTS (stupid missing ',' in rule!)</a></td><td>Michael Lauer</td><td>18</td></tr>
<tr><td><span title='2006-10-04 11:26:37 +0000'>2006-10-04</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=3d6263156a06c413e095418e7eea2da9e4d0dfd7'>udev-092/udev.rules udev-097/udev.rules udev-100/udev.rules : Add rule</a></td><td>Graeme Gregory</td><td>3</td></tr>
<tr><td><span title='2006-09-28 16:15:16 +0000'>2006-09-28</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=07d63ec4d25f444630a2077e805df488b0d58772'>udev: Enable udev-100 on SlugOS</a></td><td>Michael-Luke Jones</td><td>1</td></tr>
<tr><td><span title='2006-09-14 07:26:54 +0000'>2006-09-14</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=921a474d7d169f52bba67e90b573519bd8f3aeca'>udev: remove needless machine specifications</a></td><td>Philipp Zabel</td><td>13</td></tr>
<tr><td><span title='2006-09-12 19:54:28 +0000'>2006-09-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=c5e25db9e76a5c8a2964dac494f1e4ebd08a14e7'>udev-097,100: firmware_helper is now firmware.sh - fix udev.rules</a></td><td>Philipp Zabel</td><td>4</td></tr>
<tr><td><span title='2006-09-08 11:21:15 +0000'>2006-09-08</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=eb79f18a31b65ba137cfaeb7e121e134b2b20d87'>udev: add 0.100, default preference = -1</a></td><td>Koen Kooi</td><td>8</td></tr>
<tr><td><span title='2006-08-25 09:50:42 +0000'>2006-08-25</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=ca0e6432e64cada147f6131b91ad3da555c10364'>udev-097: drop the MAKEDEV link from links.conf, it is created in the init sc...</a></td><td>Philipp Zabel</td><td>2</td></tr>
<tr><td><span title='2006-08-22 08:58:18 +0000'>2006-08-22</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=9534a5ea1e01133ed20093a8b3f24ddd071d9070'>udev: add description for libvolume_id</a></td><td>Philipp Zabel</td><td>1</td></tr>
<tr><td><span title='2006-08-22 08:53:25 +0000'>2006-08-22</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=a15a508dcbdb819b5d87d837956eed6d75003eb9'>udev: stop overwriting description in udev.inc</a></td><td>Philipp Zabel</td><td>2</td></tr>
<tr><td><span title='2006-08-22 08:48:46 +0000'>2006-08-22</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=c0afd4cb563555e06843c196c8af83ad9df1b394'>udev: add 097</a></td><td>Philipp Zabel</td><td>8</td></tr>
<tr><td><span title='2006-08-15 19:30:15 +0000'>2006-08-15</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=5f17a1f49a5965bf1667499b081544894d36cf1e'>udev: Prune old obsolete broken versions (058, 063, 065, 070, 071).</a></td><td>Richard Purdie</td><td>23</td></tr>
<tr><td><span title='2006-08-15 19:28:54 +0000'>2006-08-15</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=7d5fdf15cfcf298a8da8d3525f7ff36537fff81c'>udev: Fix packaging after -dbg changes (udev-utils wasn't populated)</a></td><td>Richard Purdie</td><td>4</td></tr>
<tr><td><span title='2006-08-12 18:15:48 +0000'>2006-08-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=7a592f4f620236b2af25aed10b637e09dd4431f0'>udev: add mount.blacklist for h2200 and ipaq-pxa270</a></td><td>Koen Kooi</td><td>4</td></tr>
<tr><td><span title='2006-08-12 10:56:38 +0000'>2006-08-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=04fd73a240684af6964babf60e081b5f426b702e'>udev 092: fix hostap on h2200, courtesy Joshua Layne  </a></td><td>Koen Kooi</td><td>2</td></tr>
<tr><td><span title='2006-08-11 10:12:19 +0000'>2006-08-11</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=5cff290e2471de9e39f6a7ff997fc47a16415ac4'>udev 092: Update for keeping the debug information in the correct package</a></td><td>Jamie Lenehan</td><td>2</td></tr>
<tr><td><span title='2006-08-11 07:04:53 +0000'>2006-08-11</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=8099caf59b566208b0516b82e0be2d0abc960656'>udev 092: Remove the spurious debug info from the packages. Closes #1241</a></td><td>Jamie Lenehan</td><td>2</td></tr>
<tr><td><span title='2006-08-05 15:55:25 +0000'>2006-08-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=042fb6d5f34d3a35d0d0a900ec9e9b0edc3ddd1e'>merge of '61c6cd8658c99e2416e242b79cdff01967f01c94'</a></td><td>Holger Freyther</td><td>2</td></tr>
<tr><td><span title='2006-08-05 14:21:09 +0000'>2006-08-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=652b3d38e56d6b52e923e73a1ed4228072696874'>udev 092: remove BTNTOUCH for touchscreen rules to fix it for ipaqs</a></td><td>Koen Kooi</td><td>2</td></tr>
<tr><td><span title='2006-08-05 14:01:52 +0000'>2006-08-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=803427eedbf62d58bd250d577f2c0afb5b68383d'>packages: sed -i s/^"include "/"require "/ */*.bb GNU sed rocks!</a></td><td>Holger Freyther</td><td>8</td></tr>
<tr><td><span title='2006-07-26 21:51:38 +0000'>2006-07-26</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=5774b8e796732a7c475efa1b91f0a25c1416cf7e'>udev 092: Fix ARM inotify syscall</a></td><td>Richard Purdie</td><td>2</td></tr>
<tr><td><span title='2006-07-24 16:23:08 +0000'>2006-07-24</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=9a5e17007ad87d71e1018775dc36ce60448eb6c1'>udev - /proc/sys/kernel/hotplug hasmoved to /sys/kernel/uevent_helper in 2.6.16.</a></td><td>Raymond Danks</td><td>6</td></tr>
<tr><td><span title='2006-06-13 20:20:06 +0000'>2006-06-13</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=57ad8dc08734e9ecb1026af0a712efabea4f611a'>udev 092: Add missing file. Third time lucky...</a></td><td>Richard Purdie</td><td>2</td></tr>
<tr><td><span title='2006-06-13 20:08:24 +0000'>2006-06-13</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=9008ba0b855e7ee542b4046035021571cb46a529'>udev 092: Fix a typo</a></td><td>Richard Purdie</td><td>2</td></tr>
<tr><td><span title='2006-06-13 18:25:24 +0000'>2006-06-13</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=36ef5a800d97f16721f418d5be5f529a59f301c3'>udev: Add 092. Included is a custom rule which adds a symlink to the touchscr...</a></td><td>Richard Purdie</td><td>6</td></tr>
<tr><td><span title='2006-05-31 10:06:40 +0000'>2006-05-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=a6e39080788cf30c6d71977fae4ca2bf1e7bde8c'>udev: Add mount blacklist for amsdelta.</a></td><td>Jonathan McDowell</td><td>2</td></tr>
<tr><td><span title='2006-05-27 11:40:52 +0000'>2006-05-27</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/udev?id=68d7f0289496785e6adbe62434b7fc57243c74dd'>udev: Add /dev/ram to the automount blacklists for all devices. Enable 089 as...</a></td><td>Richard Purdie</td><td>12</td></tr>