diff options
Diffstat (limited to 'dev-libs/newt/files')
-rw-r--r-- | dev-libs/newt/files/newt-0.52.14-tcl.patch | 108 | ||||
-rw-r--r-- | dev-libs/newt/files/newt-0.52.23-gold.patch (renamed from dev-libs/newt/files/newt-0.52.22-gold.patch) | 2 |
2 files changed, 1 insertions, 109 deletions
diff --git a/dev-libs/newt/files/newt-0.52.14-tcl.patch b/dev-libs/newt/files/newt-0.52.14-tcl.patch deleted file mode 100644 index 4e10d2baae9e..000000000000 --- a/dev-libs/newt/files/newt-0.52.14-tcl.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/whiptcl.c b/whiptcl.c -index 8688780..7219911 100644 ---- a/whiptcl.c -+++ b/whiptcl.c -@@ -137,45 +137,45 @@ static int wtCmd(ClientData clientData, Tcl_Interp * interp, int argc, - - if (arg < -1) { - /* this could buffer oveflow, bug we're not setuid so I don't care */ -- interp->result = malloc(200); -- interp->freeProc = TCL_DYNAMIC; -- sprintf(interp->result, "%s: %s\n", -+ char *tmp = malloc(200); -+ sprintf(tmp, "%s: %s\n", - poptBadOption(optCon, POPT_BADOPTION_NOALIAS), - poptStrerror(arg)); -+ Tcl_SetResult(interp, tmp, TCL_DYNAMIC); - - return TCL_ERROR; - } - - if (mode == MODE_NONE) { -- interp->result = "no dialog mode was specified"; -+ Tcl_SetResultString(interp, "no dialog mode was specified"); - return TCL_ERROR; - } else if (rc) { -- interp->result = "multiple modes were specified"; -+ Tcl_SetResultString(interp, "multiple modes were specified"); - return TCL_ERROR; - } - - if (!(text = poptGetArg(optCon))) { -- interp->result = "missing text parameter"; -+ Tcl_SetResultString(interp, "missing text parameter"); - return TCL_ERROR; - } - - if (!(nextArg = poptGetArg(optCon))) { -- interp->result = "height missing"; -+ Tcl_SetResultString(interp, "height missing"); - return TCL_ERROR; - } - height = strtoul(nextArg, &end, 10); - if (*end) { -- interp->result = "height is not a number"; -+ Tcl_SetResultString(interp, "height is not a number"); - return TCL_ERROR; - } - - if (!(nextArg = poptGetArg(optCon))) { -- interp->result = "width missing"; -+ Tcl_SetResultString(interp, "width missing"); - return TCL_ERROR; - } - width = strtoul(nextArg, &end, 10); - if (*end) { -- interp->result = "width is not a number"; -+ Tcl_SetResultString(interp, "width is not a number"); - return TCL_ERROR; - } - -@@ -196,33 +196,30 @@ static int wtCmd(ClientData clientData, Tcl_Interp * interp, int argc, - case MODE_YESNO: - rc = messageBox(text, height, width, MSGBOX_YESNO, flags); - if (rc == DLG_OKAY) -- interp->result = "yes"; -+ Tcl_SetResultString(interp, "yes"); - else -- interp->result = "no"; -+ Tcl_SetResultString(interp, "no"); - if (rc == DLG_ERROR) rc = 0; - break; - - case MODE_INPUTBOX: - rc = inputBox(text, height, width, optCon, flags, &result); - if (rc ==DLG_OKAY) { -- interp->result = result; -- interp->freeProc = TCL_DYNAMIC; -+ Tcl_SetResult(interp, result, TCL_DYNAMIC); - } - break; - - case MODE_MENU: - rc = listBox(text, height, width, optCon, flags, default_item, &result); - if (rc==DLG_OKAY) { -- interp->result = result; -- interp->freeProc = TCL_DYNAMIC; -+ Tcl_SetResult(interp, result, TCL_DYNAMIC); - } - break; - - case MODE_RADIOLIST: - rc = checkList(text, height, width, optCon, 1, flags, &selections); - if (rc==DLG_OKAY) { -- interp->result = selections[0]; -- interp->freeProc = TCL_DYNAMIC; -+ Tcl_SetResult(interp, selections[0], TCL_DYNAMIC); - - free(selections); - } -@@ -247,7 +244,7 @@ static int wtCmd(ClientData clientData, Tcl_Interp * interp, int argc, - newtPopWindow(); - - if (rc == DLG_ERROR) { -- interp->result = "bad paramter for whiptcl dialog box"; -+ Tcl_SetResultString(interp, "bad paramter for whiptcl dialog box"); - return TCL_ERROR; - } - diff --git a/dev-libs/newt/files/newt-0.52.22-gold.patch b/dev-libs/newt/files/newt-0.52.23-gold.patch index add9ce872dfd..818480f725c2 100644 --- a/dev-libs/newt/files/newt-0.52.22-gold.patch +++ b/dev-libs/newt/files/newt-0.52.23-gold.patch @@ -7,7 +7,7 @@ diff -ur a/configure.ac b/configure.ac -if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then +if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0 -a \ -+ test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold") = 0; then ++ $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold") = 0; then # Not GNU_LD="" AC_MSG_RESULT([no]) |