← Back to branch summary

~ubuntu-branches/ubuntu/utopic/modules/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/tcl_8.6.patch

  • Committer: Package Import Robot
  • Author(s): Alastair McKinstry, Yaroslav O. Halchenko
  • Date: 2013-12-12 06:34:42 UTC
  • Revision ID: package-import@ubuntu.com-20131212063442-520ywmloz3ed4dyd
Tags: 3.2.10-8
[Yaroslav O. Halchenko]
* debian/sh
 - enable init script for zsh. Closes #731974.
* Add support for tcl < 8.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/tcl_8.6.patch
1
1
Author: Alastair McKinstry <mckinstry@debian.org>
2
2
Description: Changes needed for Tcl8.6
3
 
Last-Updated: 2013-06-11
 
3
Last-Updated: 2013-12-12
4
4
Forwarded: no
5
5
 
6
6
Index: modules-3.2.10/cmdModule.c
7
7
===================================================================
8
 
--- modules-3.2.10.orig/cmdModule.c     2013-06-11 13:36:11.000000000 +0100
9
 
+++ modules-3.2.10/cmdModule.c  2013-06-11 19:09:18.000000000 +0100
 
8
--- modules-3.2.10.orig/cmdModule.c     2013-12-12 00:58:41.000000000 +0000
 
9
+++ modules-3.2.10/cmdModule.c  2013-12-12 01:02:40.000000000 +0000
10
10
@@ -535,7 +535,7 @@
11
11
 {
12
12
     FILE       *infile;
16
16
     EM_RetVal   em_result = EM_OK;
17
17
     char       *cmd;
18
18
     Tcl_DString         cmdbuf;
19
 
@@ -640,8 +640,9 @@
 
19
@@ -640,8 +640,14 @@
20
20
             case TCL_OK:       gotPartial = 0;
21
21
                                continue;       /** while **/
22
22
            
23
23
-            case TCL_ERROR:    interp->errorLine = ((linenum-1)-gotPartial) +
24
24
-                                   interp->errorLine;
25
25
+            case TCL_ERROR:    
 
26
+#if (TCL_MAJOR_VERSION > 8 || TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 5)
26
27
+                       errLine = Tcl_GetErrorLine(interp);
27
28
+                        Tcl_SetErrorLine(interp, ((linenum-1)-gotPartial) + errLine);
 
29
+#else /* before tcl 8.6 */
 
30
+                        interp->errorLine = ((linenum-1)-gotPartial) +
 
31
+                            interp->errorLine;
 
32
+#endif
28
33
                                /* FALLTHROUGH */
29
34
 
30
35
             case TCL_LEVEL0_RETURN: