* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk/files: vtk-5.10.1-tcl8.6.patch
@ 2013-01-15 13:57 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2013-01-15 13:57 UTC (permalink / raw
To: gentoo-commits
jlec 13/01/15 13:57:49
Added: vtk-5.10.1-tcl8.6.patch
Log:
sci-libs/vtk: Better fix for tcl support
(Portage version: 2.2.0_alpha152/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Revision Changes Path
1.1 sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch?rev=1.1&content-type=text/plain
Index: vtk-5.10.1-tcl8.6.patch
===================================================================
Common/vtkTclUtil.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Common/vtkTclUtil.cxx b/Common/vtkTclUtil.cxx
index 390b0a4..0a925ee 100644
--- a/Common/vtkTclUtil.cxx
+++ b/Common/vtkTclUtil.cxx
@@ -490,13 +490,13 @@ VTKTCL_EXPORT void vtkTclVoidFunc(void *arg)
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
arg2->command << endl <<
Tcl_GetVar(arg2->interp,(char *)("errorInfo"),0) <<
- " at line number " << arg2->interp->errorLine);
+ " at line number " << Tcl_GetErrorLine(arg2->interp));
}
else
{
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
arg2->command << endl <<
- " at line number " << arg2->interp->errorLine);
+ " at line number " << Tcl_GetErrorLine(arg2->interp));
}
}
}
@@ -723,14 +723,14 @@ void vtkTclCommand::Execute(vtkObject *, unsigned long, void *)
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
this->StringCommand << endl <<
Tcl_GetVar(this->Interp,(char *)("errorInfo"),0) <<
- " at line number " << this->Interp->errorLine);
+ " at line number " << Tcl_GetErrorLine(this->Interp));
}
else
{
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
this->StringCommand << endl <<
" at line number " <<
- this->Interp->errorLine);
+ Tcl_GetErrorLine(this->Interp));
}
}
else if (res == -1)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk/files: vtk-5.10.1-tcl8.6.patch
@ 2013-01-31 8:09 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2013-01-31 8:09 UTC (permalink / raw
To: gentoo-commits
jlec 13/01/31 08:09:39
Modified: vtk-5.10.1-tcl8.6.patch
Log:
sci-libs/vtk: Backport upstream patch for tcl/tk-8.6.0, #454762
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Revision Changes Path
1.2 sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch
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
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
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
Index: vtk-5.10.1-tcl8.6.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vtk-5.10.1-tcl8.6.patch 15 Jan 2013 13:57:49 -0000 1.1
+++ vtk-5.10.1-tcl8.6.patch 31 Jan 2013 08:09:39 -0000 1.2
@@ -1,40 +1,57 @@
- Common/vtkTclUtil.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ Common/vtkTclUtil.cxx | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/Common/vtkTclUtil.cxx b/Common/vtkTclUtil.cxx
-index 390b0a4..0a925ee 100644
+index 390b0a4..2b7bccb 100644
--- a/Common/vtkTclUtil.cxx
+++ b/Common/vtkTclUtil.cxx
-@@ -490,13 +490,13 @@ VTKTCL_EXPORT void vtkTclVoidFunc(void *arg)
+@@ -21,6 +21,12 @@
+ #include <string>
+ #include <vtksys/SystemTools.hxx>
+
++#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6)
++#define vtkTclGetErrorLine(m) (m->errorLine)
++#else
++#define vtkTclGetErrorLine(m) (Tcl_GetErrorLine(m))
++#endif
++
+ extern "C"
+ {
+ #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)
+@@ -490,13 +496,15 @@ VTKTCL_EXPORT void vtkTclVoidFunc(void *arg)
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
arg2->command << endl <<
Tcl_GetVar(arg2->interp,(char *)("errorInfo"),0) <<
- " at line number " << arg2->interp->errorLine);
-+ " at line number " << Tcl_GetErrorLine(arg2->interp));
++ " at line number " <<
++ vtkTclGetErrorLine(arg2->interp));
}
else
{
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
arg2->command << endl <<
- " at line number " << arg2->interp->errorLine);
-+ " at line number " << Tcl_GetErrorLine(arg2->interp));
++ " at line number " <<
++ vtkTclGetErrorLine(arg2->interp));
}
}
}
-@@ -723,14 +723,14 @@ void vtkTclCommand::Execute(vtkObject *, unsigned long, void *)
+@@ -723,14 +731,15 @@ void vtkTclCommand::Execute(vtkObject *, unsigned long, void *)
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
this->StringCommand << endl <<
Tcl_GetVar(this->Interp,(char *)("errorInfo"),0) <<
- " at line number " << this->Interp->errorLine);
-+ " at line number " << Tcl_GetErrorLine(this->Interp));
++ " at line number " <<
++ vtkTclGetErrorLine(this->Interp));
}
else
{
vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
this->StringCommand << endl <<
- " at line number " <<
+- " at line number " <<
- this->Interp->errorLine);
-+ Tcl_GetErrorLine(this->Interp));
++ " at line number " <<
++ vtkTclGetErrorLine(this->Interp));
}
}
else if (res == -1)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-31 8:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-15 13:57 [gentoo-commits] gentoo-x86 commit in sci-libs/vtk/files: vtk-5.10.1-tcl8.6.patch Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2013-01-31 8:09 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox