summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-08-08 18:09:36 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-08-08 18:09:36 (GMT)
commit7d86aadfc1e60d69b218408955975c988e33c977 (patch)
treeade7312fe990496d5fcc96f33e165d04eec76656
parent72ce81a049b258f65e778a1b37e57af94c643159 (diff)
parentee1221581a60b564c6e10e00ca19e4fdfe0e13ed (diff)
downloadtk-7d86aadfc1e60d69b218408955975c988e33c977.zip
tk-7d86aadfc1e60d69b218408955975c988e33c977.tar.gz
tk-7d86aadfc1e60d69b218408955975c988e33c977.tar.bz2
merge release to trunk
-rw-r--r--ChangeLog18
-rw-r--r--README2
-rw-r--r--changes2
-rw-r--r--generic/tk.h4
-rw-r--r--library/tk.tcl2
-rwxr-xr-xunix/configure14
-rw-r--r--unix/configure.in2
-rw-r--r--unix/tk.spec2
-rw-r--r--unix/tkConfig.h.in8
-rwxr-xr-xwin/configure2
-rw-r--r--win/configure.in2
11 files changed, 38 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a186cf..44cbba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-05 Don Porter <dgp@users.sourceforge.net>
+
+ *** 8.6b2 TAGGED FOR RELEASE ***
+
+ * changes: Updates for 8.6b2 release.
+
2011-08-03 Don Porter <dgp@users.sourceforge.net>
* win/tkWinWm.c: [Bug 2891541] Merge of 8.5.8 fix from Pat Thoyts.
@@ -23,6 +29,18 @@
* doc/*.3, doc/*.n: Many small fixes to documentation as part of
project to improve quality of generated HTML docs.
+2011-07-18 Don Porter <dgp@users.sourceforge.net>
+
+ * README: Bump version number to 8.6b2
+ * generic/tk.h:
+ * library/tk.tcl:
+ * unix/configure.in:
+ * unix/tk.spec:
+ * win/configure.in:
+
+ * unix/configure: autoconf-2.59
+ * win/configure:
+
2011-06-29 Don Porter <dgp@users.sourceforge.net>
* generic/ttk/ttkTrace.c: [Bug 3341056]: Correct segfault due to flaw
diff --git a/README b/README
index 345e00b..ff13f01 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
README: Tk
- This is the Tk 8.6b1 source distribution.
+ This is the Tk 8.6b2 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 c299052..984807a 100644
--- a/changes
+++ b/changes
@@ -6937,4 +6937,4 @@ and -to (porter)
2011-08-03 (bug fix)[2891541] fix grab behaviour for main window (thoyts)
---- Released 8.6b2, August 5, 2011 --- See ChangeLog for details ---
+--- Released 8.6b2, August 8, 2011 --- See ChangeLog for details ---
diff --git a/generic/tk.h b/generic/tk.h
index f401e12..a9b96e3 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 1
+#define TK_RELEASE_SERIAL 2
#define TK_VERSION "8.6"
-#define TK_PATCH_LEVEL "8.6b1.2"
+#define TK_PATCH_LEVEL "8.6b2"
/*
* A special definition used to allow this header file to be included from
diff --git a/library/tk.tcl b/library/tk.tcl
index a88056b..5e6f4a6 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.6b1.2
+package require -exact Tk 8.6b2
# Create a ::tk namespace
namespace eval ::tk {
diff --git a/unix/configure b/unix/configure
index 82615e6..81bc617 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="b1.2"
+TK_PATCH_LEVEL="b2"
VERSION=${TK_VERSION}
LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
@@ -9790,7 +9790,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. */
@@ -9798,7 +9798,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9825,7 +9825,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
@@ -9839,18 +9839,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 <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
diff --git a/unix/configure.in b/unix/configure.in
index a6e0029..3458dd0 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="b1.2"
+TK_PATCH_LEVEL="b2"
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 450d87d..88a3007 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.6b1
+Version: 8.6b2
Release: 2
License: BSD
Group: Development/Languages
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index 838cc2e..3318552 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -91,7 +91,7 @@
/* Are we building TkAqua? */
#undef MAC_OSX_TK
-/* Compiler support for module scope symbols */
+/* No Compiler support for module scope symbols */
#undef MODULE_SCOPE
/* Is Darwin CoreFoundation unavailable for 64-bit? */
@@ -106,6 +106,9 @@
/* Do we have <stdlib.h>? */
#undef NO_STDLIB_H
+/* No visibility attribute */
+#undef NO_VIZ
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
@@ -166,9 +169,6 @@
/* Are TkAqua debug messages enabled? */
#undef TK_MAC_DEBUG
-/* Do we need a special AIX hack for timezones? */
-#undef USE_DELTA_FOR_TZ
-
/* Do we want to use the threaded memory allocator? */
#undef USE_THREAD_ALLOC
diff --git a/win/configure b/win/configure
index 6a49788..0c1f6e7 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="b1.2"
+TK_PATCH_LEVEL="b2"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index 85bfe15..e24e2af 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="b1.2"
+TK_PATCH_LEVEL="b2"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#------------------------------------------------------------------------