| 1 |
jlec 13/01/31 08:09:39 |
| 2 |
|
| 3 |
Modified: vtk-5.10.1-tcl8.6.patch |
| 4 |
Log: |
| 5 |
sci-libs/vtk: Backport upstream patch for tcl/tk-8.6.0, #454762 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: vtk-5.10.1-tcl8.6.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- vtk-5.10.1-tcl8.6.patch 15 Jan 2013 13:57:49 -0000 1.1 |
| 23 |
+++ vtk-5.10.1-tcl8.6.patch 31 Jan 2013 08:09:39 -0000 1.2 |
| 24 |
@@ -1,40 +1,57 @@ |
| 25 |
- Common/vtkTclUtil.cxx | 8 ++++---- |
| 26 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
| 27 |
+ Common/vtkTclUtil.cxx | 19 ++++++++++++++----- |
| 28 |
+ 1 file changed, 14 insertions(+), 5 deletions(-) |
| 29 |
|
| 30 |
diff --git a/Common/vtkTclUtil.cxx b/Common/vtkTclUtil.cxx |
| 31 |
-index 390b0a4..0a925ee 100644 |
| 32 |
+index 390b0a4..2b7bccb 100644 |
| 33 |
--- a/Common/vtkTclUtil.cxx |
| 34 |
+++ b/Common/vtkTclUtil.cxx |
| 35 |
-@@ -490,13 +490,13 @@ VTKTCL_EXPORT void vtkTclVoidFunc(void *arg) |
| 36 |
+@@ -21,6 +21,12 @@ |
| 37 |
+ #include <string> |
| 38 |
+ #include <vtksys/SystemTools.hxx> |
| 39 |
+ |
| 40 |
++#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) |
| 41 |
++#define vtkTclGetErrorLine(m) (m->errorLine) |
| 42 |
++#else |
| 43 |
++#define vtkTclGetErrorLine(m) (Tcl_GetErrorLine(m)) |
| 44 |
++#endif |
| 45 |
++ |
| 46 |
+ extern "C" |
| 47 |
+ { |
| 48 |
+ #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) |
| 49 |
+@@ -490,13 +496,15 @@ VTKTCL_EXPORT void vtkTclVoidFunc(void *arg) |
| 50 |
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << |
| 51 |
arg2->command << endl << |
| 52 |
Tcl_GetVar(arg2->interp,(char *)("errorInfo"),0) << |
| 53 |
- " at line number " << arg2->interp->errorLine); |
| 54 |
-+ " at line number " << Tcl_GetErrorLine(arg2->interp)); |
| 55 |
++ " at line number " << |
| 56 |
++ vtkTclGetErrorLine(arg2->interp)); |
| 57 |
} |
| 58 |
else |
| 59 |
{ |
| 60 |
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << |
| 61 |
arg2->command << endl << |
| 62 |
- " at line number " << arg2->interp->errorLine); |
| 63 |
-+ " at line number " << Tcl_GetErrorLine(arg2->interp)); |
| 64 |
++ " at line number " << |
| 65 |
++ vtkTclGetErrorLine(arg2->interp)); |
| 66 |
} |
| 67 |
} |
| 68 |
} |
| 69 |
-@@ -723,14 +723,14 @@ void vtkTclCommand::Execute(vtkObject *, unsigned long, void *) |
| 70 |
+@@ -723,14 +731,15 @@ void vtkTclCommand::Execute(vtkObject *, unsigned long, void *) |
| 71 |
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << |
| 72 |
this->StringCommand << endl << |
| 73 |
Tcl_GetVar(this->Interp,(char *)("errorInfo"),0) << |
| 74 |
- " at line number " << this->Interp->errorLine); |
| 75 |
-+ " at line number " << Tcl_GetErrorLine(this->Interp)); |
| 76 |
++ " at line number " << |
| 77 |
++ vtkTclGetErrorLine(this->Interp)); |
| 78 |
} |
| 79 |
else |
| 80 |
{ |
| 81 |
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << |
| 82 |
this->StringCommand << endl << |
| 83 |
- " at line number " << |
| 84 |
+- " at line number " << |
| 85 |
- this->Interp->errorLine); |
| 86 |
-+ Tcl_GetErrorLine(this->Interp)); |
| 87 |
++ " at line number " << |
| 88 |
++ vtkTclGetErrorLine(this->Interp)); |
| 89 |
} |
| 90 |
} |
| 91 |
else if (res == -1) |
Archives