diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | changes | 78 | ||||
| -rw-r--r-- | generic/tk.h | 4 | ||||
| -rw-r--r-- | tests/window.test | 6 | ||||
| -rw-r--r-- | unix/Makefile.in | 9 | ||||
| -rwxr-xr-x | unix/configure | 39 | ||||
| -rw-r--r-- | unix/configure.in | 2 | ||||
| -rw-r--r-- | unix/tk.spec | 4 | ||||
| -rwxr-xr-x | win/configure | 39 | ||||
| -rw-r--r-- | win/configure.in | 2 |
11 files changed, 168 insertions, 39 deletions
@@ -1,8 +1,26 @@ +2013-06-01 Don Porter <dgp@users.sourceforge.net> + *** 8.4.20 TAGGED FOR RELEASE *** + + * README: Bump version number to 8.4.20 + * generic/tk.h: + * unix/configure.in: + * unix/tk.spec: + * win/configure.in: + + * unix/configure: autoconf-2.13 + * win/configure: + + * changes: updates for 8.4.20 release. + 2013-05-19 Jan Nijtmans <nijtmans@users.sf.net> * unix/tcl.m4: Fix for FreeBSD, and remove support for older * unix/configure: FreeBSD versions. Patch by Pietro Cerutti. +2013-03-26 Don Porter <dgp@users.sourceforge.net> + + * tests/window.test: [Bug 1715716] Constrain window-2.9 no threads. + 2013-03-13 Jan Nijtmans <nijtmans@users.sf.net> * unix/tcl.m4: Patch by Andrew Shadura, providing better support for @@ -18,8 +36,8 @@ 2012-12-03 François Vogel <fvogelnew1@free.fr> - * generic/tkTextIndex.c: [Bug 3588824]: bug in image index handling - * tests/textIndex.test: for weird image names + * generic/tkTextIndex.c: [Bug 3588824]: bug in image index handling + * tests/textIndex.test: for weird image names 2012-11-13 Jan Nijtmans <nijtmans@users.sf.net> @@ -1,5 +1,5 @@ README: Tk - This is the Tk 8.4.19 source distribution. + This is the Tk 8.4.20 source distribution. Tcl/Tk is also available through NetCVS: http://tcl.sourceforge.net/ You can get any source release of Tcl from the file distributions @@ -6159,4 +6159,82 @@ use (hobbs) 2008-04-07 (bug fix)[1937135] Fix double-free with argv error (hobbs) +2008-04-17 (bug fix)[1327482] canvas item <Enter> events (wangnick) + --- Released 8.4.19, April 18, 2008 --- See ChangeLog for details --- + +2008-06-12 (bug fix)[1991932] global grab segfault (steffen) + +2008-06-12 (platform support) Solaris/amd64 gcc 64bit support (steffen) + +2008-06-18 (bug fix) Aqua: missing focus on first map (steffen) + +2008-08-05 (bug fix)[2010422] Tk header files revised to accommodate +incompatible changes in recent X.org releases of X11 headers. (jenglish) + +2009-02-27 (bug fix)[2645457] crash in Tk_MakeWindowExist() (thoyts) + +2009-04-30 (bug fix)[2080533] panedwindow sash draw crash (fellows) + +2009-07-22 (bug fix)[2496114] focus in dead window crash (griffin,fellows) + +2009-09-14 (bug fix)[873608] win tearoff menu, no submenu arrows (traum,hobbs) + +2009-09-14 (bug fix)[873613] win tearoff menu repeat select (traum,hobbs) + +2009-10-07 (bug fix)[2088597] min scrollbar slider size (danckaert,fellows) + +2009-10-22 (bug fix)[1469210] [text] modified error (danckaert) + +2009-10-25 (bug fix)[2809525] prevent X crash on overlong color name (goth) + +2009-12-11 (bug fix)[2912473] accept :: in DISPLAY name (fellows) + +2010-01-19 (new feature)[TIP 359] Extended Window Manager Hint Support (thoyts) + +2010-02-17 (bug fix)[2952745] crash in menu deletion (english) + +2011-01-13 (bug fix)[3154705] tk_messageBox close button disabled (skylera) + +2011-03-24 (bug fix)[3239768] Win menu font support (wehle) + +2011-03-28 (bug fix)[3129527] stop buffer overflows (dirtyepic,nijtmans) + +2011-04-22 (bug fix)[3291543] mem corrupt when [$canvas dchars] removes all +coords of a polygon (rogers,spjuth) + +2011-06-06 (bug fix)[2546087] [console] treatment of '\0' (porter) + +2011-06-10 (bug fix)[3175610] incomplete line item refresh (ferrieux) + +2011-11-17 (bug fix)[3437816] return code of [canvas lower] (hirner,ferrieux) + +2011-12-22 (bug fix)[3235256] correct menu failure on Windows (mcdonald) + +2012-02-15 (bug fix)[3486474] Correct color scaling (goth,nijtmans) + +2012-04-07 (bug fix)[3176239] control-Mousewheel crash (couch,nijtmans) + +2012-04-22 (bug fix)[3520202] <MouseWheel> %k,%K,%N for Python (deily,fellows) + +2012-05-02 (bug fix)[533519] multiscreen window placement (nijtmans) + +2012-05-04 (bug fix)[2768586] multiscreen menu posting (nijtmans) + +2012-07-23 (bug fix)[3546073] DisplayString() -> DefaultDisplay() (english) + +2012-07-31 (update)[3551802] XKeycodeToKeysym deprecation (fellows) + +2012-08-25 (bug fix)[3554026,3561016] crash with tearoff menus (gavilán) + +2012-08-28 (bug fix)[3562426] Context menu goes off screen (nijtmans) + +2012-12-04 (bug fix)[3588824] text index of images with weird names (gavilan) + +2012-12-06 (bug fix) avoid buggy syscall to parse hex color values (fellows) + +2013-01-22 (bug fix)[3601782] Tcl_InitStubs failure message (nijtmans) + +2013-03-13 (enhancement) better build support for Debian arch (shadura) + +--- Released 8.4.20, June 1, 2013 --- See ChangeLog for details --- diff --git a/generic/tk.h b/generic/tk.h index 4a5b371..2ff21b6 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -53,10 +53,10 @@ extern "C" { #define TK_MAJOR_VERSION 8 #define TK_MINOR_VERSION 4 #define TK_RELEASE_LEVEL TCL_FINAL_RELEASE -#define TK_RELEASE_SERIAL 19 +#define TK_RELEASE_SERIAL 20 #define TK_VERSION "8.4" -#define TK_PATCH_LEVEL "8.4.19" +#define TK_PATCH_LEVEL "8.4.20" /* * A special definition used to allow this header file to be included diff --git a/tests/window.test b/tests/window.test index 8628c7a..f9b114a 100644 --- a/tests/window.test +++ b/tests/window.test @@ -11,9 +11,13 @@ namespace import -force tcltest::testsDirectory namespace import -force tcltest::interpreter namespace import -force tcltest::makeFile namespace import -force tcltest::removeFile +namespace import -force tcltest::testConstraint configure -testdir [file join [pwd] [file dirname [info script]]] configure -loadfile [file join [testsDirectory] constraints.tcl] tcltest::loadTestedCommands +testConstraint unthreaded [expr { + (![info exists tcl_platform(threaded)] || !$tcl_platform(threaded)) +}] update @@ -148,7 +152,7 @@ test window-2.8 {Tk_DestroyWindow, cleanup half dead windows at exit} \ } {0 {}} test window-2.9 {Tk_DestroyWindow, Destroy bindings evaluated after exit} \ - unixOrWin { + {unixOrWin unthreaded} { set script [makeFile { toplevel .t1 toplevel .t2 diff --git a/unix/Makefile.in b/unix/Makefile.in index 53579f9..e31d7e6 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1398,15 +1398,6 @@ dist: cp -p $(TOP_DIR)/win/rc/*.{rc,cur,ico,bmp} $(DISTDIR)/win/rc $(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/*.rc $(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/wish.exe.manifest.in - mkdir $(DISTDIR)/mac - cp -p $(TOP_DIR)/mac/tkMacProjects.sea.hqx $(DISTDIR)/mac - cp -p $(TOP_DIR)/mac/*.c $(TOP_DIR)/mac/*.h $(TOP_DIR)/mac/*.r \ - $(DISTDIR)/mac - cp -p $(TOP_DIR)/mac/README $(DISTDIR)/mac - cp -p $(TOP_DIR)/license.terms $(DISTDIR)/mac - cp -p $(TOP_DIR)/mac/*.pch $(DISTDIR)/mac - cp -p $(TOP_DIR)/mac/*.doc $(DISTDIR)/mac - cp -p $(TOP_DIR)/mac/*.tcl $(DISTDIR)/mac mkdir $(DISTDIR)/macosx cp -p $(MAC_OSX_DIR)/Makefile $(MAC_OSX_DIR)/README \ $(MAC_OSX_DIR)/Wish.icns $(MAC_OSX_DIR)/*.c \ diff --git a/unix/configure b/unix/configure index 97718d5..56ac561 100755 --- a/unix/configure +++ b/unix/configure @@ -559,7 +559,7 @@ fi TK_VERSION=8.4 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".19" +TK_PATCH_LEVEL=".20" VERSION=${TK_VERSION} LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru" @@ -6248,15 +6248,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. diff --git a/unix/configure.in b/unix/configure.in index a5fef0c..aebef58 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -9,7 +9,7 @@ AC_PREREQ(2.13) TK_VERSION=8.4 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".19" +TK_PATCH_LEVEL=".20" VERSION=${TK_VERSION} LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru" diff --git a/unix/tk.spec b/unix/tk.spec index 94bbfe7..18dfd28 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -1,6 +1,6 @@ # This file is the basis for a binary Tk Linux RPM. -%define version 8.4.19 +%define version 8.4.20 %define directory /usr/local Summary: Tk graphical toolkit for the Tcl scripting language. @@ -13,7 +13,7 @@ Source: http://prdownloads.sourceforge.net/tcl/tk%{version}-src.tar.gz URL: http://www.tcl.tk/ Packager: Carina Buildroot: /var/tmp/%{name}%{version} -Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.4.19 +Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.4.20 %description The Tcl (Tool Command Language) provides a powerful platform for diff --git a/win/configure b/win/configure index 5911554..48ef906 100755 --- a/win/configure +++ b/win/configure @@ -542,7 +542,7 @@ fi TK_VERSION=8.4 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".19" +TK_PATCH_LEVEL=".20" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ @@ -2596,15 +2596,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. diff --git a/win/configure.in b/win/configure.in index 5e73318..90b03ab 100644 --- a/win/configure.in +++ b/win/configure.in @@ -9,7 +9,7 @@ AC_PREREQ(2.13) TK_VERSION=8.4 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".19" +TK_PATCH_LEVEL=".20" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ |