Etusivu Tutki Apua
Kirjaudu sisään
AndDT
/
slackbuilds
Tarkkaile 1
Äänestä 0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Branch: dive
Branchit Tagit
slackbuilds
/
graphics
/
tclblt
/
patches
/
tcl8.6.patch

tcl8.6.patch 3.3 KB
Pysyvä linkki Historia Raaka

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192 
  1. Description: Patch replaces the direct usage of deprecated interp->result
    2. 

  2.     by Tcl_SetResult() and Tcl_GetStringResult() calls making it possible
    3. 

  3.     to build using Tcl/Tk 8.6.
    4. 

  4. Last-Modified: Fri, 04 Jul 2014 09:20:48 +0400
    5. 

  5. 

  6. --- a/generic/bltScrollbar.c
    7. 

  7. +++ b/generic/bltScrollbar.c
    8. 

  8. @@ -588,7 +588,7 @@
    9. 

  9.  	} else {
    10. 

  10.  	    fraction = ((double)pixels / (double)barWidth);
    11. 

  11.  	}
    12. 

  12. -	sprintf(interp->result, "%g", fraction);
    13. 

  13. +	sprintf(Tcl_GetStringResult(interp), "%g", fraction);
    14. 

  14.      } else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) {
    15. 

  15.  	int x, y, pos, barWidth;
    16. 

  16.  	double fraction;
    17. 

  17. --- a/generic/bltTed.c
    18. 

  18. +++ b/generic/bltTed.c
    19. 

  19. @@ -1504,7 +1504,7 @@
    20. 

  20.  	tablePtr->flags |= ARRANGE_PENDING;
    21. 

  21.  	Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
    22. 

  22.      }
    23. 

  23. -    interp->result = Tk_PathName(tedPtr->tkwin);
    24. 

  24. +    Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
    25. 

  25.      tedPtr->flags |= LAYOUT_PENDING;
    26. 

  26.      EventuallyRedraw(tedPtr);
    27. 

  27.      return TCL_OK;
    28. 

  28. @@ -1678,7 +1678,7 @@
    29. 

  29.  	    tedPtr->activeRectArr[4].width = grip - 1;
    30. 

  30.  	    tedPtr->activeRectArr[4].height = grip - 1;
    31. 

  31.  
    32. 

  32. -	    interp->result = Tk_PathName(entryPtr->tkwin);
    33. 

  33. +	    Tcl_SetResult(interp, (char*)Tk_PathName(entryPtr->tkwin), TCL_VOLATILE);
    34. 

  34.  	    active = 1;
    35. 

  35.  	    break;
    36. 

  36.  	}
    37. 

  37. @@ -1751,7 +1751,7 @@
    38. 

  38.  	tablePtr->flags |= ARRANGE_PENDING;
    39. 

  39.  	Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
    40. 

  40.      }
    41. 

  41. -    interp->result = Tk_PathName(tedPtr->tkwin);
    42. 

  42. +    Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
    43. 

  43.      tedPtr->flags |= LAYOUT_PENDING;
    44. 

  44.      EventuallyRedraw(tedPtr);
    45. 

  45.      return TCL_OK;
    46. 

  46. --- a/generic/bltVecMath.c
    47. 

  47. +++ b/generic/bltVecMath.c
    48. 

  48. @@ -834,20 +834,20 @@
    49. 

  49.      if ((errno == EDOM) || (value != value)) {
    50. 

  50.  	Tcl_AppendResult(interp, "domain error: argument not in valid range",
    51. 

  51.  	    (char *)NULL);
    52. 

  52. -	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", interp->result,
    53. 

  53. +	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", Tcl_GetStringResult(interp),
    54. 

  54.  	    (char *)NULL);
    55. 

  55.      } else if ((errno == ERANGE) || IS_INF(value)) {
    56. 

  56.  	if (value == 0.0) {
    57. 

  57.  	    Tcl_AppendResult(interp, 
    58. 

  58.  			     "floating-point value too small to represent",
    59. 

  59.  		(char *)NULL);
    60. 

  60. -	    Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", interp->result,
    61. 

  61. +	    Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", Tcl_GetStringResult(interp),
    62. 

  62.  		(char *)NULL);
    63. 

  63.  	} else {
    64. 

  64.  	    Tcl_AppendResult(interp, 
    65. 

  65.  			     "floating-point value too large to represent",
    66. 

  66.  		(char *)NULL);
    67. 

  67. -	    Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", interp->result,
    68. 

  68. +	    Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", Tcl_GetStringResult(interp),
    69. 

  69.  		(char *)NULL);
    70. 

  70.  	}
    71. 

  71.      } else {
    72. 

  72. @@ -856,7 +856,7 @@
    73. 

  73.  	sprintf(buf, "%d", errno);
    74. 

  74.  	Tcl_AppendResult(interp, "unknown floating-point error, ",
    75. 

  75.  	    "errno = ", buf, (char *)NULL);
    76. 

  76. -	Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", interp->result,
    77. 

  77. +	Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", Tcl_GetStringResult(interp),
    78. 

  78.  	    (char *)NULL);
    79. 

  79.      }
    80. 

  80.  }
    81. 

  81. --- a/generic/bltTreeCmd.c
    82. 

  82. +++ b/generic/bltTreeCmd.c
    83. 

  83. @@ -8560,7 +8560,7 @@
    84. 

  84.          if (result == TCL_CONTINUE ) continue;
    85. 

  85.  	if (result == TCL_ERROR) {
    86. 

  86.              Tcl_AppendResult(interp,
    87. 

  87. -            "\n    (\"tree foreach\" body line ", Blt_Itoa(interp->errorLine), ")\n", 0);
    88. 

  88. +            "\n    (\"tree foreach\" body line ", Blt_Itoa(Tcl_GetErrorLine(interp)), ")\n", 0);
    89. 

  89.               break;
    90. 

  90.          }
    91. 

  91.          if (result != TCL_OK) {
    92. 

  92.