From 5e97a2fefdf3edf3aa634894d36ff1b64321cb88 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 22 Mar 2013 14:01:38 +0000 Subject: Release branch for Tk 8.5.14 --- README | 2 +- generic/tk.h | 4 ++-- library/tk.tcl | 2 +- unix/configure | 14 +++++++------- unix/configure.in | 2 +- unix/tk.spec | 2 +- win/configure | 2 +- win/configure.in | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README b/README index 6b589d2..88b0ff1 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ README: Tk - This is the Tk 8.5.13 source distribution. + This is the Tk 8.5.14 source distribution. http://tcl.sourceforge.net/ You can get any source release of Tcl from the file distributions link at the above URL. diff --git a/generic/tk.h b/generic/tk.h index 7c686a3..ca66ceb 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -59,10 +59,10 @@ extern "C" { #define TK_MAJOR_VERSION 8 #define TK_MINOR_VERSION 5 #define TK_RELEASE_LEVEL TCL_FINAL_RELEASE -#define TK_RELEASE_SERIAL 13 +#define TK_RELEASE_SERIAL 14 #define TK_VERSION "8.5" -#define TK_PATCH_LEVEL "8.5.13" +#define TK_PATCH_LEVEL "8.5.14" /* * A special definition used to allow this header file to be included from diff --git a/library/tk.tcl b/library/tk.tcl index 8d6f0f9..7c6bb1a 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -15,7 +15,7 @@ package require Tcl 8.5 ;# Guard against [source] in an 8.4- interp before # Insist on running with compatible version of Tcl package require Tcl 8.5.0 # Verify that we have Tk binary and script components from the same release -package require -exact Tk 8.5.13 +package require -exact Tk 8.5.14 # Create a ::tk namespace namespace eval ::tk { diff --git a/unix/configure b/unix/configure index 535b5f5..ed0693c 100755 --- a/unix/configure +++ b/unix/configure @@ -1338,7 +1338,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".13" +TK_PATCH_LEVEL=".14" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" @@ -10091,7 +10091,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10099,7 +10099,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -10126,7 +10126,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -10140,18 +10140,18 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } diff --git a/unix/configure.in b/unix/configure.in index 86d46ad..85f0a1a 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [ TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".13" +TK_PATCH_LEVEL=".14" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" diff --git a/unix/tk.spec b/unix/tk.spec index ecf17c4..6884100 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -4,7 +4,7 @@ Name: tk Summary: Tk graphical toolkit for the Tcl scripting language. -Version: 8.5.13 +Version: 8.5.14 Release: 2 License: BSD Group: Development/Languages diff --git a/win/configure b/win/configure index bd3acf4..6415981 100755 --- a/win/configure +++ b/win/configure @@ -1312,7 +1312,7 @@ SHELL=/bin/sh TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".13" +TK_PATCH_LEVEL=".14" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/configure.in b/win/configure.in index ef517e6..c0a9599 100644 --- a/win/configure.in +++ b/win/configure.in @@ -14,7 +14,7 @@ SHELL=/bin/sh TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".13" +TK_PATCH_LEVEL=".14" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ -- cgit v0.12 From 80f69c509189e9b43a365f5cdcbc7d3721775466 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 22 Mar 2013 14:29:43 +0000 Subject: update changes --- changes | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/changes b/changes index a803a3e..36c9720 100644 --- a/changes +++ b/changes @@ -6867,3 +6867,21 @@ Many revisions to better support a Cygwin environment (nijtmans) 2012-11-07 (bug fix)[3574708] TkSetFocusWin() crash on XP (mcdonald) --- Released 8.5.13, November 12, 2012 --- See ChangeLog for details --- + +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-01-31 (bug fix)[3599928] use XKeycodeToKeysym on old systems (cassoff) + +2013-02-04 (bug fix)[3603077] treeview update on tag add/remove (english) + +2013-02-28 (bug fix)[3599312] First Alt key event is lost (mcdonald) + +2013-03-11 (bug fix)[3607326] Crash [listbox .l -listvariable $array] (porter) + +2013-03-13 (enhancement) better build support for Debian arch (shadura) + +--- Released 8.5.14, March 27, 2013 --- See ChangeLog for details --- -- cgit v0.12 From 4f471b3ed38ec59da1e4812d879af0f251a3f2db Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 22 Mar 2013 16:00:00 +0000 Subject: update changes --- changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changes b/changes index 36c9720..cc5ad63 100644 --- a/changes +++ b/changes @@ -6884,4 +6884,6 @@ Many revisions to better support a Cygwin environment (nijtmans) 2013-03-13 (enhancement) better build support for Debian arch (shadura) +2013-03-22 (enhancement) support builds against Tcl 8.6+ (nijtmans,porter) + --- Released 8.5.14, March 27, 2013 --- See ChangeLog for details --- -- cgit v0.12 From bb7f191ff403050e270a83fad224d38ec00fb19b Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 22 Mar 2013 16:02:37 +0000 Subject: Tag for release --- ChangeLog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0b7e582..29d0ba0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,20 @@ 2013-03-22 Don Porter + *** 8.5.14 TAGGED FOR RELEASE *** + + * generic/tk.h: Bump to 8.5.14 for release. + * library/tk.tcl: + * unix/configure.in: + * unix/tk.spec: + * win/configure.in: + * README: + * generic/tkWindow.c: Updates so that Tk 8.5.14+ will be able to * unix/Makefile.in: configure and build against Tcl 8.6+ * unix/configure.in: header files. * unix/configure: autoconf-2.59 + * win/configure: 2013-03-13 Jan Nijtmans -- cgit v0.12 From a626bcc65e272d6a5bfa6d74a231026d3786f567 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 22 Mar 2013 16:16:30 +0000 Subject: make dist --- unix/tkConfig.h.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in index 74f6d73..986609b 100644 --- a/unix/tkConfig.h.in +++ b/unix/tkConfig.h.in @@ -103,6 +103,9 @@ /* Have we turned on XFT (antialiased fonts)? */ #undef HAVE_XFT +/* Do we have XkbKeycodeToKeysym? */ +#undef HAVE_XKBKEYCODETOKEYSYM + /* Is XScreenSaver available? */ #undef HAVE_XSS -- cgit v0.12 From bc13ab5bd9de13fbae32d24921f3030545ec590a Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sat, 30 Mar 2013 06:39:59 +0000 Subject: Backout [9bc120ced2] and part of [ea8d772054] (change-log entry for [9bc120ced2] only) --- changes | 2 -- generic/tkWindow.c | 4 ++++ unix/Makefile.in | 2 +- unix/configure | 11 +---------- unix/configure.in | 7 +------ 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/changes b/changes index cc5ad63..36c9720 100644 --- a/changes +++ b/changes @@ -6884,6 +6884,4 @@ Many revisions to better support a Cygwin environment (nijtmans) 2013-03-13 (enhancement) better build support for Debian arch (shadura) -2013-03-22 (enhancement) support builds against Tcl 8.6+ (nijtmans,porter) - --- Released 8.5.14, March 27, 2013 --- See ChangeLog for details --- diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 2901256..ac69455 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3275,6 +3275,10 @@ Initialize( Tcl_SetMainLoop(Tk_MainLoop); +#undef Tk_InitStubs + + Tk_InitStubs(interp, TK_VERSION, 1); + /* * Initialized the themed widget set */ diff --git a/unix/Makefile.in b/unix/Makefile.in index bfa4bc0..1da2d72 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -372,7 +372,7 @@ TTK_OBJS = \ ttkTagSet.o ttkTheme.o ttkTrace.o ttkTrack.o ttkTreeview.o \ ttkWidget.o ttkStubInit.o -STUB_OBJS = tkStubInit.o +STUB_OBJS = tkStubInit.o tkStubLib.o STUB_LIB_OBJS = tkStubLib.o ttkStubLib.o diff --git a/unix/configure b/unix/configure index de43530..ed0693c 100755 --- a/unix/configure +++ b/unix/configure @@ -1585,16 +1585,7 @@ echo "${ECHO_T}$BUILD_TCLSH" >&6 -if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then - { { echo "$as_me:$LINENO: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. -Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. -Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&5 -echo "$as_me: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. -Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. -Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&2;} - { (exit 1); exit 1; }; } -fi -if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_VERSION}"; then +if test "${TCL_VERSION}" != "${TK_VERSION}"; then { { echo "$as_me:$LINENO: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&5 diff --git a/unix/configure.in b/unix/configure.in index 9f59778..85f0a1a 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -39,12 +39,7 @@ SC_LOAD_TCLCONFIG SC_PROG_TCLSH SC_BUILD_TCLSH -if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then - AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. -Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. -Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}.]) -fi -if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_VERSION}"; then +if test "${TCL_VERSION}" != "${TK_VERSION}"; then AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}.]) -- cgit v0.12 From 7d38dfda3ce110288097bed15c0ebc8728e3e70c Mon Sep 17 00:00:00 2001 From: dgp Date: Mon, 1 Apr 2013 18:31:52 +0000 Subject: Update changes. Tag RC1. --- ChangeLog | 30 ++++++++++++------------------ changes | 6 +++++- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0a4fdf..643679b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2013-04-01 Don Porter + *** 8.5.14 TAGGED FOR RELEASE *** + + * generic/tk.h: Bump to 8.5.14 for release. + * library/tk.tcl: + * unix/configure.in: + * unix/tk.spec: + * win/configure.in: + * README: + + * unix/configure: autoconf-2.59 + * win/configure: + * generic/tkInt.h: [Bug 3607830] Runtime checks that Xkb is * unix/tkUnixEvent.c: available in the X server before trying to * unix/tkUnixKey.c: use. Adapted from patch from Brian Griffin. @@ -13,24 +25,6 @@ * doc/ttk_panedwindow.n: <> (ttk_pandedwindow only) and * doc/ttk_spinbox.n: <> (ttk_spinbox only) -2013-03-22 Don Porter - - *** 8.5.14 TAGGED FOR RELEASE *** - - * generic/tk.h: Bump to 8.5.14 for release. - * library/tk.tcl: - * unix/configure.in: - * unix/tk.spec: - * win/configure.in: - * README: - - * generic/tkWindow.c: Updates so that Tk 8.5.14+ will be able to - * unix/Makefile.in: configure and build against Tcl 8.6+ - * unix/configure.in: header files. - - * unix/configure: autoconf-2.59 - * win/configure: - 2013-03-13 Jan Nijtmans * unix/tcl.m4: Patch by Andrew Shadura, providing better support for diff --git a/changes b/changes index 36c9720..ea78d52 100644 --- a/changes +++ b/changes @@ -6884,4 +6884,8 @@ Many revisions to better support a Cygwin environment (nijtmans) 2013-03-13 (enhancement) better build support for Debian arch (shadura) ---- Released 8.5.14, March 27, 2013 --- See ChangeLog for details --- +2013-03-27 (bug fix)[3608074] button, listbox, menu <> (nijtmans) + +2013-04-01 (bug fix)[3607830] Xkb runtime checks (griffin) + +--- Released 8.5.14, April 3, 2013 --- See ChangeLog for details --- -- cgit v0.12