aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@riseup.net>2021-01-30 15:21:40 +0100
committerAndrew Ammerlaan <andrewammerlaan@riseup.net>2021-01-30 15:21:40 +0100
commitb82206858b0c9ab584060c5697960bb44b5eefa4 (patch)
treea32302cb262787f3517ffe163e2085d2ff1a00b2 /sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch
parentsci-misc/elmer-elmer-grid: remove pack, included in elmer-fem now (diff)
downloadsci-b82206858b0c9ab584060c5697960bb44b5eefa4.tar.gz
sci-b82206858b0c9ab584060c5697960bb44b5eefa4.tar.bz2
sci-b82206858b0c9ab584060c5697960bb44b5eefa4.zip
sci-misc/elmer-front: remove pack, obsolete
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Diffstat (limited to 'sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch')
-rw-r--r--sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch
deleted file mode 100644
index 7fa7605b7..000000000
--- a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch
+++ /dev/null
@@ -1,55 +0,0 @@
- src/ecif_userinterface_TCL.cpp | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/ecif_userinterface_TCL.cpp b/src/ecif_userinterface_TCL.cpp
-index 7f581a8..53e0432 100644
---- a/src/ecif_userinterface_TCL.cpp
-+++ b/src/ecif_userinterface_TCL.cpp
-@@ -622,7 +622,11 @@ UserInterface_TCL::createTclEnvironment(Hinst application)
-
- // *** Invoke application-specific initialization.
- if (My_Tcl_AppInit(interp) != TCL_OK) {
-+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
- WishPanic("My_Tcl_AppInit failed: %s\n", interp->result);
-+#else
-+ WishPanic("My_Tcl_AppInit failed: %s\n", Tcl_GetStringResult(interp));
-+#endif
- }
-
- // Result value is the Tcl interpreter
-@@ -4685,11 +4689,19 @@ UserInterface_TCL::sendCommandToGui(Tcl_Interp* interp, const char* cmd, const c
- Tcl_DStringFree( &dstring );
- }
-
-+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
- if (interp->result[0] != '\0') {
-+#else
-+ if (Tcl_GetStringResult(interp)[0] != '\0') {
-+#endif
-
- char err_buf[256];
- err_buf[255] = '\0';
-+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
- strncpy(err_buf, interp->result, 255);
-+#else
-+ strncpy(err_buf, Tcl_GetStringResult(interp), 255);
-+#endif
-
- char cmd_buf[256];
- cmd_buf[255] = '\0';
-@@ -5350,10 +5362,14 @@ UserInterface_TCL::start(int argc, char** argv)
- //--If we can't load the script (= start CONTROL-SIDE interpreter)
- if (code != TCL_OK) {
-
-- char* p = (char *)Tcl_GetVar(theInterp, "errorInfo", glob_flag);
-+ const char* p = (const char *)Tcl_GetVar(theInterp, "errorInfo", glob_flag);
-
- if ((p == NULL) || (*p == '\0')) {
-+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
- p = theInterp->result;
-+#else
-+ p = Tcl_GetStringResult(theInterp);
-+#endif
- }
-
- ((ofstream*)debugFile)->open("ElmerFront.log", ios::out);