diff options
author | dgp <dgp@users.sourceforge.net> | 2008-04-01 16:30:51 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2008-04-01 16:30:51 (GMT) |
commit | 5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25 (patch) | |
tree | add0631b057edf9490c467e2c9847231e0c5379e /unix | |
parent | 05d2b1f699928197cd82a59538c4b55d22f2df7c (diff) | |
download | tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.zip tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.tar.gz tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.tar.bz2 |
* 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:
Diffstat (limited to 'unix')
-rwxr-xr-x | unix/configure | 34 | ||||
-rw-r--r-- | unix/configure.in | 16 | ||||
-rw-r--r-- | unix/tk.spec | 8 |
3 files changed, 21 insertions, 37 deletions
diff --git a/unix/configure b/unix/configure index 71b4a73..feee89d 100755 --- a/unix/configure +++ b/unix/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for tk 8.5. +# Generated by GNU Autoconf 2.59 for tk 8.6. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -267,8 +267,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='tk' PACKAGE_TARNAME='tk' -PACKAGE_VERSION='8.5' -PACKAGE_STRING='tk 8.5' +PACKAGE_VERSION='8.6' +PACKAGE_STRING='tk 8.6' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -777,7 +777,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tk 8.5 to adapt to many kinds of systems. +\`configure' configures tk 8.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -838,7 +838,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tk 8.5:";; + short | recursive ) echo "Configuration of tk 8.6:";; esac cat <<\_ACEOF @@ -980,7 +980,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -tk configure 8.5 +tk configure 8.6 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -994,7 +994,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tk $as_me 8.5, which was +It was created by tk $as_me 8.6, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1334,10 +1334,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -TK_VERSION=8.5 +TK_VERSION=8.6 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".2" +TK_MINOR_VERSION=6 +TK_PATCH_LEVEL="a0" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" @@ -1583,16 +1583,6 @@ echo "${ECHO_T}$BUILD_TCLSH" >&6 -if test "${TCL_VERSION}" != "${TK_VERSION}"; then - { { echo "$as_me:$LINENO: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. -Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. -Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&5 -echo "$as_me: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. -Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. -Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&2;} - { (exit 1); exit 1; }; } -fi - #------------------------------------------------------------------------ # Handle the --prefix=... option #------------------------------------------------------------------------ @@ -11172,7 +11162,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by tk $as_me 8.5, which was +This file was extended by tk $as_me 8.6, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11230,7 +11220,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -tk config.status 8.5 +tk config.status 8.6 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/unix/configure.in b/unix/configure.in index d2ca8d1..05b4cdb 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,9 +3,9 @@ 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.154 2008/04/01 16:30:55 dgp Exp $ -AC_INIT([tk],[8.5]) +AC_INIT([tk],[8.6]) AC_PREREQ(2.59) dnl This is only used when included from macosx/configure.ac @@ -24,10 +24,10 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [ #endif /* _TKCONFIG */]) ]) -TK_VERSION=8.5 +TK_VERSION=8.6 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".2" +TK_MINOR_VERSION=6 +TK_PATCH_LEVEL="a0" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" @@ -41,12 +41,6 @@ SC_LOAD_TCLCONFIG SC_PROG_TCLSH SC_BUILD_TCLSH -if test "${TCL_VERSION}" != "${TK_VERSION}"; then - AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. -Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. -Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}.]) -fi - #------------------------------------------------------------------------ # Handle the --prefix=... option #------------------------------------------------------------------------ diff --git a/unix/tk.spec b/unix/tk.spec index d93a62a..977b37e 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -1,19 +1,19 @@ -# $Id: tk.spec,v 1.34 2008/03/28 18:13:42 dgp Exp $ +# $Id: tk.spec,v 1.35 2008/04/01 16:30:56 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.6a0 Release: 2 License: BSD Group: Development/Languages Source: http://prdownloads.sourceforge.net/tcl/tk%{version}-src.tar.gz URL: http://www.tcl.tk/ Buildroot: /var/tmp/%{name}%{version} -Buildrequires: XFree86-devel tcl = %version -Requires: tcl = %version +Buildrequires: XFree86-devel tcl >= 8.5 +Requires: tcl >= 8.5 %description The Tcl (Tool Command Language) provides a powerful platform for |