FreeBSD Bugzilla – Attachment 191756 Details for
Bug 226799
The deskutils/ical port fails to build in latest 12.0-CURRENT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
[patch] clean up all remaining compilation warnings
ical-2.2_6.diff2 (text/plain), 26.83 KB, created by
J.R. Oldroyd
on 2018-03-23 16:35:12 UTC
(
hide
)
Description:
[patch] clean up all remaining compilation warnings
Filename:
MIME Type:
Creator:
J.R. Oldroyd
Created:
2018-03-23 16:35:12 UTC
Size:
26.83 KB
patch
obsolete
>diff -ruN deskutils/ical-2.2_5/Makefile deskutils/ical-2.2_6/Makefile >--- deskutils/ical-2.2_5/Makefile 2018-03-21 16:51:57.878442000 -0400 >+++ deskutils/ical-2.2_6/Makefile 2018-03-23 11:39:09.184292000 -0400 >@@ -3,7 +3,7 @@ > > PORTNAME= ical > PORTVERSION= 2.2 >-PORTREVISION= 5 >+PORTREVISION= 6 > CATEGORIES= deskutils tk > MASTER_SITES= ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/ > >diff -ruN deskutils/ical-2.2_5/files/patch-Makefile.in deskutils/ical-2.2_6/files/patch-Makefile.in >--- deskutils/ical-2.2_5/files/patch-Makefile.in 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-Makefile.in 2018-03-23 12:30:15.700332000 -0400 >@@ -1,5 +1,5 @@ >---- Makefile.in.orig 1997-06-04 18:09:59.000000000 +0200 >-+++ Makefile.in 2014-02-17 15:05:23.000000000 +0100 >+--- Makefile.in.orig 1997-06-04 16:09:59 UTC >++++ Makefile.in > @@ -14,10 +14,10 @@ > CONFIGURE_IN = @MFILES_IN@ > CONFFILES = $(srcdir)/configure.in >diff -ruN deskutils/ical-2.2_5/files/patch-bitmaps-dleft.xbm deskutils/ical-2.2_6/files/patch-bitmaps-dleft.xbm >--- deskutils/ical-2.2_5/files/patch-bitmaps-dleft.xbm 2018-03-21 16:35:06.697814000 -0400 >+++ deskutils/ical-2.2_6/files/patch-bitmaps-dleft.xbm 2018-03-23 12:30:15.704604000 -0400 >@@ -1,5 +1,5 @@ >---- bitmaps/dleft.xbm.orig 1994-12-17 16:41:32.000000000 -0500 >-+++ bitmaps/dleft.xbm 2018-03-21 16:30:16.156611000 -0400 >+--- bitmaps/dleft.xbm.orig 1994-12-17 21:41:32 UTC >++++ bitmaps/dleft.xbm > @@ -1,6 +1,6 @@ > #define dleft_width 16 > #define dleft_height 16 >diff -ruN deskutils/ical-2.2_5/files/patch-bitmaps-done.xbm deskutils/ical-2.2_6/files/patch-bitmaps-done.xbm >--- deskutils/ical-2.2_5/files/patch-bitmaps-done.xbm 2018-03-21 16:35:06.710395000 -0400 >+++ deskutils/ical-2.2_6/files/patch-bitmaps-done.xbm 2018-03-23 12:30:15.708717000 -0400 >@@ -1,5 +1,5 @@ >---- bitmaps/done.xbm.orig 1994-12-17 16:29:47.000000000 -0500 >-+++ bitmaps/done.xbm 2018-03-21 16:30:37.428943000 -0400 >+--- bitmaps/done.xbm.orig 1994-12-17 21:29:47 UTC >++++ bitmaps/done.xbm > @@ -1,6 +1,6 @@ > #define done_width 16 > #define done_height 16 >diff -ruN deskutils/ical-2.2_5/files/patch-bitmaps-dright.xbm deskutils/ical-2.2_6/files/patch-bitmaps-dright.xbm >--- deskutils/ical-2.2_5/files/patch-bitmaps-dright.xbm 2018-03-21 16:35:06.722931000 -0400 >+++ deskutils/ical-2.2_6/files/patch-bitmaps-dright.xbm 2018-03-23 12:30:15.712783000 -0400 >@@ -1,5 +1,5 @@ >---- bitmaps/dright.xbm.orig 1994-12-17 16:41:33.000000000 -0500 >-+++ bitmaps/dright.xbm 2018-03-21 16:30:44.179406000 -0400 >+--- bitmaps/dright.xbm.orig 1994-12-17 21:41:33 UTC >++++ bitmaps/dright.xbm > @@ -1,6 +1,6 @@ > #define dright_width 16 > #define dright_height 16 >diff -ruN deskutils/ical-2.2_5/files/patch-bitmaps-ical.xbm deskutils/ical-2.2_6/files/patch-bitmaps-ical.xbm >--- deskutils/ical-2.2_5/files/patch-bitmaps-ical.xbm 2018-03-21 16:35:06.735338000 -0400 >+++ deskutils/ical-2.2_6/files/patch-bitmaps-ical.xbm 2018-03-23 12:30:15.716793000 -0400 >@@ -1,5 +1,5 @@ >---- bitmaps/ical.xbm.orig 1996-01-23 19:43:16.000000000 -0500 >-+++ bitmaps/ical.xbm 2018-03-21 16:31:00.051970000 -0400 >+--- bitmaps/ical.xbm.orig 1996-01-24 00:43:16 UTC >++++ bitmaps/ical.xbm > @@ -1,6 +1,6 @@ > #define ical_width 64 > #define ical_height 54 >diff -ruN deskutils/ical-2.2_5/files/patch-bitmaps-left.xbm deskutils/ical-2.2_6/files/patch-bitmaps-left.xbm >--- deskutils/ical-2.2_5/files/patch-bitmaps-left.xbm 2018-03-21 16:35:06.747981000 -0400 >+++ deskutils/ical-2.2_6/files/patch-bitmaps-left.xbm 2018-03-23 12:30:15.720808000 -0400 >@@ -1,5 +1,5 @@ >---- bitmaps/left.xbm.orig 1994-12-17 16:29:48.000000000 -0500 >-+++ bitmaps/left.xbm 2018-03-21 16:31:06.288351000 -0400 >+--- bitmaps/left.xbm.orig 1994-12-17 21:29:48 UTC >++++ bitmaps/left.xbm > @@ -1,7 +1,7 @@ > /* Copyright (c) 1993 by Sanjay Ghemawat */ > #define left_width 16 >diff -ruN deskutils/ical-2.2_5/files/patch-bitmaps-right.xbm deskutils/ical-2.2_6/files/patch-bitmaps-right.xbm >--- deskutils/ical-2.2_5/files/patch-bitmaps-right.xbm 2018-03-21 16:35:06.760566000 -0400 >+++ deskutils/ical-2.2_6/files/patch-bitmaps-right.xbm 2018-03-23 12:30:15.724827000 -0400 >@@ -1,5 +1,5 @@ >---- bitmaps/right.xbm.orig 1994-12-17 16:29:49.000000000 -0500 >-+++ bitmaps/right.xbm 2018-03-21 16:31:10.705826000 -0400 >+--- bitmaps/right.xbm.orig 1994-12-17 21:29:49 UTC >++++ bitmaps/right.xbm > @@ -1,7 +1,7 @@ > /* Copyright (c) 1993 by Sanjay Ghemawat */ > #define right_width 16 >diff -ruN deskutils/ical-2.2_5/files/patch-bitmaps-sleft.xbm deskutils/ical-2.2_6/files/patch-bitmaps-sleft.xbm >--- deskutils/ical-2.2_5/files/patch-bitmaps-sleft.xbm 2018-03-21 16:35:06.772953000 -0400 >+++ deskutils/ical-2.2_6/files/patch-bitmaps-sleft.xbm 2018-03-23 12:30:15.728894000 -0400 >@@ -1,5 +1,5 @@ >---- bitmaps/sleft.xbm.orig 1994-12-17 16:41:34.000000000 -0500 >-+++ bitmaps/sleft.xbm 2018-03-21 16:29:50.989271000 -0400 >+--- bitmaps/sleft.xbm.orig 1994-12-17 21:41:34 UTC >++++ bitmaps/sleft.xbm > @@ -1,6 +1,6 @@ > #define sleft_width 16 > #define sleft_height 16 >diff -ruN deskutils/ical-2.2_5/files/patch-bitmaps-sright.xbm deskutils/ical-2.2_6/files/patch-bitmaps-sright.xbm >--- deskutils/ical-2.2_5/files/patch-bitmaps-sright.xbm 2018-03-21 16:35:06.785431000 -0400 >+++ deskutils/ical-2.2_6/files/patch-bitmaps-sright.xbm 2018-03-23 12:30:15.732887000 -0400 >@@ -1,5 +1,5 @@ >---- bitmaps/sright.xbm.orig 1994-12-17 16:41:34.000000000 -0500 >-+++ bitmaps/sright.xbm 2018-03-21 16:31:20.968994000 -0400 >+--- bitmaps/sright.xbm.orig 1994-12-17 21:41:34 UTC >++++ bitmaps/sright.xbm > @@ -1,6 +1,6 @@ > #define sright_width 16 > #define sright_height 16 >diff -ruN deskutils/ical-2.2_5/files/patch-bitmaps-todo.xbm deskutils/ical-2.2_6/files/patch-bitmaps-todo.xbm >--- deskutils/ical-2.2_5/files/patch-bitmaps-todo.xbm 2018-03-21 16:35:06.797824000 -0400 >+++ deskutils/ical-2.2_6/files/patch-bitmaps-todo.xbm 2018-03-23 12:30:15.736903000 -0400 >@@ -1,5 +1,5 @@ >---- bitmaps/todo.xbm.orig 1994-12-17 16:29:49.000000000 -0500 >-+++ bitmaps/todo.xbm 2018-03-21 16:31:31.632338000 -0400 >+--- bitmaps/todo.xbm.orig 1994-12-17 21:29:49 UTC >++++ bitmaps/todo.xbm > @@ -1,6 +1,6 @@ > #define todo_width 16 > #define todo_height 16 >diff -ruN deskutils/ical-2.2_5/files/patch-cal_tcl.C deskutils/ical-2.2_6/files/patch-cal_tcl.C >--- deskutils/ical-2.2_5/files/patch-cal_tcl.C 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-cal_tcl.C 2018-03-23 12:30:15.740904000 -0400 >@@ -1,6 +1,6 @@ >---- cal_tcl.C.orig Sun Nov 28 17:29:13 1999 >-+++ cal_tcl.C Sun Nov 28 17:30:24 1999 >-@@ -214,27 +214,27 @@ static int cal_loopf (ClientData, Tcl_In >+--- cal_tcl.C.orig 1995-07-06 15:48:16 UTC >++++ cal_tcl.C >+@@ -214,27 +214,27 @@ static int cal_loopf (ClientData, Tcl_Interp*, int, ch > static int cal_loopb (ClientData, Tcl_Interp*, int, char*[]); > > static Dispatch_Entry calendar_dispatch[] = { >@@ -49,7 +49,7 @@ > { 0, 0, 0, 0 } > }; > >-@@ -281,7 +281,7 @@ static int parse_items(Tcl_Interp* tcl, >+@@ -281,7 +281,7 @@ static int parse_items(Tcl_Interp* tcl, Calendar_Tcl* > > if ((argc >= 2) && (strcmp(argv[0], "-items") == 0)) { > int count; >@@ -58,7 +58,7 @@ > if (Tcl_SplitList(tcl, argv[1], &count, &list) != TCL_OK) { > TCL_Error(tcl, "invalid item list"); > } >-@@ -516,7 +516,7 @@ >+@@ -516,7 +516,7 @@ static int cal_ronly(ClientData c, Tcl_Interp* tcl, in > TCL_Error(tcl, "no such calendar"); > } > >@@ -67,7 +67,7 @@ > } > > static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){ >-@@ -527,7 +527,7 @@ >+@@ -527,7 +527,7 @@ static int cal_dirty(ClientData c, Tcl_Interp* tcl, in > TCL_Error(tcl, "no such calendar"); > } > >@@ -76,7 +76,7 @@ > } > > static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){ >-@@ -538,7 +538,7 @@ >+@@ -538,7 +538,7 @@ static int cal_stale(ClientData c, Tcl_Interp* tcl, in > TCL_Error(tcl, "no such calendar"); > } > >@@ -85,3 +85,12 @@ > } > > static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){ >+@@ -609,7 +609,7 @@ static int item_loop(Tcl_Interp* tcl, Occurrences cons >+ >+ if (dvar != 0) { >+ char buffer[20]; >+- sprintf(buffer, "%d", list[i].date.EpochDays()); >++ sprintf(buffer, "%ld", list[i].date.EpochDays()); >+ if (Tcl_SetVar(tcl, dvar, buffer, 0) == NULL) { >+ TCL_Error(tcl, "could not set loop variable"); >+ } >diff -ruN deskutils/ical-2.2_5/files/patch-calendar_Makefile.in deskutils/ical-2.2_6/files/patch-calendar_Makefile.in >--- deskutils/ical-2.2_5/files/patch-calendar_Makefile.in 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-calendar_Makefile.in 2018-03-23 12:30:15.744911000 -0400 >@@ -1,5 +1,5 @@ >---- calendar/Makefile.in.orig Sat Apr 29 15:16:46 2000 >-+++ calendar/Makefile.in Sat Apr 29 15:16:54 2000 >+--- calendar/Makefile.in.orig 1997-10-21 23:52:59 UTC >++++ calendar/Makefile.in > @@ -12,7 +12,6 @@ > AR = ar > ECHO = echo >diff -ruN deskutils/ical-2.2_5/files/patch-calendar_calendar.C deskutils/ical-2.2_6/files/patch-calendar_calendar.C >--- deskutils/ical-2.2_5/files/patch-calendar_calendar.C 1969-12-31 19:00:00.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-calendar_calendar.C 2018-03-23 12:30:15.748926000 -0400 >@@ -0,0 +1,18 @@ >+--- calendar/calendar.C.orig 1997-05-21 20:32:59 UTC >++++ calendar/calendar.C >+@@ -224,13 +224,13 @@ int Calendar::Read(Lexer* lex) { >+ char* name = new char[len + 1]; >+ if (! lex->GetText(name, len) || >+ ! lex->Skip(closer)) { >+- delete name; >++ delete [] name; >+ lex->SetError("error reading included file name"); >+ return 0; >+ } >+ name[len] = '\0'; >+ Include(name); >+- delete name; >++ delete [] name; >+ } >+ else if (strcmp(keyword, "Hide") == 0) { >+ char const* x; >diff -ruN deskutils/ical-2.2_5/files/patch-calendar_calfile.C deskutils/ical-2.2_6/files/patch-calendar_calfile.C >--- deskutils/ical-2.2_5/files/patch-calendar_calfile.C 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-calendar_calfile.C 2018-03-23 12:30:15.752934000 -0400 >@@ -1,6 +1,6 @@ > --- calendar/calfile.C.orig 1997-05-24 00:23:52 UTC > +++ calendar/calfile.C >-@@ -60,7 +60,7 @@ CalFile::CalFile(int ro, const char* nam >+@@ -60,7 +60,7 @@ CalFile::CalFile(int ro, const char* name) { > backupName = tmp; > > // Get directory name for access checks >diff -ruN deskutils/ical-2.2_5/files/patch-config.h.in deskutils/ical-2.2_6/files/patch-config.h.in >--- deskutils/ical-2.2_5/files/patch-config.h.in 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-config.h.in 2018-03-23 12:30:15.756951000 -0400 >@@ -1,5 +1,5 @@ >---- config.h.in.orig Sun Jul 2 15:12:55 1995 >-+++ config.h.in Wed Oct 15 13:19:33 2003 >+--- config.h.in.orig 1995-07-02 22:12:55 UTC >++++ config.h.in > @@ -5,26 +5,26 @@ > #undef pid_t > >diff -ruN deskutils/ical-2.2_5/files/patch-dateeditor.C deskutils/ical-2.2_6/files/patch-dateeditor.C >--- deskutils/ical-2.2_5/files/patch-dateeditor.C 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-dateeditor.C 2018-03-23 12:30:15.764956000 -0400 >@@ -1,6 +1,6 @@ >---- dateeditor.C.orig 1996-02-10 04:17:35.000000000 +0100 >-+++ dateeditor.C 2003-04-28 18:14:32.000000000 +0200 >-@@ -113,7 +113,7 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter >+--- dateeditor.C.orig 1996-02-10 03:17:35 UTC >++++ dateeditor.C >+@@ -113,7 +113,7 @@ int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int ar > } > > int count; >@@ -9,9 +9,12 @@ > if (Tcl_SplitList(tcl, argv[2], &count, &strlist) != TCL_OK) { > return TCL_ERROR; > } >-@@ -148,12 +148,12 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter >+@@ -146,14 +146,14 @@ int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int ar >+ if (!contains(hlist, hilite)) hilite = "always"; >+ > char buffer[20]; >- sprintf(buffer, "%d", list[i].date.EpochDays()); >+- sprintf(buffer, "%d", list[i].date.EpochDays()); >++ sprintf(buffer, "%ld", list[i].date.EpochDays()); > if (Tcl_SetVar(tcl, dvar, buffer, 0) == NULL) { > - free((char*) strlist); > + Tcl_Free((char*) strlist); >@@ -24,7 +27,7 @@ > TCL_Error(tcl, "could not set loop variable"); > } > >-@@ -165,11 +165,11 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter >+@@ -165,11 +165,11 @@ int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int ar > if (result == TCL_BREAK) break; > > // Error of some sort >diff -ruN deskutils/ical-2.2_5/files/patch-dispatch.C deskutils/ical-2.2_6/files/patch-dispatch.C >--- deskutils/ical-2.2_5/files/patch-dispatch.C 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-dispatch.C 2018-03-23 12:30:15.776854000 -0400 >@@ -1,6 +1,6 @@ >---- dispatch.C.orig 1994-05-20 05:21:54.000000000 +0200 >-+++ dispatch.C 2003-04-28 18:14:32.000000000 +0200 >-@@ -24,7 +24,7 @@ int Dispatch(Dispatch_Entry* table, Clie >+--- dispatch.C.orig 1994-05-20 03:21:54 UTC >++++ dispatch.C >+@@ -24,7 +24,7 @@ int Dispatch(Dispatch_Entry* table, ClientData c, Tcl_ > if ((entry->max_arg_count >= 0) && (argc > entry->max_arg_count)) { > TCL_Error(tcl, "too many arguments"); > } >diff -ruN deskutils/ical-2.2_5/files/patch-ical.h deskutils/ical-2.2_6/files/patch-ical.h >--- deskutils/ical-2.2_5/files/patch-ical.h 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-ical.h 2018-03-23 12:30:15.780878000 -0400 >@@ -1,5 +1,5 @@ >---- ical.h.orig 1996-02-10 04:17:36.000000000 +0100 >-+++ ical.h 2003-04-28 18:14:32.000000000 +0200 >+--- ical.h.orig 1996-02-10 03:17:36 UTC >++++ ical.h > @@ -4,6 +4,11 @@ > > #include <tcl.h> >@@ -11,4 +11,20 @@ > + > // Proc for triggering tcl code based on changes > // to calendars/items. >+ >+@@ -25,13 +30,13 @@ extern void trigger(Tcl_Interp*, char const* ttype, ch >+ >+ #define TCL_Return(tcl,str) \ >+ do { \ >+- Tcl_SetResult(tcl, (str), TCL_STATIC); \ >++ Tcl_SetResult(tcl, ((char *)(str)), TCL_STATIC); \ >+ return TCL_OK; \ >+ } while (0) >+ >+ #define TCL_Error(tcl,str) \ >+ do { \ >+- Tcl_SetResult(tcl, (str), TCL_STATIC); \ >++ Tcl_SetResult(tcl, ((char *)(str)), TCL_STATIC); \ >+ return TCL_ERROR; \ >+ } while (0) > >diff -ruN deskutils/ical-2.2_5/files/patch-item_tcl.C deskutils/ical-2.2_6/files/patch-item_tcl.C >--- deskutils/ical-2.2_5/files/patch-item_tcl.C 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-item_tcl.C 2018-03-23 12:30:15.784880000 -0400 >@@ -1,6 +1,6 @@ >---- item_tcl.C.orig Sun Nov 28 17:31:26 1999 >-+++ item_tcl.C Sun Nov 28 17:32:25 1999 >-@@ -106,52 +106,52 @@ >+--- item_tcl.C.orig 1996-08-01 19:25:10 UTC >++++ item_tcl.C >+@@ -106,52 +106,52 @@ static int item_mweekday (ClientData, Tcl_Interp*, int > static int item_mlweekday (ClientData, Tcl_Interp*, int, char*[]); > > static Dispatch_Entry item_dispatch[] = { >@@ -14,7 +14,12 @@ > - { "alarms", 0, 1, item_alarms }, > - { "option", 1, 2, item_option }, > - { "delete_option", 1, 1, item_doption }, >-- >++ { "length", 0, 1, (Tcl_CmdProc *)item_length }, >++ { "starttime", 0, 1, (Tcl_CmdProc *)item_startt }, >++ { "alarms", 0, 1, (Tcl_CmdProc *)item_alarms }, >++ { "option", 1, 2, (Tcl_CmdProc *)item_option }, >++ { "delete_option", 1, 1, (Tcl_CmdProc *)item_doption }, >+ > - { "is", 1, 1, item_is }, > - { "calendar", 0, 0, item_cal }, > - { "text", 0, 1, item_text }, >@@ -27,37 +32,6 @@ > - { "todo", 0, 1, item_todo }, > - { "is_done", 0, 0, item_is_done }, > - { "done", 1, 1, item_done }, >-- >-- { "contains", 1, 1, item_cont }, >-- { "empty", 0, 0, item_empty }, >-- { "repeats", 0, 0, item_repeat }, >-- { "first", 0, 0, item_first }, >-- { "next", 1, 1, item_next }, >-- { "range", 2, 2, item_range }, >-- { "type", 0, 0, item_type }, >-- { "describe_repeat", 0, 0, item_desc }, >-- >-- { "date", 1, 1, item_date }, >-- { "dayrepeat", 2, 2, item_dayr }, >-- >-- { "monthrepeat", 2, 2, item_monthr }, >-- { "month_day", 1, 3, item_mday }, >-- { "month_last_day", 1, 3, item_mlday }, >-- { "month_work_day", 1, 3, item_mworkday }, >-- { "month_last_work_day", 1, 3, item_mlworkday }, >-- { "month_week_day", 2, 4, item_mweekday }, >-- { "month_last_week_day", 2, 4, item_mlweekday }, >-- >-- { "weekdays", 0, -1, item_wdays }, >-- { "start", 1, 1, item_start }, >-- { "finish", 1, 1, item_finish }, >-- { "deleteon", 1, 1, item_ondel }, >-+ { "length", 0, 1, (Tcl_CmdProc *)item_length }, >-+ { "starttime", 0, 1, (Tcl_CmdProc *)item_startt }, >-+ { "alarms", 0, 1, (Tcl_CmdProc *)item_alarms }, >-+ { "option", 1, 2, (Tcl_CmdProc *)item_option }, >-+ { "delete_option", 1, 1, (Tcl_CmdProc *)item_doption }, >-+ > + { "is", 1, 1, (Tcl_CmdProc *)item_is }, > + { "calendar", 0, 0, (Tcl_CmdProc *)item_cal }, > + { "text", 0, 1, (Tcl_CmdProc *)item_text }, >@@ -70,7 +44,15 @@ > + { "todo", 0, 1, (Tcl_CmdProc *)item_todo }, > + { "is_done", 0, 0, (Tcl_CmdProc *)item_is_done }, > + { "done", 1, 1, (Tcl_CmdProc *)item_done }, >-+ >+ >+- { "contains", 1, 1, item_cont }, >+- { "empty", 0, 0, item_empty }, >+- { "repeats", 0, 0, item_repeat }, >+- { "first", 0, 0, item_first }, >+- { "next", 1, 1, item_next }, >+- { "range", 2, 2, item_range }, >+- { "type", 0, 0, item_type }, >+- { "describe_repeat", 0, 0, item_desc }, > + { "contains", 1, 1, (Tcl_CmdProc *)item_cont }, > + { "empty", 0, 0, (Tcl_CmdProc *)item_empty }, > + { "repeats", 0, 0, (Tcl_CmdProc *)item_repeat }, >@@ -79,10 +61,19 @@ > + { "range", 2, 2, (Tcl_CmdProc *)item_range }, > + { "type", 0, 0, (Tcl_CmdProc *)item_type }, > + { "describe_repeat", 0, 0, (Tcl_CmdProc *)item_desc }, >-+ >+ >+- { "date", 1, 1, item_date }, >+- { "dayrepeat", 2, 2, item_dayr }, > + { "date", 1, 1, (Tcl_CmdProc *)item_date }, > + { "dayrepeat", 2, 2, (Tcl_CmdProc *)item_dayr }, >-+ >+ >+- { "monthrepeat", 2, 2, item_monthr }, >+- { "month_day", 1, 3, item_mday }, >+- { "month_last_day", 1, 3, item_mlday }, >+- { "month_work_day", 1, 3, item_mworkday }, >+- { "month_last_work_day", 1, 3, item_mlworkday }, >+- { "month_week_day", 2, 4, item_mweekday }, >+- { "month_last_week_day", 2, 4, item_mlweekday }, > + { "monthrepeat", 2, 2, (Tcl_CmdProc *)item_monthr }, > + { "month_day", 1, 3, (Tcl_CmdProc *)item_mday }, > + { "month_last_day", 1, 3, (Tcl_CmdProc *)item_mlday }, >@@ -90,7 +81,11 @@ > + { "month_last_work_day", 1, 3, (Tcl_CmdProc *)item_mlworkday }, > + { "month_week_day", 2, 4, (Tcl_CmdProc *)item_mweekday }, > + { "month_last_week_day", 2, 4, (Tcl_CmdProc *)item_mlweekday }, >-+ >+ >+- { "weekdays", 0, -1, item_wdays }, >+- { "start", 1, 1, item_start }, >+- { "finish", 1, 1, item_finish }, >+- { "deleteon", 1, 1, item_ondel }, > + { "weekdays", 0, -1, (Tcl_CmdProc *)item_wdays }, > + { "start", 1, 1, (Tcl_CmdProc *)item_start }, > + { "finish", 1, 1, (Tcl_CmdProc *)item_finish }, >@@ -98,8 +93,7 @@ > > { 0, 0, 0, 0 } > }; >-+++ item_tcl.C Sun Nov 28 17:32:25 1999 >-@@ -329,7 +329,7 @@ >+@@ -329,7 +329,7 @@ static int item_owner(ClientData c, Tcl_Interp* tcl, i > > static int item_owned(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { > Item_Tcl* item = (Item_Tcl*) c; >@@ -108,7 +102,7 @@ > } > > static int item_own(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { >-@@ -431,7 +431,7 @@ static int item_alarms(ClientData c, Tcl >+@@ -431,7 +431,7 @@ static int item_alarms(ClientData c, Tcl_Interp* tcl, > } > > int count; >@@ -117,7 +111,7 @@ > if (Tcl_SplitList(tcl, argv[0], &count, &list) != TCL_OK) { > TCL_Error(tcl, "invalid alarm list"); > } >-@@ -492,12 +492,12 @@ >+@@ -492,12 +492,12 @@ static int item_doption(ClientData c, Tcl_Interp* tcl, > > static int item_empty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { > Item_Tcl* item = (Item_Tcl*) c; >@@ -132,7 +126,73 @@ > } > > static int item_first(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { >-@@ -576,7 +576,7 @@ >+@@ -508,7 +508,7 @@ static int item_first(ClientData c, Tcl_Interp* tcl, i >+ } >+ >+ char buffer[100]; >+- sprintf(buffer, "%d", d.EpochDays()); >++ sprintf(buffer, "%ld", d.EpochDays()); >+ Tcl_SetResult(tcl, buffer, TCL_VOLATILE); >+ return TCL_OK; >+ } >+@@ -518,43 +518,43 @@ static int item_type(ClientData c, Tcl_Interp* tcl, in >+ char* result; >+ switch (item->value()->repeat_type()) { >+ case DateSet::None: >+- result = ""; >++ result = (char *)""; >+ break; >+ case DateSet::Daily: >+- result = "Daily"; >++ result = (char *)"Daily"; >+ break; >+ case DateSet::Weekly: >+- result = "Weekly"; >++ result = (char *)"Weekly"; >+ break; >+ case DateSet::BiWeekly: >+- result = "Every Two Weeks"; >++ result = (char *)"Every Two Weeks"; >+ break; >+ case DateSet::ThreeWeekly: >+- result = "Every Three Weeks"; >++ result = (char *)"Every Three Weeks"; >+ break; >+ case DateSet::FourWeekly: >+- result = "Every Four Weeks"; >++ result = (char *)"Every Four Weeks"; >+ break; >+ case DateSet::Monthly: >+- result = "Monthly"; >++ result = (char *)"Monthly"; >+ break; >+ case DateSet::TwoMonthly: >+- result = "Every Two Months"; >++ result = (char *)"Every Two Months"; >+ break; >+ case DateSet::ThreeMonthly: >+- result = "Every Three Months"; >++ result = (char *)"Every Three Months"; >+ break; >+ case DateSet::FourMonthly: >+- result = "Every Four Months"; >++ result = (char *)"Every Four Months"; >+ break; >+ case DateSet::SixMonthly: >+- result = "Every Six Months"; >++ result = (char *)"Every Six Months"; >+ break; >+ case DateSet::Annual: >+- result = "Annual"; >++ result = (char *)"Annual"; >+ break; >+ default: >+- result = "Complex"; >++ result = (char *)"Complex"; >+ break; >+ } >+ TCL_Return(tcl, result); >+@@ -576,7 +576,7 @@ static int item_cont(ClientData c, Tcl_Interp* tcl, in > TCL_Error(tcl, "invalid date"); > } > Date date(dateDays); >@@ -141,3 +201,34 @@ > } > > static int item_next(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { >+@@ -592,7 +592,7 @@ static int item_next(ClientData c, Tcl_Interp* tcl, in >+ } >+ >+ char buffer[100]; >+- sprintf(buffer, "%d", next.EpochDays()); >++ sprintf(buffer, "%ld", next.EpochDays()); >+ Tcl_SetResult(tcl, buffer, TCL_VOLATILE); >+ return TCL_OK; >+ } >+@@ -603,10 +603,10 @@ static int item_range(ClientData c, Tcl_Interp* tcl, i >+ Date s, f; >+ if (item->value()->range(s, f)) { >+ char buffer[100]; >+- sprintf(buffer, "%d", s.EpochDays()); >++ sprintf(buffer, "%ld", s.EpochDays()); >+ if (Tcl_SetVar(tcl, argv[0], buffer, 0) == NULL) >+ TCL_Error(tcl, "could not set range start variable"); >+- sprintf(buffer, "%d", f.EpochDays()); >++ sprintf(buffer, "%ld", f.EpochDays()); >+ if (Tcl_SetVar(tcl, argv[1], buffer, 0) == NULL) >+ TCL_Error(tcl, "could not set range finish variable"); >+ TCL_Return(tcl, "1"); >+@@ -886,7 +886,7 @@ static int check_permission(Tcl_Interp* tcl, Item_Tcl* >+ if (file == 0) return 1; >+ >+ if (file->GetCalendar()->ReadOnly()) { >+- Tcl_SetResult(tcl, "item is in readonly calendar", TCL_STATIC); >++ Tcl_SetResult(tcl, (char *)"item is in readonly calendar", TCL_STATIC); >+ return 0; >+ } >+ >diff -ruN deskutils/ical-2.2_5/files/patch-main.C deskutils/ical-2.2_6/files/patch-main.C >--- deskutils/ical-2.2_5/files/patch-main.C 2018-03-21 16:41:39.927260000 -0400 >+++ deskutils/ical-2.2_6/files/patch-main.C 2018-03-23 12:30:15.788895000 -0400 >@@ -1,5 +1,5 @@ >---- main.C.orig 1996-02-15 20:57:42.000000000 -0500 >-+++ main.C 2018-03-21 16:41:01.870226000 -0400 >+--- main.C.orig 1996-02-16 01:57:42 UTC >++++ main.C > @@ -27,13 +27,13 @@ > /* Include various libraries converted to strings. */ > >@@ -16,7 +16,7 @@ > "rename source _orig_source", > "proc source {args} {}", > #include "tk_lib.gen" >-@@ -42,37 +42,37 @@ >+@@ -42,37 +42,37 @@ static char* tk_lib_str[] = { > 0 > }; > >@@ -60,7 +60,7 @@ > "set ical(tcl_interface_doc) {", > #include "tcldoc.gen" > "}", >-@@ -173,7 +173,7 @@ >+@@ -173,7 +173,7 @@ main(int argc, char* argv[]) { > > #ifdef STANDALONE > extern "C" int MyTcl_Init(Tcl_Interp* tcl) { >@@ -69,7 +69,7 @@ > } > #else > #define MyTcl_Init Tcl_Init >-@@ -194,7 +194,7 @@ >+@@ -194,7 +194,7 @@ extern "C" int TkPlatformInit(Tcl_Interp* tcl) { > > TkCreateXEventSource(); > >@@ -78,7 +78,7 @@ > } > #endif > >-@@ -245,37 +245,37 @@ >+@@ -245,37 +245,37 @@ int Ical_Init(Tcl_Interp* tcl) { > } > > // Set-up postscript prolog >diff -ruN deskutils/ical-2.2_5/files/patch-object.C deskutils/ical-2.2_6/files/patch-object.C >--- deskutils/ical-2.2_5/files/patch-object.C 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-object.C 2018-03-23 12:30:15.792920000 -0400 >@@ -1,6 +1,6 @@ >---- object.C.orig 1994-05-20 05:22:04.000000000 +0200 >-+++ object.C 2003-04-28 18:14:32.000000000 +0200 >-@@ -33,7 +33,7 @@ void Object::init(Tcl_Interp* t, char co >+--- object.C.orig 1994-05-20 03:22:04 UTC >++++ object.C >+@@ -33,7 +33,7 @@ void Object::init(Tcl_Interp* t, char const* ty, char > interp = t; > > /* Create TCL Command */ >diff -ruN deskutils/ical-2.2_5/files/patch-pref.tcl deskutils/ical-2.2_6/files/patch-pref.tcl >--- deskutils/ical-2.2_5/files/patch-pref.tcl 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-pref.tcl 2018-03-23 12:30:15.796968000 -0400 >@@ -1,5 +1,5 @@ >---- pref.tcl.orig 1997-06-13 00:50:36.000000000 +0200 >-+++ pref.tcl 2003-04-28 18:46:04.000000000 +0200 >+--- pref.tcl.orig 1997-06-12 22:50:36 UTC >++++ pref.tcl > @@ -118,7 +118,12 @@ proc pref_init {} { > # XXX People do not seem to like the motif-style popup behavior > global tk_strictMotif >diff -ruN deskutils/ical-2.2_5/files/patch-time_Makefile.in deskutils/ical-2.2_6/files/patch-time_Makefile.in >--- deskutils/ical-2.2_5/files/patch-time_Makefile.in 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-time_Makefile.in 2018-03-23 12:30:15.803731000 -0400 >@@ -1,5 +1,5 @@ >---- time/Makefile.in.orig Sat Apr 29 15:17:20 2000 >-+++ time/Makefile.in Sat Apr 29 15:17:25 2000 >+--- time/Makefile.in.orig 1996-02-10 03:17:47 UTC >++++ time/Makefile.in > @@ -11,7 +11,6 @@ > ECHO = echo > RANLIB = @RANLIB@ >diff -ruN deskutils/ical-2.2_5/files/patch-time_tcl.C deskutils/ical-2.2_6/files/patch-time_tcl.C >--- deskutils/ical-2.2_5/files/patch-time_tcl.C 1969-12-31 19:00:00.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-time_tcl.C 2018-03-23 12:30:15.807802000 -0400 >@@ -0,0 +1,11 @@ >+--- time_tcl.C.orig 1994-05-20 03:22:05 UTC >++++ time_tcl.C >+@@ -135,7 +135,7 @@ int Cmd_Date(ClientData, Tcl_Interp* tcl, int argc, ch >+ TCL_Return(tcl, "0"); >+ >+ // Set variables >+- sprintf(buffer, "%d", result.EpochDays()); >++ sprintf(buffer, "%ld", result.EpochDays()); >+ if (Tcl_SetVar(tcl, argv[3], buffer, 0) == NULL) >+ TCL_Error(tcl, "could not set <date> result"); >+ >diff -ruN deskutils/ical-2.2_5/files/patch-types_Makefile.in deskutils/ical-2.2_6/files/patch-types_Makefile.in >--- deskutils/ical-2.2_5/files/patch-types_Makefile.in 2018-02-15 14:22:23.000000000 -0500 >+++ deskutils/ical-2.2_6/files/patch-types_Makefile.in 2018-03-23 12:30:15.811927000 -0400 >@@ -1,5 +1,5 @@ >---- types/Makefile.in.orig Sat Apr 29 15:17:47 2000 >-+++ types/Makefile.in Sat Apr 29 15:17:56 2000 >+--- types/Makefile.in.orig 1997-10-21 23:53:02 UTC >++++ types/Makefile.in > @@ -12,7 +12,7 @@ > ECHO = echo > RANLIB = @RANLIB@
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=191756">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 226799
:
191659
|
191722
|
191755
| 191756