diff options
| author | Ned Deily <nad@acm.org> | 2013-10-27 19:50:34 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2013-10-27 19:50:34 -0700 |
| commit | f20ee9391cb3ccfb1932194d26b44df91ae2de67 (patch) | |
| tree | 06363e8d74920fec466057fa31205a7dec084a50 /Mac | |
| parent | bb4b0aa51bc361188ffeee55ee49c7878c067903 (diff) | |
| parent | 94764b24aacfb9b46b217bd2bf964b722279ff0b (diff) | |
| download | cpython-git-f20ee9391cb3ccfb1932194d26b44df91ae2de67.tar.gz | |
Issue #19373: merge from 3.3
Diffstat (limited to 'Mac')
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 8 | ||||
| -rw-r--r-- | Mac/BuildScript/issue19373_tk_8_5_15_source.patch | 13 |
2 files changed, 19 insertions, 2 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 69f3ff7ee9..0859b3aa06 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -215,6 +215,9 @@ def library_recipes(): name="Tk 8.5.15", url="ftp://ftp.tcl.tk/pub/tcl//tcl8_5/tk8.5.15-src.tar.gz", checksum='55b8e33f903210a4e1c8bce0f820657f', + patches=[ + "issue19373_tk_8_5_15_source.patch", + ], buildDir="unix", configure_pre=[ '--enable-aqua', @@ -797,8 +800,6 @@ def buildRecipe(recipe, basedir, archList): workDir = extractArchive(buildDir, sourceArchive) os.chdir(workDir) - if 'buildDir' in recipe: - os.chdir(recipe['buildDir']) for patch in recipe.get('patches', ()): if isinstance(patch, tuple): @@ -825,6 +826,9 @@ def buildRecipe(recipe, basedir, archList): runCommand('sh %s' % shellQuote(fn)) os.unlink(fn) + if 'buildDir' in recipe: + os.chdir(recipe['buildDir']) + if configure is not None: configure_args = [ "--prefix=/usr/local", diff --git a/Mac/BuildScript/issue19373_tk_8_5_15_source.patch b/Mac/BuildScript/issue19373_tk_8_5_15_source.patch new file mode 100644 index 0000000000..de5d08e9d6 --- /dev/null +++ b/Mac/BuildScript/issue19373_tk_8_5_15_source.patch @@ -0,0 +1,13 @@ +Issue #19373: Patch to Tk 8.5.15 to correct refresh problem on OS x 10.9. +From upstream checkin https://core.tcl.tk/tk/info/5a5abf71f9 + +--- tk8.5.15/macosx/tkMacOSXDraw.c 2013-09-16 09:41:21.000000000 -0700 ++++ Tk_Source_Code-5a5abf71f9fdb0da/macosx/tkMacOSXDraw.c 2013-10-27 13:27:00.000000000 -0700 +@@ -1688,6 +1688,7 @@ + { + if (dcPtr->context) { + CGContextSynchronize(dcPtr->context); ++ [[dcPtr->view window] setViewsNeedDisplay:YES]; + [[dcPtr->view window] enableFlushWindow]; + if (dcPtr->focusLocked) { + [dcPtr->view unlockFocus]; |