summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2017-03-10 18:21:36 (GMT)
committerdgp <dgp@users.sourceforge.net>2017-03-10 18:21:36 (GMT)
commit7d43c1f7aeba4e047988f68ede53565da32e6538 (patch)
tree7409ee662bf6b05d120f917fc385f86b2db2494d
parent72ea4ad7973b2bfe4b92f346dae82919e7d0ae35 (diff)
downloadtk-7d43c1f7aeba4e047988f68ede53565da32e6538.zip
tk-7d43c1f7aeba4e047988f68ede53565da32e6538.tar.gz
tk-7d43c1f7aeba4e047988f68ede53565da32e6538.tar.bz2
Start RC branch for Tk 8.6.7
-rw-r--r--README2
-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
-rwxr-xr-xwin/configure2
-rw-r--r--win/configure.in2
8 files changed, 15 insertions, 15 deletions
diff --git a/README b/README
index c960e13..7bd26e5 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
README: Tk
- This is the Tk 8.6.6 source distribution.
+ This is the Tk 8.6.7 source distribution.
http://sourceforge.net/projects/tcl/files/Tcl/
You can get any source release of Tk from the URL above.
diff --git a/generic/tk.h b/generic/tk.h
index 29c6fb9..a6e3726 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -75,10 +75,10 @@ extern "C" {
#define TK_MAJOR_VERSION 8
#define TK_MINOR_VERSION 6
#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL 6
+#define TK_RELEASE_SERIAL 7
#define TK_VERSION "8.6"
-#define TK_PATCH_LEVEL "8.6.6"
+#define TK_PATCH_LEVEL "8.6.7"
/*
* A special definition used to allow this header file to be included from
diff --git a/library/tk.tcl b/library/tk.tcl
index 691bf83..fc61c4d 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -11,7 +11,7 @@
# this file, and for a DISCLAIMER OF ALL WARRANTIES.
# Verify that we have Tk binary and script components from the same release
-package require -exact Tk 8.6.6
+package require -exact Tk 8.6.7
# Create a ::tk namespace
namespace eval ::tk {
diff --git a/unix/configure b/unix/configure
index 565f915..8bd1c0b 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1338,7 +1338,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
TK_VERSION=8.6
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=6
-TK_PATCH_LEVEL=".6"
+TK_PATCH_LEVEL=".7"
VERSION=${TK_VERSION}
LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
@@ -9598,7 +9598,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 Xlib.h.
+ # Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9606,7 +9606,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9633,7 +9633,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
+ if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -9647,18 +9647,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="-lX11 $LIBS"
+ LIBS="-lXt $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/Xlib.h>
+#include <X11/Intrinsic.h>
int
main ()
{
-XrmInitialize ()
+XtMalloc (0)
;
return 0;
}
diff --git a/unix/configure.in b/unix/configure.in
index a4ffee3..b0fb2e9 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=".6"
+TK_PATCH_LEVEL=".7"
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 ceb7256..82a45aa 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.6.6
+Version: 8.6.7
Release: 2
License: BSD
Group: Development/Languages
diff --git a/win/configure b/win/configure
index 3007a06..ff1a0c9 100755
--- a/win/configure
+++ b/win/configure
@@ -1312,7 +1312,7 @@ SHELL=/bin/sh
TK_VERSION=8.6
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=6
-TK_PATCH_LEVEL=".6"
+TK_PATCH_LEVEL=".7"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index 00ec58e..0caac64 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=".6"
+TK_PATCH_LEVEL=".7"
VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
#------------------------------------------------------------------------