[tclx] Fixed build with tcl/tk-8.6 (by tcl86 patch)

[Jaroslav Škarvada]

commit 0994cac27ef475990555b11b50b081f1ca932e37
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Jun 10 17:31:49 2014 +0200

    Fixed build with tcl/tk-8.6 (by tcl86 patch)
    
    - Fixed bogus dates in changelog (best effort)

 tclx-8.4-tcl86.patch |   26 ++++++++++++++++++++++++++
 tclx.spec            |   18 ++++++++++++------
 2 files changed, 38 insertions(+), 6 deletions(-)
---
diff --git a/tclx-8.4-tcl86.patch b/tclx-8.4-tcl86.patch
new file mode 100644
index 0000000..ca0c6b5
--- /dev/null
+++ b/tclx-8.4-tcl86.patch
@@ -0,0 +1,26 @@
+diff --git a/generic/tclXgeneral.c b/generic/tclXgeneral.c
+index dfa7c66..014e38f 100644
+--- a/generic/tclXgeneral.c
++++ b/generic/tclXgeneral.c
+@@ -405,7 +405,7 @@ TclX_LoopObjCmd (dummy, interp, objc, objv)
+ 		char buf [64];
+ 		
+ 		sprintf (buf, "\n    (\"loop\" body line %d)", 
+-			interp->errorLine);
++			Tcl_GetErrorLine(interp));
+ 		Tcl_AddErrorInfo (interp, buf);
+ 	    }
+ 	    break;
+diff --git a/generic/tclXlib.c b/generic/tclXlib.c
+index af8dd7a..2c002d6 100644
+--- a/generic/tclXlib.c
++++ b/generic/tclXlib.c
+@@ -239,7 +239,7 @@ EvalFilePart (interp, fileName, offset, length)
+      */
+     buf = ckalloc (strlen (fileName) + 64);
+     sprintf (buf, "\n    (file \"%s\" line %d)", fileName,
+-             interp->errorLine);
++             Tcl_GetErrorLine(interp));
+     Tcl_AddErrorInfo (interp, buf);
+     ckfree (buf);
+     goto errorExit;
diff --git a/tclx.spec b/tclx.spec
index 7d2ad96..0d2690c 100644
--- a/tclx.spec
+++ b/tclx.spec
@@ -11,7 +11,7 @@
 Summary: Extensions for Tcl and Tk
 Name: tclx
 Version: %{major_ver}.0
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
@@ -23,6 +23,7 @@ BuildRequires: tcl-devel >= %{tcltk_ver}, tk-devel >= %{tcltk_ver}
 Patch1: tclx-%{major_ver}-varinit.patch
 Patch2: tclx-%{major_ver}-relid.patch
 Patch3: tclx-%{major_ver}-man.patch
+Patch4: tclx-%{major_ver}-tcl86.patch
 
 %description
 Extended Tcl (TclX) is a set of extensions to the Tcl programming language.
@@ -45,6 +46,7 @@ applications embedding tclx.
 %patch1 -p1 -b .1.varinit
 %patch2 -p1 -b .2.relid
 %patch3 -p1 -b .3.patch
+%patch4 -p1 -b .4.tcl86
 
 # patch2 touches tcl.m4
 
@@ -86,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README
-%{_libdir}/tcl8.5/tclx8.4/
+%{_libdir}/tcl8.6/tclx8.4/
 %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %exclude %{_mandir}/man3/CmdWrite.*
 %exclude %{_mandir}/man3/Handles.*
@@ -102,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Keylist.3*
 
 %changelog
+* Tue Jun 10 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 8.4.0-23
+- Fixed build with tcl/tk-8.6 (by tcl86 patch)
+- Fixed bogus dates in changelog (best effort)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.4.0-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -133,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.4.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Tue Sep 29 2008 Marcela Mašláňová <mmaslano at redhat.com> - 8.4.0-12
+* Mon Sep 29 2008 Marcela Mašláňová <mmaslano at redhat.com> - 8.4.0-12
 - review, thanks for help to Patrice Dumas
 
 * Tue Sep 23 2008 Marcela Maslanova <mmaslano at redhat.com> - 8.4.0-11
@@ -151,10 +157,10 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Mar 20 2007 Marcela Maslanova <mmaslano at redhat.com> - 8.4.0-7
 - rebuild for merge review
 
-* Thu Mar 7 2007 Marcela Maslanova <mmaslano at redhat.com> - 8.4.0-6
+* Wed Mar 7 2007 Marcela Maslanova <mmaslano at redhat.com> - 8.4.0-6
 - rebuild for merge review
 
-* Tue Oct 2 2006 Marcela Maslanova <mmaslano at redhat.com> - 8.4.0-5
+* Mon Oct 2 2006 Marcela Maslanova <mmaslano at redhat.com> - 8.4.0-5
 - rebuild
 
 * Fri Sep 15 2006 Marcela Maslanova <mmaslano at redhat.com> - 8.4-4
@@ -278,7 +284,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Jan 07 2002 Florian La Roche <Florian.LaRoche at redhat.de>
 - fix config.guess and config.sub to newer versions
 
-* Mon Aug  8 2001 Adrian Havill <havill at redhat.com>
+* Wed Aug  8 2001 Adrian Havill <havill at redhat.com>
 - re-enable glibc string and math inlines; recent gcc is a-ok.
 - optimize at -O2 instead of -O
 - rename "soname" patches related to makefile/autoconf changes