* README: Bump version number to 8.6a0

        * generic/tk.h:
        * library/tk.tcl:
        * macosx/Wish-Common.xcconfig:
        * unix/configure.in:
        * unix/tk.spec:
        * win/README:
        * win/configure.in:
        * win/tcl.m4:

        * unix/configure:       autoconf-2.59
        * win/configure:

        * generic/tkConsole.c:  Relax Tcl_InitStubs() calls so that a Tk 8.6
        * generic/tkMain.c:     might [load] into a Tcl 8.5 interp.
        * generic/tkWindow.c:

        * generic/tkStubLib.c:  Update to compatibility with a libtcl.so
        that contains no "tclStubsPtr" [Tcl Bug 1819422].

        * generic/tkDecls.h:            make genstubs
        * generic/tkIntDecls.h:
        * generic/tkIntPlatDecls.h:
        * generic/tkIntXlibDecls.h:
        * generic/tkPlatDecls.h:

10 files changed, 43 insertions, 28 deletions

diff --git a/generic/tk.h b/generic/tk.h
index 86693dc..ad89478 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -12,15 +12,15 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tk.h,v 1.109 2008/03/28 18:13:39 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.110 2008/04/01 16:30:52 dgp Exp $
  */
 
 #ifndef _TK
 #define _TK
 
 #include <tcl.h>
-#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 5)
-#	error Tk 8.5 must be compiled with tcl.h from Tcl 8.5
+#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 5)
+#	error Tk 8.6 must be compiled with tcl.h from Tcl 8.5 or better
 #endif
 
 /*
@@ -51,12 +51,12 @@ extern "C" {
  */
 
 #define TK_MAJOR_VERSION	8
-#define TK_MINOR_VERSION	5
-#define TK_RELEASE_LEVEL	TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL	2
+#define TK_MINOR_VERSION	6
+#define TK_RELEASE_LEVEL	TCL_ALPHA_RELEASE
+#define TK_RELEASE_SERIAL	0
 
-#define TK_VERSION		"8.5"
-#define TK_PATCH_LEVEL		"8.5.2"
+#define TK_VERSION		"8.6"
+#define TK_PATCH_LEVEL		"8.6a0"
 
 /*
  * A special definition used to allow this header file to be included from
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 4b0f6b8..0ea2051 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkConsole.c,v 1.35 2007/12/13 15:24:14 dgp Exp $
+ * RCS: @(#) $Id: tkConsole.c,v 1.36 2008/04/01 16:30:52 dgp Exp $
  */
 
 #include "tk.h"
@@ -229,11 +229,11 @@ Tk_InitConsoleChannels(
     Tcl_Channel consoleChannel;
 
     /*
-     * Ensure that we are getting the matching version of Tcl. This is really
+     * Ensure that we are getting a compatible version of Tcl. This is really
      * only an issue when Tk is loaded dynamically.
      */
 
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
         return;
     }
 
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 4071501..b0dca8b 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkDecls.h,v 1.30 2007/05/14 20:58:26 dgp Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.31 2008/04/01 16:30:53 dgp Exp $
  */
 
 #ifndef _TKDECLS
@@ -1982,6 +1982,8 @@ typedef struct TkStubs {
     void (*tk_CreateOldPhotoImageFormat) (Tk_PhotoImageFormat * formatPtr); /* 273 */
 } TkStubs;
 
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1990,6 +1992,8 @@ extern TkStubs *tkStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index e4df446..5729545 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkIntDecls.h,v 1.31 2007/12/13 15:24:14 dgp Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.32 2008/04/01 16:30:53 dgp Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -1222,6 +1222,8 @@ typedef struct TkIntStubs {
     int (*tkpTesttextCmd) (ClientData dummy, Tcl_Interp * interp, int argc, CONST char ** argv); /* 157 */
 } TkIntStubs;
 
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1230,6 +1232,8 @@ extern TkIntStubs *tkIntStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index e21516e..95881cd 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.29 2007/12/13 15:24:14 dgp Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.30 2008/04/01 16:30:53 dgp Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -670,6 +670,8 @@ typedef struct TkIntPlatStubs {
 #endif /* X11 */
 } TkIntPlatStubs;
 
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -678,6 +680,8 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index aadd545..759f162 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.23 2007/12/13 15:24:15 dgp Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.24 2008/04/01 16:30:53 dgp Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -1419,6 +1419,8 @@ typedef struct TkIntXlibStubs {
 #endif /* AQUA */
 } TkIntXlibStubs;
 
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1427,6 +1429,8 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
diff --git a/generic/tkMain.c b/generic/tkMain.c
index df3e215..9f6a73c 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMain.c,v 1.28 2007/12/13 15:24:15 dgp Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.29 2008/04/01 16:30:54 dgp Exp $
  */
 
 #include <ctype.h>
@@ -106,11 +106,11 @@ Tk_MainEx(
     Tcl_DString appName;
 
     /*
-     * Ensure that we are getting the matching version of Tcl. This is really
+     * Ensure that we are getting a compatible version of Tcl. This is really
      * only an issue when Tk is loaded dynamically.
      */
 
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
 	abort();
     }
 
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index e311c12..8502923 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPlatDecls.h,v 1.15 2007/12/13 15:24:16 dgp Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.16 2008/04/01 16:30:54 dgp Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -156,6 +156,8 @@ typedef struct TkPlatStubs {
 #endif /* AQUA */
 } TkPlatStubs;
 
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -164,6 +166,8 @@ extern TkPlatStubs *tkPlatStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index fbf1ed1..e54c3ef 100644
--- a/generic/tkStubLib.c
+++ b/generic/tkStubLib.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubLib.c,v 1.20 2008/03/19 17:31:35 das Exp $
+ * RCS: @(#) $Id: tkStubLib.c,v 1.21 2008/04/01 16:30:54 dgp Exp $
  */
 
 /*
@@ -20,11 +20,6 @@
  * including the rest of the stub functions.
  */
 
-#ifndef USE_TCL_STUBS
-#define USE_TCL_STUBS
-#endif
-#undef USE_TCL_STUB_PROCS
-
 #ifndef USE_TK_STUBS
 #define USE_TK_STUBS
 #endif
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 0c5e3e9..4063819 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWindow.c,v 1.89 2007/12/13 15:24:21 dgp Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.90 2008/04/01 16:30:54 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -2944,11 +2944,11 @@ Initialize(
     ThreadSpecificData *tsdPtr;
 
     /*
-     * Ensure that we are getting the matching version of Tcl. This is really
+     * Ensure that we are getting a compatible version of Tcl. This is really
      * only an issue when Tk is loaded dynamically.
      */
 
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
 	return TCL_ERROR;
     }