[mingw-tcl] update to 8.5.14

Tue Sep 3 15:56:14 UTC 2013

commit d31db5bae53f592f200b53f6cfb6db20781d2427
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Tue Sep 3 17:55:55 2013 +0200

    update to 8.5.14

 .gitignore                                         |    1 +
 mingw-tcl.spec                                     |   13 ++++---
 sources                                            |    2 +-
 ...5.1-autopath.patch => tcl-8.5.14-autopath.patch |   27 ++++++++------
 tcl-8.5.10-conf.patch => tcl-8.5.14-conf.patch     |   17 +++------
 tcl-8.5.12-hidden.patch => tcl-8.5.14-hidden.patch |   36 ++++++++++---------
 6 files changed, 49 insertions(+), 47 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 61ea8b0..a549320 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ tcl8.5.8-src.tar.gz
 /tcl8.5.9-src.tar.gz
 /tcl8.5.11-src.tar.gz
 /tcl8.5.13-src.tar.gz
+/tcl8.5.14-src.tar.gz
diff --git a/mingw-tcl.spec b/mingw-tcl.spec
index a4253c2..26f2bda 100644
--- a/mingw-tcl.spec
+++ b/mingw-tcl.spec
@@ -3,14 +3,14 @@
 %global majorver1 8
 %global majorver2 5
 %global majorver %{majorver1}.%{majorver2}
-%global	vers %{majorver}.13
+%global	vers %{majorver}.14
 
 %global name1 tcl
 
 Summary: MinGW Windows Tool Command Language, pronounced tickle
 Name: mingw-%{name1}
 Version: %{vers}
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: TCL
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -33,9 +33,9 @@ BuildRequires: mingw32-runtime
 BuildRequires: mingw64-runtime
 BuildRequires: mingw32-headers
 BuildRequires: mingw64-headers
-Patch0: tcl-8.5.1-autopath.patch
-Patch1: tcl-8.5.10-conf.patch
-Patch2: tcl-8.5.12-hidden.patch
+Patch0: tcl-8.5.14-autopath.patch
+Patch1: tcl-8.5.14-conf.patch
+Patch2: tcl-8.5.14-hidden.patch
 Patch4: tcl-8.5.6-mingw.patch
 Patch5: tcl-nativetclsh.patch
 Patch6: tcl-mingw-w64-compatibility.patch
@@ -195,6 +195,9 @@ mv $RPM_BUILD_ROOT/%{mingw64_libdir}/reg* $RPM_BUILD_ROOT/%{mingw64_libdir}/%{na
 %doc license.terms
 
 %changelog
+* Tue Sep  3 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 8.5.14-1
+- update to 8.5.14
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.5.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index cee9e27..fd9db3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa3a9bf9b2d6ed2431f1baa46f4058b8  tcl8.5.13-src.tar.gz
+44b50e58ab45dd272f6714dce2129123  tcl8.5.14-src.tar.gz
diff --git a/tcl-8.5.1-autopath.patch b/tcl-8.5.14-autopath.patch
similarity index 66%
rename from tcl-8.5.1-autopath.patch
rename to tcl-8.5.14-autopath.patch
index 87317d3..cad89f0 100644
--- a/tcl-8.5.1-autopath.patch
+++ b/tcl-8.5.14-autopath.patch
@@ -1,7 +1,8 @@
-diff -up tcl8.5.7/library/auto.tcl.old tcl8.5.7/library/auto.tcl
---- tcl8.5.7/library/auto.tcl.old	2006-11-03 01:34:52.000000000 +0100
-+++ tcl8.5.7/library/auto.tcl	2009-05-18 10:28:16.337102378 +0200
-@@ -85,6 +85,13 @@ proc tcl_findLibrary {basename version p
+diff --git a/library/auto.tcl b/library/auto.tcl
+index f7cf5f0..feb0a22 100644
+--- a/library/auto.tcl
++++ b/library/auto.tcl
+@@ -84,6 +84,13 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
  	    lappend dirs $value
  	}
  
@@ -15,10 +16,11 @@ diff -up tcl8.5.7/library/auto.tcl.old tcl8.5.7/library/auto.tcl
  	# 3. Relative to auto_path directories.  This checks relative to the
  	# Tcl library as well as allowing loading of libraries added to the
  	# auto_path that is not relative to the core library or binary paths.
-diff -up tcl8.5.7/library/init.tcl.old tcl8.5.7/library/init.tcl
---- tcl8.5.7/library/init.tcl.old	2009-04-10 18:54:51.000000000 +0200
-+++ tcl8.5.7/library/init.tcl	2009-05-18 10:25:25.904853164 +0200
-@@ -48,16 +48,11 @@ if {![info exists auto_path]} {
+diff --git a/library/init.tcl b/library/init.tcl
+index 071e6df..7713d3e 100644
+--- a/library/init.tcl
++++ b/library/init.tcl
+@@ -47,16 +47,11 @@ if {![info exists auto_path]} {
  }
  namespace eval tcl {
      variable Dir
@@ -36,10 +38,11 @@ diff -up tcl8.5.7/library/init.tcl.old tcl8.5.7/library/init.tcl
      catch {
  	foreach Dir $::tcl_pkgPath {
  	    if {$Dir ni $::auto_path} {
-diff -up tcl8.5.7/unix/configure.in.old tcl8.5.7/unix/configure.in
---- tcl8.5.7/unix/configure.in.old	2009-04-15 21:30:05.000000000 +0200
-+++ tcl8.5.7/unix/configure.in	2009-05-18 10:21:30.987855050 +0200
-@@ -833,9 +833,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+diff --git a/unix/configure.in b/unix/configure.in
+index e22a7d3..658b3ed 100755
+--- a/unix/configure.in
++++ b/unix/configure.in
+@@ -840,9 +840,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then
diff --git a/tcl-8.5.10-conf.patch b/tcl-8.5.14-conf.patch
similarity index 57%
rename from tcl-8.5.10-conf.patch
rename to tcl-8.5.14-conf.patch
index dd90b06..bbd3915 100644
--- a/tcl-8.5.10-conf.patch
+++ b/tcl-8.5.14-conf.patch
@@ -1,6 +1,8 @@
---- tcl8.5.0/unix/tcl.m4.conf	2007-12-20 10:48:05.000000000 +0100
-+++ tcl8.5.0/unix/tcl.m4	2007-12-20 10:48:52.000000000 +0100
-@@ -1427,12 +1427,12 @@ dnl AC_CHECK_TOOL(AR, ar)
+diff --git a/unix/tcl.m4 b/unix/tcl.m4
+index 668fa2f..a50e4d1 100644
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -1420,12 +1420,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -15,12 +17,3 @@
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
  	    AS_IF([test $do64bit = yes], [
-@@ -1464,7 +1464,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_SUFFIX=".so"
- 
--	    SHLIB_LD='${CC} -shared'
-+	    SHLIB_LD='${CC} ${CFLAGS} -shared -fPIC'
- 	    DL_OBJS=""
- 	    DL_LIBS="-ldl"
- 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/tcl-8.5.12-hidden.patch b/tcl-8.5.14-hidden.patch
similarity index 57%
rename from tcl-8.5.12-hidden.patch
rename to tcl-8.5.14-hidden.patch
index be4ead4..aa977d0 100644
--- a/tcl-8.5.12-hidden.patch
+++ b/tcl-8.5.14-hidden.patch
@@ -1,19 +1,8 @@
-diff -up tcl8.5.6/generic/tclPort.h.old tcl8.5.6/generic/tclPort.h
---- tcl8.5.6/generic/tclPort.h.old	2009-02-09 16:40:08.000000000 +0100
-+++ tcl8.5.6/generic/tclPort.h	2009-02-09 16:40:26.000000000 +0100
-@@ -24,7 +24,7 @@
- #endif
- #include "tcl.h"
- #if !defined(_WIN32)
--#   include "tclUnixPort.h"
-+#   include "../unix/tclUnixPort.h"
- #endif
- 
- #if !defined(LLONG_MIN)
-diff -up tcl8.5.6/generic/tclInt.h.bbb tcl8.5.6/generic/tclInt.h
---- tcl8.5.6/generic/tclInt.h.bbb	2008-11-14 01:22:39.000000000 +0100
-+++ tcl8.5.6/generic/tclInt.h	2009-02-11 13:05:13.000000000 +0100
-@@ -2773,7 +2773,7 @@ MODULE_SCOPE void	TclClockInit(Tcl_Inter
+diff --git a/generic/tclInt.h b/generic/tclInt.h
+index 92251fe..b79edf6 100644
+--- a/generic/tclInt.h
++++ b/generic/tclInt.h
+@@ -2807,7 +2807,7 @@ MODULE_SCOPE void	TclClockInit(Tcl_Interp *interp);
  MODULE_SCOPE int	TclClockOldscanObjCmd(
  			    ClientData clientData, Tcl_Interp *interp,
  			    int objc, Tcl_Obj *const objv[]);
@@ -22,7 +11,7 @@ diff -up tcl8.5.6/generic/tclInt.h.bbb tcl8.5.6/generic/tclInt.h
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
  MODULE_SCOPE int	Tcl_ConcatObjCmd(ClientData clientData,
-@@ -2934,7 +2934,7 @@ MODULE_SCOPE int	Tcl_RegsubObjCmd(Client
+@@ -2968,7 +2968,7 @@ MODULE_SCOPE int	Tcl_RegsubObjCmd(ClientData clientData,
  MODULE_SCOPE int	Tcl_RenameObjCmd(ClientData clientData,
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
@@ -31,3 +20,16 @@ diff -up tcl8.5.6/generic/tclInt.h.bbb tcl8.5.6/generic/tclInt.h
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
  MODULE_SCOPE int	Tcl_ScanObjCmd(ClientData clientData,
+diff --git a/generic/tclPort.h b/generic/tclPort.h
+index 12a60db..d817154 100644
+--- a/generic/tclPort.h
++++ b/generic/tclPort.h
+@@ -20,7 +20,7 @@
+ #if defined(_WIN32)
+ #   include "tclWinPort.h"
+ #else
+-#   include "tclUnixPort.h"
++#   include "../unix/tclUnixPort.h"
+ #endif
+ #include "tcl.h"
+ 
