[q] Fix FTBFS with tcl-8.6 (#1106959)

Yaakov Selkowitz yselkowitz at fedoraproject.org
Tue Jul 8 02:56:59 UTC 2014


commit 489a73662ee7d55e9e2093cfd59161d822a691d9
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Mon Jun 23 19:24:03 2014 -0500

    Fix FTBFS with tcl-8.6 (#1106959)

 q-7.11-tcl86.patch |   12 ++++++++++++
 q.spec             |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/q-7.11-tcl86.patch b/q-7.11-tcl86.patch
new file mode 100644
index 0000000..29e6316
--- /dev/null
+++ b/q-7.11-tcl86.patch
@@ -0,0 +1,12 @@
+Direct access to Tcl_Interp->result was deprecated in 8.6
+
+--- a/modules/tk/tk.c
++++ b/modules/tk/tk.c
+@@ -76,6 +76,7 @@ char *strchr (), *strrchr ();
+ #endif
+ 
+ #define TCL_THREADS
++#define USE_INTERP_RESULT
+ #include <tcl.h>
+ #include <tk.h>
+ 
diff --git a/q.spec b/q.spec
index 0528c76..e2c30cb 100644
--- a/q.spec
+++ b/q.spec
@@ -1,6 +1,6 @@
 Name: 		q
 Version: 	7.11
-Release: 	20%{?dist}
+Release: 	21%{?dist}
 Summary: 	Equational programming language
 Group: 		Development/Languages
 License: 	GPLv2+
@@ -16,6 +16,8 @@ Requires(post): /sbin/ldconfig /sbin/install-info
 Requires(postun): /sbin/ldconfig /sbin/install-info
 # bz#1037264. Upstream support discontinued according to offsite, so nothing send - just add patch in Fedora.
 Patch0:	q-7.11-format-security.patch
+# bz#1106959
+Patch1: q-7.11-tcl86.patch
 
 %description
 Q is a powerful and extensible functional programming language based
@@ -78,6 +80,7 @@ Requires:	libtool
 %prep
 %setup -q
 %patch0 -p0 -b .format-security
+%patch1 -p1 -b .tcl86
 sed -i 's|@libtool@|libtool|' src/Makefile.in
 
 rm -fr libltdl* libtool
@@ -168,6 +171,9 @@ fi
 
 
 %changelog
+* Tue Jun 24 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 7.11-21
+- Fix FTBFS with tcl-8.6 (#1106959)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.11-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list