merge release branch

11 files changed, 55 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index d15099c..916f52f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-17  Don Porter  <dgp@users.sourceforge.net>
+
+	*** 8.6b2 TAGGED FOR RELEASE ***
+	
+	* macosx/tkMacOSXWm.c: [Bug 3567786] Stop segfault in [wm forget].
+
 2012-09-15  Don Porter  <dgp@users.sourceforge.net>
 
 	* macosx/tkMacOSXFont.c: [Bug 3567778] Make Tk_MeasureChars() honor
@@ -30,6 +36,18 @@
 	of variable that was only ever checked once immediately afterwards,
 	except for one (buggy) case where it was checked without assignment.
 
+2012-09-07  Don Porter  <dgp@users.sourceforge.net>
+
+	* README:		Bump version number to 8.6b3
+	* generic/tk.h:
+	* library/tk.tcl:
+	* unix/configure.in:
+	* unix/tk.spec:
+	* win/configure.in:
+
+	* unix/configure:	autoconf-2.59
+	* win/configure:
+
 2012-08-30  Andreas Kupries  <andreask@activestate.com>
 
 	* generic/tkCanvWind.c (CanvasPsWindow): Unbreak AIX, replaced use
diff --git a/README b/README
index ff13f01..304970d 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 README:  Tk
-    This is the Tk 8.6b2 source distribution.
+    This is the Tk 8.6b3 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/changes b/changes
index cc726ea..713e745 100644
--- a/changes
+++ b/changes
@@ -7006,8 +7006,12 @@ and -to (porter)
 
 2012-08-25 (bug fix)[3554026,3561016] crash with tearoff menus (gavilan)
 
+2012-09-11 (bug fix)[3566594] stop clip region leaks (fellows)
+
 2012-09-15 (bug fix)[3567778] stop hang in wrapped label (porter)
 
+2012-09-17 (bug fix)[3567786] stop segfault in [wm forget] (porter)
+
 Many revisions to better support a Cygwin environment (nijtmans)
 
 --- Released 8.6b3, September 18, 2012 --- See ChangeLog for details ---
diff --git a/generic/tk.h b/generic/tk.h
index 23b17f8..add2822 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -50,10 +50,10 @@ extern "C" {
 #define TK_MAJOR_VERSION	8
 #define TK_MINOR_VERSION	6
 #define TK_RELEASE_LEVEL	TCL_BETA_RELEASE
-#define TK_RELEASE_SERIAL	2
+#define TK_RELEASE_SERIAL	3
 
 #define TK_VERSION		"8.6"
-#define TK_PATCH_LEVEL		"8.6b2"
+#define TK_PATCH_LEVEL		"8.6b3"
 
 /*
  * A special definition used to allow this header file to be included from
diff --git a/library/tk.tcl b/library/tk.tcl
index e0d9eda..1b4563e 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -13,7 +13,7 @@
 # Insist on running with compatible version of Tcl
 package require Tcl 8.6
 # Verify that we have Tk binary and script components from the same release
-package require -exact Tk  8.6b2
+package require -exact Tk  8.6b3
 
 # Create a ::tk namespace
 namespace eval ::tk {
diff --git a/unix/configure b/unix/configure
index 110cbcd..7f145ec 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1339,7 +1339,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TK_VERSION=8.6
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=6
-TK_PATCH_LEVEL="b2"
+TK_PATCH_LEVEL="b3"
 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/configure.in b/unix/configure.in
index 7964bc2..a7f9fc6 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TK_VERSION=8.6
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=6
-TK_PATCH_LEVEL="b2"
+TK_PATCH_LEVEL="b3"
 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 29b72bb..6b10333 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.6b2
+Version:       8.6b3
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index 3318552..d27c6e8 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -4,9 +4,15 @@
     #ifndef _TKCONFIG
     #define _TKCONFIG
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define to 1 if you have the <AvailabilityMacros.h> header file. */
 #undef HAVE_AVAILABILITYMACROS_H
 
+/* Defined when compiler supports casting to union type. */
+#undef HAVE_CAST_TO_UNION
+
 /* Do we have access to Darwin CoreFoundation.framework? */
 #undef HAVE_COREFOUNDATION
 
@@ -94,6 +100,9 @@
 /* No Compiler support for module scope symbols */
 #undef MODULE_SCOPE
 
+/* Is no debugging enabled? */
+#undef NDEBUG
+
 /* Is Darwin CoreFoundation unavailable for 64-bit? */
 #undef NO_COREFOUNDATION_64
 
@@ -121,6 +130,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -130,9 +142,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Is debugging enabled? */
-#undef TCL_CFG_DEBUG
-
 /* Is this a 64-bit build? */
 #undef TCL_CFG_DO64BIT
 
@@ -172,9 +181,17 @@
 /* Do we want to use the threaded memory allocator? */
 #undef USE_THREAD_ALLOC
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Are Darwin SUSv3 extensions available? */
 #undef _DARWIN_C_SOURCE
@@ -229,7 +246,7 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Do we want to use the strtod() in compat? */
diff --git a/win/configure b/win/configure
index 67bff85..01ddccf 100755
--- a/win/configure
+++ b/win/configure
@@ -1311,7 +1311,7 @@ SHELL=/bin/sh
 TK_VERSION=8.6
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=6
-TK_PATCH_LEVEL="b2"
+TK_PATCH_LEVEL="b3"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index 75c9e7a..e3be0a9 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -14,7 +14,7 @@ SHELL=/bin/sh
 TK_VERSION=8.6
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=6
-TK_PATCH_LEVEL="b2"
+TK_PATCH_LEVEL="b3"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------