diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2012-04-13 22:56:14 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2012-04-13 22:56:14 +0000 |
| commit | f146a69aa4dc358358f7e0e10542964f3d9bf243 (patch) | |
| tree | 09e852b3ef690228dd586ebb6ee050e6ee2c529a /deskutils | |
| parent | Update to LLVM and Clang 3.1.r154687, unless specific issues are found (diff) | |
Update for Tcl/Tk 8.5.
Obtained from: http://www.isi.edu/~johnh/SOFTWARE/ICAL/
Notes
Notes:
svn path=/head/; revision=294793
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/ical/files/patch-configure | 11 | ||||
| -rw-r--r-- | deskutils/ical/files/patch-dateeditor.C | 29 |
2 files changed, 40 insertions, 0 deletions
diff --git a/deskutils/ical/files/patch-configure b/deskutils/ical/files/patch-configure index 57a368d08057..95ea2cad7484 100644 --- a/deskutils/ical/files/patch-configure +++ b/deskutils/ical/files/patch-configure @@ -1,5 +1,16 @@ --- configure.orig Fri Nov 15 17:59:05 2002 +++ configure Fri Nov 15 17:59:20 2002 +@@ -1204,8 +1204,8 @@ fi + + echo "checking Tcl/Tk installation" 1>&6 + echo "configure:1207: checking Tcl/Tk installation" >&5 +-legal_tk_versions="8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1" +-legal_tcl_versions="8.0 7.9 7.8 7.7 7.6 7.5" ++legal_tk_versions="8.5 8.4 8.3 8.2 8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1" ++legal_tcl_versions="8.5 8.4 8.3 8.2 8.0 7.9 7.8 7.7 7.6 7.5" + + #### Find tclsh + # Check whether --with-tclsh or --without-tclsh was given. @@ -1327,6 +1327,8 @@ #### Load the Tcl/Tk configuration files . $tclconfig/tclConfig.sh diff --git a/deskutils/ical/files/patch-dateeditor.C b/deskutils/ical/files/patch-dateeditor.C index f869d6c57f4c..a0102ed8b2fe 100644 --- a/deskutils/ical/files/patch-dateeditor.C +++ b/deskutils/ical/files/patch-dateeditor.C @@ -9,3 +9,32 @@ if (Tcl_SplitList(tcl, argv[2], &count, &strlist) != TCL_OK) { return TCL_ERROR; } +@@ -148,12 +148,12 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter + char buffer[20]; + sprintf(buffer, "%d", list[i].date.EpochDays()); + if (Tcl_SetVar(tcl, dvar, buffer, 0) == NULL) { +- free((char*) strlist); ++ Tcl_Free((char*) strlist); + TCL_Error(tcl, "could not set loop variable"); + } + + if (Tcl_SetVar(tcl, hvar, (char*)hilite, 0) == NULL) { +- free((char*) strlist); ++ Tcl_Free((char*) strlist); + TCL_Error(tcl, "could not set loop variable"); + } + +@@ -165,11 +165,11 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter + if (result == TCL_BREAK) break; + + // Error of some sort +- free((char*) strlist); ++ Tcl_Free((char*) strlist); + return result; + } + +- free((char*) strlist); ++ Tcl_Free((char*) strlist); + TCL_Return(tcl, ""); + } + |