From e3fe238d0a72f92aeec5f6104dc0acff33fb6447 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 11 Apr 2008 19:00:45 +0000 Subject: * generic/tk.h: Bump version number to 8.5.3b1 to distinguish * library/tk.tcl: CVS development snapshots from the 8.5.2 and * unix/configure.in: 8.5.3 releases. * unix/tk.spec: * win/configure.in: * unix/configure: autoconf (2.59) * win/configure: --- ChangeLog | 11 +++++++++++ generic/tk.h | 6 +++--- library/tk.tcl | 4 ++-- unix/configure | 14 +++++++------- unix/configure.in | 4 ++-- unix/tk.spec | 4 ++-- win/configure | 2 +- win/configure.in | 4 ++-- 8 files changed, 30 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index b91409b..dfcb0ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-04-11 Don Porter + + * generic/tk.h: Bump version number to 8.5.3b1 to distinguish + * library/tk.tcl: CVS development snapshots from the 8.5.2 and + * unix/configure.in: 8.5.3 releases. + * unix/tk.spec: + * win/configure.in: + + * unix/configure: autoconf (2.59) + * win/configure: + 2008-04-07 Jeff Hobbs * generic/tkWindow.c (Initialize): fix double-free on Tk_ParseArgv diff --git a/generic/tk.h b/generic/tk.h index 86693dc..ca0fb2d 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,7 +12,7 @@ * 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.109.2.1 2008/04/11 19:00:47 dgp Exp $ */ #ifndef _TK @@ -53,10 +53,10 @@ 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_RELEASE_SERIAL 3 #define TK_VERSION "8.5" -#define TK_PATCH_LEVEL "8.5.2" +#define TK_PATCH_LEVEL "8.5.3b1" /* * A special definition used to allow this header file to be included from diff --git a/library/tk.tcl b/library/tk.tcl index 7c31b92..f675263 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -3,7 +3,7 @@ # Initialization script normally executed in the interpreter for each # Tk-based application. Arranges class bindings for widgets. # -# RCS: @(#) $Id: tk.tcl,v 1.73 2008/03/28 18:13:39 dgp Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.73.2.1 2008/04/11 19:00:48 dgp Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -17,7 +17,7 @@ package require Tcl 8.5 ;# Guard against [source] in an 8.4- interp # Insist on running with compatible version of Tcl package require Tcl 8.5.0-8.6 # Verify that we have Tk binary and script components from the same release -package require -exact Tk 8.5.2 +package require -exact Tk 8.5.3b1 # Create a ::tk namespace namespace eval ::tk { diff --git a/unix/configure b/unix/configure index c20784a..d028b99 100755 --- a/unix/configure +++ b/unix/configure @@ -1337,7 +1337,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".2" +TK_PATCH_LEVEL=".3b1" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" @@ -9575,7 +9575,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. */ @@ -9583,7 +9583,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 @@ -9610,7 +9610,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 @@ -9624,18 +9624,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 d2ca8d1..c8aba0e 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.153 2008/03/28 18:13:41 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.153.2.1 2008/04/11 19:00:50 dgp Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) @@ -27,7 +27,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [ TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".2" +TK_PATCH_LEVEL=".3b1" 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 d93a62a..5e34e88 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -1,11 +1,11 @@ -# $Id: tk.spec,v 1.34 2008/03/28 18:13:42 dgp Exp $ +# $Id: tk.spec,v 1.34.2.1 2008/04/11 19:00:50 dgp Exp $ # This file is the basis for a binary Tk Linux RPM. %{!?directory:%define directory /usr/local} Name: tk Summary: Tk graphical toolkit for the Tcl scripting language. -Version: 8.5.2 +Version: 8.5.3b1 Release: 2 License: BSD Group: Development/Languages diff --git a/win/configure b/win/configure index 5932de2..0eefda0 100755 --- a/win/configure +++ b/win/configure @@ -1309,7 +1309,7 @@ SHELL=/bin/sh TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".2" +TK_PATCH_LEVEL=".3b1" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/configure.in b/win/configure.in index ff948ec..0038327 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.77 2008/03/28 18:13:42 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.77.2.1 2008/04/11 19:00:51 dgp Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.59) @@ -16,7 +16,7 @@ SHELL=/bin/sh TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".2" +TK_PATCH_LEVEL=".3b1" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ -- cgit v0.12