Attachment #191756 for bug #226799

Lines 3-9 Link Here

(-)deskutils/ical-2.2_6/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= ical	4	PORTNAME= ical
5	PORTVERSION= 2.2	5	PORTVERSION= 2.2
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= deskutils tk	7	CATEGORIES= deskutils tk
8	MASTER_SITES= ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/	8	MASTER_SITES= ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/
9		9

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-Makefile.in (-2 / +2 lines)
1	--- Makefile.in.orig 1997-06-04 18:09:59.000000000 +0200	1	--- Makefile.in.orig 1997-06-04 16:09:59 UTC
2	+++ Makefile.in 2014-02-17 15:05:23.000000000 +0100	2	+++ Makefile.in
3	@@ -14,10 +14,10 @@	3	@@ -14,10 +14,10 @@
4	CONFIGURE_IN = @MFILES_IN@	4	CONFIGURE_IN = @MFILES_IN@
5	CONFFILES = $(srcdir)/configure.in	5	CONFFILES = $(srcdir)/configure.in

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-bitmaps-dleft.xbm (-2 / +2 lines)
1	--- bitmaps/dleft.xbm.orig 1994-12-17 16:41:32.000000000 -0500	1	--- bitmaps/dleft.xbm.orig 1994-12-17 21:41:32 UTC
2	+++ bitmaps/dleft.xbm 2018-03-21 16:30:16.156611000 -0400	2	+++ bitmaps/dleft.xbm
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#define dleft_width 16	4	#define dleft_width 16
5	#define dleft_height 16	5	#define dleft_height 16

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-bitmaps-done.xbm (-2 / +2 lines)
1	--- bitmaps/done.xbm.orig 1994-12-17 16:29:47.000000000 -0500	1	--- bitmaps/done.xbm.orig 1994-12-17 21:29:47 UTC
2	+++ bitmaps/done.xbm 2018-03-21 16:30:37.428943000 -0400	2	+++ bitmaps/done.xbm
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#define done_width 16	4	#define done_width 16
5	#define done_height 16	5	#define done_height 16

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-bitmaps-dright.xbm (-2 / +2 lines)
1	--- bitmaps/dright.xbm.orig 1994-12-17 16:41:33.000000000 -0500	1	--- bitmaps/dright.xbm.orig 1994-12-17 21:41:33 UTC
2	+++ bitmaps/dright.xbm 2018-03-21 16:30:44.179406000 -0400	2	+++ bitmaps/dright.xbm
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#define dright_width 16	4	#define dright_width 16
5	#define dright_height 16	5	#define dright_height 16

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-bitmaps-ical.xbm (-2 / +2 lines)
1	--- bitmaps/ical.xbm.orig 1996-01-23 19:43:16.000000000 -0500	1	--- bitmaps/ical.xbm.orig 1996-01-24 00:43:16 UTC
2	+++ bitmaps/ical.xbm 2018-03-21 16:31:00.051970000 -0400	2	+++ bitmaps/ical.xbm
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#define ical_width 64	4	#define ical_width 64
5	#define ical_height 54	5	#define ical_height 54

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-bitmaps-left.xbm (-2 / +2 lines)
1	--- bitmaps/left.xbm.orig 1994-12-17 16:29:48.000000000 -0500	1	--- bitmaps/left.xbm.orig 1994-12-17 21:29:48 UTC
2	+++ bitmaps/left.xbm 2018-03-21 16:31:06.288351000 -0400	2	+++ bitmaps/left.xbm
3	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
4	/* Copyright (c) 1993 by Sanjay Ghemawat */	4	/* Copyright (c) 1993 by Sanjay Ghemawat */
5	#define left_width 16	5	#define left_width 16

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-bitmaps-right.xbm (-2 / +2 lines)
1	--- bitmaps/right.xbm.orig 1994-12-17 16:29:49.000000000 -0500	1	--- bitmaps/right.xbm.orig 1994-12-17 21:29:49 UTC
2	+++ bitmaps/right.xbm 2018-03-21 16:31:10.705826000 -0400	2	+++ bitmaps/right.xbm
3	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
4	/* Copyright (c) 1993 by Sanjay Ghemawat */	4	/* Copyright (c) 1993 by Sanjay Ghemawat */
5	#define right_width 16	5	#define right_width 16

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-bitmaps-sleft.xbm (-2 / +2 lines)
1	--- bitmaps/sleft.xbm.orig 1994-12-17 16:41:34.000000000 -0500	1	--- bitmaps/sleft.xbm.orig 1994-12-17 21:41:34 UTC
2	+++ bitmaps/sleft.xbm 2018-03-21 16:29:50.989271000 -0400	2	+++ bitmaps/sleft.xbm
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#define sleft_width 16	4	#define sleft_width 16
5	#define sleft_height 16	5	#define sleft_height 16

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-bitmaps-sright.xbm (-2 / +2 lines)
1	--- bitmaps/sright.xbm.orig 1994-12-17 16:41:34.000000000 -0500	1	--- bitmaps/sright.xbm.orig 1994-12-17 21:41:34 UTC
2	+++ bitmaps/sright.xbm 2018-03-21 16:31:20.968994000 -0400	2	+++ bitmaps/sright.xbm
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#define sright_width 16	4	#define sright_width 16
5	#define sright_height 16	5	#define sright_height 16

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-bitmaps-todo.xbm (-2 / +2 lines)
1	--- bitmaps/todo.xbm.orig 1994-12-17 16:29:49.000000000 -0500	1	--- bitmaps/todo.xbm.orig 1994-12-17 21:29:49 UTC
2	+++ bitmaps/todo.xbm 2018-03-21 16:31:31.632338000 -0400	2	+++ bitmaps/todo.xbm
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#define todo_width 16	4	#define todo_width 16
5	#define todo_height 16	5	#define todo_height 16




--- 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[] = {

     { 0,		0, 0, 0			}
 };
 
@@ -281,7 +281,7 @@ static int parse_items(Tcl_Interp* tcl, Calendar_Tcl* 
 
     if ((argc >= 2) && (strcmp(argv[0], "-items") == 0)) {
 	int count;

 	if (Tcl_SplitList(tcl, argv[1], &count, &list) != TCL_OK) {
 	    TCL_Error(tcl, "invalid item list");
 	}
@@ -516,7 +516,7 @@ static int cal_ronly(ClientData c, Tcl_Interp* tcl, in
 	TCL_Error(tcl, "no such calendar");
     }
 

 }
 
 static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
@@ -527,7 +527,7 @@ static int cal_dirty(ClientData c, Tcl_Interp* tcl, in
 	TCL_Error(tcl, "no such calendar");
     }
 

 }
 
 static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
@@ -538,7 +538,7 @@ static int cal_stale(ClientData c, Tcl_Interp* tcl, in
 	TCL_Error(tcl, "no such calendar");
     }
 

 }
 
 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");
 	    }

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-calendar_Makefile.in (-2 / +2 lines)
1	--- calendar/Makefile.in.orig Sat Apr 29 15:16:46 2000	1	--- calendar/Makefile.in.orig 1997-10-21 23:52:59 UTC
2	+++ calendar/Makefile.in Sat Apr 29 15:16:54 2000	2	+++ calendar/Makefile.in
3	@@ -12,7 +12,6 @@	3	@@ -12,7 +12,6 @@
4	AR = ar	4	AR = ar
5	ECHO = echo	5	ECHO = echo




--- 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;

Lines 1-6 Link Here

(-)deskutils/ical-2.2_6/files/patch-calendar_calfile.C (-1 / +1 lines)
1	--- calendar/calfile.C.orig 1997-05-24 00:23:52 UTC	1	--- calendar/calfile.C.orig 1997-05-24 00:23:52 UTC
2	+++ calendar/calfile.C	2	+++ calendar/calfile.C
3	@@ -60,7 +60,7 @@ CalFile::CalFile(int ro, const char* nam	3	@@ -60,7 +60,7 @@ CalFile::CalFile(int ro, const char* name) {
4	backupName = tmp;	4	backupName = tmp;
5		5
6	// Get directory name for access checks	6	// Get directory name for access checks

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-config.h.in (-2 / +2 lines)
1	--- config.h.in.orig Sun Jul 2 15:12:55 1995	1	--- config.h.in.orig 1995-07-02 22:12:55 UTC
2	+++ config.h.in Wed Oct 15 13:19:33 2003	2	+++ config.h.in
3	@@ -5,26 +5,26 @@	3	@@ -5,26 +5,26 @@
4	#undef pid_t	4	#undef pid_t
5		5

Lines 1-6 Link Here

(-)deskutils/ical-2.2_6/files/patch-dateeditor.C (-6 / +9 lines)
1	--- dateeditor.C.orig 1996-02-10 04:17:35.000000000 +0100	1	--- dateeditor.C.orig 1996-02-10 03:17:35 UTC
2	+++ dateeditor.C 2003-04-28 18:14:32.000000000 +0200	2	+++ dateeditor.C
3	@@ -113,7 +113,7 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter	3	@@ -113,7 +113,7 @@ int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int ar
4	}	4	}
5		5
6	int count;	6	int count;
Lines 9-17 Link Here
9	if (Tcl_SplitList(tcl, argv[2], &count, &strlist) != TCL_OK) {	9	if (Tcl_SplitList(tcl, argv[2], &count, &strlist) != TCL_OK) {
10	return TCL_ERROR;	10	return TCL_ERROR;
11	}	11	}
12	@@ -148,12 +148,12 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter	12	@@ -146,14 +146,14 @@ int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int ar
		13	if (!contains(hlist, hilite)) hilite = "always";
		14
13	char buffer[20];	15	char buffer[20];
14	sprintf(buffer, "%d", list[i].date.EpochDays());	16	- sprintf(buffer, "%d", list[i].date.EpochDays());
		17	+ sprintf(buffer, "%ld", list[i].date.EpochDays());
15	if (Tcl_SetVar(tcl, dvar, buffer, 0) == NULL) {	18	if (Tcl_SetVar(tcl, dvar, buffer, 0) == NULL) {
16	- free((char*) strlist);	19	- free((char*) strlist);
17	+ Tcl_Free((char*) strlist);	20	+ Tcl_Free((char*) strlist);
Lines 24-30 Link Here
24	TCL_Error(tcl, "could not set loop variable");	27	TCL_Error(tcl, "could not set loop variable");
25	}	28	}
26		29
27	@@ -165,11 +165,11 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter	30	@@ -165,11 +165,11 @@ int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int ar
28	if (result == TCL_BREAK) break;	31	if (result == TCL_BREAK) break;
29		32
30	// Error of some sort	33	// Error of some sort

Lines 1-6 Link Here

(-)deskutils/ical-2.2_6/files/patch-dispatch.C (-3 / +3 lines)
1	--- dispatch.C.orig 1994-05-20 05:21:54.000000000 +0200	1	--- dispatch.C.orig 1994-05-20 03:21:54 UTC
2	+++ dispatch.C 2003-04-28 18:14:32.000000000 +0200	2	+++ dispatch.C
3	@@ -24,7 +24,7 @@ int Dispatch(Dispatch_Entry* table, Clie	3	@@ -24,7 +24,7 @@ int Dispatch(Dispatch_Entry* table, ClientData c, Tcl_
4	if ((entry->max_arg_count >= 0) && (argc > entry->max_arg_count)) {	4	if ((entry->max_arg_count >= 0) && (argc > entry->max_arg_count)) {
5	TCL_Error(tcl, "too many arguments");	5	TCL_Error(tcl, "too many arguments");
6	}	6	}




--- ical.h.orig	1996-02-10 03:17:36 UTC
+++ ical.h
@@ -4,6 +4,11 @@
 
 #include <tcl.h>

+
 // 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)
 

Lines 1-6 Link Here

(-)deskutils/ical-2.2_6/files/patch-item_tcl.C (-44 / +135 lines)
1	--- item_tcl.C.orig Sun Nov 28 17:31:26 1999	1	--- item_tcl.C.orig 1996-08-01 19:25:10 UTC
2	+++ item_tcl.C Sun Nov 28 17:32:25 1999	2	+++ item_tcl.C
3	@@ -106,52 +106,52 @@	3	@@ -106,52 +106,52 @@ static int item_mweekday (ClientData, Tcl_Interp*, int
4	static int item_mlweekday (ClientData, Tcl_Interp, int, char[]);	4	static int item_mlweekday (ClientData, Tcl_Interp, int, char[]);
5		5
6	static Dispatch_Entry item_dispatch[] = {	6	static Dispatch_Entry item_dispatch[] = {
Lines 14-20 Link Here
14	- { "alarms", 0, 1, item_alarms },	14	- { "alarms", 0, 1, item_alarms },
15	- { "option", 1, 2, item_option },	15	- { "option", 1, 2, item_option },
16	- { "delete_option", 1, 1, item_doption },	16	- { "delete_option", 1, 1, item_doption },
17	-	17	+ { "length", 0, 1, (Tcl_CmdProc *)item_length },
		18	+ { "starttime", 0, 1, (Tcl_CmdProc *)item_startt },
		19	+ { "alarms", 0, 1, (Tcl_CmdProc *)item_alarms },
		20	+ { "option", 1, 2, (Tcl_CmdProc *)item_option },
		21	+ { "delete_option", 1, 1, (Tcl_CmdProc *)item_doption },
		22
18	- { "is", 1, 1, item_is },	23	- { "is", 1, 1, item_is },
19	- { "calendar", 0, 0, item_cal },	24	- { "calendar", 0, 0, item_cal },
20	- { "text", 0, 1, item_text },	25	- { "text", 0, 1, item_text },
Lines 27-63 Link Here
27	- { "todo", 0, 1, item_todo },	32	- { "todo", 0, 1, item_todo },
28	- { "is_done", 0, 0, item_is_done },	33	- { "is_done", 0, 0, item_is_done },
29	- { "done", 1, 1, item_done },	34	- { "done", 1, 1, item_done },
30	-
31	- { "contains", 1, 1, item_cont },
32	- { "empty", 0, 0, item_empty },
33	- { "repeats", 0, 0, item_repeat },
34	- { "first", 0, 0, item_first },
35	- { "next", 1, 1, item_next },
36	- { "range", 2, 2, item_range },
37	- { "type", 0, 0, item_type },
38	- { "describe_repeat", 0, 0, item_desc },
39	-
40	- { "date", 1, 1, item_date },
41	- { "dayrepeat", 2, 2, item_dayr },
42	-
43	- { "monthrepeat", 2, 2, item_monthr },
44	- { "month_day", 1, 3, item_mday },
45	- { "month_last_day", 1, 3, item_mlday },
46	- { "month_work_day", 1, 3, item_mworkday },
47	- { "month_last_work_day", 1, 3, item_mlworkday },
48	- { "month_week_day", 2, 4, item_mweekday },
49	- { "month_last_week_day", 2, 4, item_mlweekday },
50	-
51	- { "weekdays", 0, -1, item_wdays },
52	- { "start", 1, 1, item_start },
53	- { "finish", 1, 1, item_finish },
54	- { "deleteon", 1, 1, item_ondel },
55	+ { "length", 0, 1, (Tcl_CmdProc *)item_length },
56	+ { "starttime", 0, 1, (Tcl_CmdProc *)item_startt },
57	+ { "alarms", 0, 1, (Tcl_CmdProc *)item_alarms },
58	+ { "option", 1, 2, (Tcl_CmdProc *)item_option },
59	+ { "delete_option", 1, 1, (Tcl_CmdProc *)item_doption },
60	+
61	+ { "is", 1, 1, (Tcl_CmdProc *)item_is },	35	+ { "is", 1, 1, (Tcl_CmdProc *)item_is },
62	+ { "calendar", 0, 0, (Tcl_CmdProc *)item_cal },	36	+ { "calendar", 0, 0, (Tcl_CmdProc *)item_cal },
63	+ { "text", 0, 1, (Tcl_CmdProc *)item_text },	37	+ { "text", 0, 1, (Tcl_CmdProc *)item_text },
Lines 70-76 Link Here
70	+ { "todo", 0, 1, (Tcl_CmdProc *)item_todo },	44	+ { "todo", 0, 1, (Tcl_CmdProc *)item_todo },
71	+ { "is_done", 0, 0, (Tcl_CmdProc *)item_is_done },	45	+ { "is_done", 0, 0, (Tcl_CmdProc *)item_is_done },
72	+ { "done", 1, 1, (Tcl_CmdProc *)item_done },	46	+ { "done", 1, 1, (Tcl_CmdProc *)item_done },
73	+	47
		48	- { "contains", 1, 1, item_cont },
		49	- { "empty", 0, 0, item_empty },
		50	- { "repeats", 0, 0, item_repeat },
		51	- { "first", 0, 0, item_first },
		52	- { "next", 1, 1, item_next },
		53	- { "range", 2, 2, item_range },
		54	- { "type", 0, 0, item_type },
		55	- { "describe_repeat", 0, 0, item_desc },
74	+ { "contains", 1, 1, (Tcl_CmdProc *)item_cont },	56	+ { "contains", 1, 1, (Tcl_CmdProc *)item_cont },
75	+ { "empty", 0, 0, (Tcl_CmdProc *)item_empty },	57	+ { "empty", 0, 0, (Tcl_CmdProc *)item_empty },
76	+ { "repeats", 0, 0, (Tcl_CmdProc *)item_repeat },	58	+ { "repeats", 0, 0, (Tcl_CmdProc *)item_repeat },
Lines 79-88 Link Here
79	+ { "range", 2, 2, (Tcl_CmdProc *)item_range },	61	+ { "range", 2, 2, (Tcl_CmdProc *)item_range },
80	+ { "type", 0, 0, (Tcl_CmdProc *)item_type },	62	+ { "type", 0, 0, (Tcl_CmdProc *)item_type },
81	+ { "describe_repeat", 0, 0, (Tcl_CmdProc *)item_desc },	63	+ { "describe_repeat", 0, 0, (Tcl_CmdProc *)item_desc },
82	+	64
		65	- { "date", 1, 1, item_date },
		66	- { "dayrepeat", 2, 2, item_dayr },
83	+ { "date", 1, 1, (Tcl_CmdProc *)item_date },	67	+ { "date", 1, 1, (Tcl_CmdProc *)item_date },
84	+ { "dayrepeat", 2, 2, (Tcl_CmdProc *)item_dayr },	68	+ { "dayrepeat", 2, 2, (Tcl_CmdProc *)item_dayr },
85	+	69
		70	- { "monthrepeat", 2, 2, item_monthr },
		71	- { "month_day", 1, 3, item_mday },
		72	- { "month_last_day", 1, 3, item_mlday },
		73	- { "month_work_day", 1, 3, item_mworkday },
		74	- { "month_last_work_day", 1, 3, item_mlworkday },
		75	- { "month_week_day", 2, 4, item_mweekday },
		76	- { "month_last_week_day", 2, 4, item_mlweekday },
86	+ { "monthrepeat", 2, 2, (Tcl_CmdProc *)item_monthr },	77	+ { "monthrepeat", 2, 2, (Tcl_CmdProc *)item_monthr },
87	+ { "month_day", 1, 3, (Tcl_CmdProc *)item_mday },	78	+ { "month_day", 1, 3, (Tcl_CmdProc *)item_mday },
88	+ { "month_last_day", 1, 3, (Tcl_CmdProc *)item_mlday },	79	+ { "month_last_day", 1, 3, (Tcl_CmdProc *)item_mlday },
Lines 90-96 Link Here
90	+ { "month_last_work_day", 1, 3, (Tcl_CmdProc *)item_mlworkday },	81	+ { "month_last_work_day", 1, 3, (Tcl_CmdProc *)item_mlworkday },
91	+ { "month_week_day", 2, 4, (Tcl_CmdProc *)item_mweekday },	82	+ { "month_week_day", 2, 4, (Tcl_CmdProc *)item_mweekday },
92	+ { "month_last_week_day", 2, 4, (Tcl_CmdProc *)item_mlweekday },	83	+ { "month_last_week_day", 2, 4, (Tcl_CmdProc *)item_mlweekday },
93	+	84
		85	- { "weekdays", 0, -1, item_wdays },
		86	- { "start", 1, 1, item_start },
		87	- { "finish", 1, 1, item_finish },
		88	- { "deleteon", 1, 1, item_ondel },
94	+ { "weekdays", 0, -1, (Tcl_CmdProc *)item_wdays },	89	+ { "weekdays", 0, -1, (Tcl_CmdProc *)item_wdays },
95	+ { "start", 1, 1, (Tcl_CmdProc *)item_start },	90	+ { "start", 1, 1, (Tcl_CmdProc *)item_start },
96	+ { "finish", 1, 1, (Tcl_CmdProc *)item_finish },	91	+ { "finish", 1, 1, (Tcl_CmdProc *)item_finish },
Lines 98-105 Link Here
98		93
99	{ 0, 0, 0, 0 }	94	{ 0, 0, 0, 0 }
100	};	95	};
101	+++ item_tcl.C Sun Nov 28 17:32:25 1999	96	@@ -329,7 +329,7 @@ static int item_owner(ClientData c, Tcl_Interp* tcl, i
102	@@ -329,7 +329,7 @@
103		97
104	static int item_owned(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {	98	static int item_owned(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
105	Item_Tcl* item = (Item_Tcl*) c;	99	Item_Tcl* item = (Item_Tcl*) c;
Lines 108-114 Link Here
108	}	102	}
109		103
110	static int item_own(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {	104	static int item_own(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
111	@@ -431,7 +431,7 @@ static int item_alarms(ClientData c, Tcl	105	@@ -431,7 +431,7 @@ static int item_alarms(ClientData c, Tcl_Interp* tcl,
112	}	106	}
113		107
114	int count;	108	int count;
Lines 117-123 Link Here
117	if (Tcl_SplitList(tcl, argv[0], &count, &list) != TCL_OK) {	111	if (Tcl_SplitList(tcl, argv[0], &count, &list) != TCL_OK) {
118	TCL_Error(tcl, "invalid alarm list");	112	TCL_Error(tcl, "invalid alarm list");
119	}	113	}
120	@@ -492,12 +492,12 @@	114	@@ -492,12 +492,12 @@ static int item_doption(ClientData c, Tcl_Interp* tcl,
121		115
122	static int item_empty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {	116	static int item_empty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
123	Item_Tcl* item = (Item_Tcl*) c;	117	Item_Tcl* item = (Item_Tcl*) c;
Lines 132-138 Link Here
132	}	126	}
133		127
134	static int item_first(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {	128	static int item_first(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
135	@@ -576,7 +576,7 @@	129	@@ -508,7 +508,7 @@ static int item_first(ClientData c, Tcl_Interp* tcl, i
		130	}
		131
		132	char buffer[100];
		133	- sprintf(buffer, "%d", d.EpochDays());
		134	+ sprintf(buffer, "%ld", d.EpochDays());
		135	Tcl_SetResult(tcl, buffer, TCL_VOLATILE);
		136	return TCL_OK;
		137	}
		138	@@ -518,43 +518,43 @@ static int item_type(ClientData c, Tcl_Interp* tcl, in
		139	char* result;
		140	switch (item->value()->repeat_type()) {
		141	case DateSet::None:
		142	- result = "";
		143	+ result = (char *)"";
		144	break;
		145	case DateSet::Daily:
		146	- result = "Daily";
		147	+ result = (char *)"Daily";
		148	break;
		149	case DateSet::Weekly:
		150	- result = "Weekly";
		151	+ result = (char *)"Weekly";
		152	break;
		153	case DateSet::BiWeekly:
		154	- result = "Every Two Weeks";
		155	+ result = (char *)"Every Two Weeks";
		156	break;
		157	case DateSet::ThreeWeekly:
		158	- result = "Every Three Weeks";
		159	+ result = (char *)"Every Three Weeks";
		160	break;
		161	case DateSet::FourWeekly:
		162	- result = "Every Four Weeks";
		163	+ result = (char *)"Every Four Weeks";
		164	break;
		165	case DateSet::Monthly:
		166	- result = "Monthly";
		167	+ result = (char *)"Monthly";
		168	break;
		169	case DateSet::TwoMonthly:
		170	- result = "Every Two Months";
		171	+ result = (char *)"Every Two Months";
		172	break;
		173	case DateSet::ThreeMonthly:
		174	- result = "Every Three Months";
		175	+ result = (char *)"Every Three Months";
		176	break;
		177	case DateSet::FourMonthly:
		178	- result = "Every Four Months";
		179	+ result = (char *)"Every Four Months";
		180	break;
		181	case DateSet::SixMonthly:
		182	- result = "Every Six Months";
		183	+ result = (char *)"Every Six Months";
		184	break;
		185	case DateSet::Annual:
		186	- result = "Annual";
		187	+ result = (char *)"Annual";
		188	break;
		189	default:
		190	- result = "Complex";
		191	+ result = (char *)"Complex";
		192	break;
		193	}
194	TCL_Return(tcl, result);
195	@@ -576,7 +576,7 @@ static int item_cont(ClientData c, Tcl_Interp* tcl, in
136	TCL_Error(tcl, "invalid date");	196	TCL_Error(tcl, "invalid date");
137	}	197	}
138	Date date(dateDays);	198	Date date(dateDays);
Lines 141-143 Link Here
141	}	201	}
142		202
143	static int item_next(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {	203	static int item_next(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
		204	@@ -592,7 +592,7 @@ static int item_next(ClientData c, Tcl_Interp* tcl, in
		205	}
		206
		207	char buffer[100];
		208	- sprintf(buffer, "%d", next.EpochDays());
		209	+ sprintf(buffer, "%ld", next.EpochDays());
		210	Tcl_SetResult(tcl, buffer, TCL_VOLATILE);
		211	return TCL_OK;
		212	}
		213	@@ -603,10 +603,10 @@ static int item_range(ClientData c, Tcl_Interp* tcl, i
		214	Date s, f;
		215	if (item->value()->range(s, f)) {
		216	char buffer[100];
		217	- sprintf(buffer, "%d", s.EpochDays());
		218	+ sprintf(buffer, "%ld", s.EpochDays());
		219	if (Tcl_SetVar(tcl, argv[0], buffer, 0) == NULL)
		220	TCL_Error(tcl, "could not set range start variable");
		221	- sprintf(buffer, "%d", f.EpochDays());
		222	+ sprintf(buffer, "%ld", f.EpochDays());
		223	if (Tcl_SetVar(tcl, argv[1], buffer, 0) == NULL)
		224	TCL_Error(tcl, "could not set range finish variable");
		225	TCL_Return(tcl, "1");
		226	@@ -886,7 +886,7 @@ static int check_permission(Tcl_Interp* tcl, Item_Tcl*
		227	if (file == 0) return 1;
		228
		229	if (file->GetCalendar()->ReadOnly()) {
		230	- Tcl_SetResult(tcl, "item is in readonly calendar", TCL_STATIC);
		231	+ Tcl_SetResult(tcl, (char *)"item is in readonly calendar", TCL_STATIC);
		232	return 0;
		233	}
		234




--- main.C.orig	1996-02-16 01:57:42 UTC
+++ main.C
@@ -27,13 +27,13 @@
 /* Include various libraries converted to strings. */
 

 "rename source _orig_source",
 "proc source {args} {}",
 #include "tk_lib.gen"
@@ -42,37 +42,37 @@ static char* tk_lib_str[] = {
 0
 };
 

 "set ical(tcl_interface_doc) {",
 #include "tcldoc.gen"
 "}",
@@ -173,7 +173,7 @@ main(int argc, char* argv[]) {
 
 #ifdef STANDALONE
 extern "C" int MyTcl_Init(Tcl_Interp* tcl) {

 }
 #else
 #define MyTcl_Init Tcl_Init
@@ -194,7 +194,7 @@ extern "C" int TkPlatformInit(Tcl_Interp* tcl) {
 
     TkCreateXEventSource();
 

 }
 #endif
 
@@ -245,37 +245,37 @@ int Ical_Init(Tcl_Interp* tcl) {
     }
 
     // Set-up postscript prolog

Lines 1-6 Link Here

(-)deskutils/ical-2.2_6/files/patch-object.C (-3 / +3 lines)
1	--- object.C.orig 1994-05-20 05:22:04.000000000 +0200	1	--- object.C.orig 1994-05-20 03:22:04 UTC
2	+++ object.C 2003-04-28 18:14:32.000000000 +0200	2	+++ object.C
3	@@ -33,7 +33,7 @@ void Object::init(Tcl_Interp* t, char co	3	@@ -33,7 +33,7 @@ void Object::init(Tcl_Interp* t, char const* ty, char
4	interp = t;	4	interp = t;
5		5
6	/* Create TCL Command */	6	/* Create TCL Command */

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-pref.tcl (-2 / +2 lines)
1	--- pref.tcl.orig 1997-06-13 00:50:36.000000000 +0200	1	--- pref.tcl.orig 1997-06-12 22:50:36 UTC
2	+++ pref.tcl 2003-04-28 18:46:04.000000000 +0200	2	+++ pref.tcl
3	@@ -118,7 +118,12 @@ proc pref_init {} {	3	@@ -118,7 +118,12 @@ proc pref_init {} {
4	# XXX People do not seem to like the motif-style popup behavior	4	# XXX People do not seem to like the motif-style popup behavior
5	global tk_strictMotif	5	global tk_strictMotif

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-time_Makefile.in (-2 / +2 lines)
1	--- time/Makefile.in.orig Sat Apr 29 15:17:20 2000	1	--- time/Makefile.in.orig 1996-02-10 03:17:47 UTC
2	+++ time/Makefile.in Sat Apr 29 15:17:25 2000	2	+++ time/Makefile.in
3	@@ -11,7 +11,6 @@	3	@@ -11,7 +11,6 @@
4	ECHO = echo	4	ECHO = echo
5	RANLIB = @RANLIB@	5	RANLIB = @RANLIB@

Line 0 Link Here

(-)deskutils/ical-2.2_6/files/patch-time_tcl.C (+11 lines)
	1	--- time_tcl.C.orig 1994-05-20 03:22:05 UTC
	2	+++ time_tcl.C
	3	@@ -135,7 +135,7 @@ int Cmd_Date(ClientData, Tcl_Interp* tcl, int argc, ch
	4	TCL_Return(tcl, "0");
	5
	6	// Set variables
	7	- sprintf(buffer, "%d", result.EpochDays());
	8	+ sprintf(buffer, "%ld", result.EpochDays());
	9	if (Tcl_SetVar(tcl, argv[3], buffer, 0) == NULL)
	10	TCL_Error(tcl, "could not set <date> result");
	11

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-types_Makefile.in (-2 / +2 lines)
1	--- types/Makefile.in.orig Sat Apr 29 15:17:47 2000	1	--- types/Makefile.in.orig 1997-10-21 23:53:02 UTC
2	+++ types/Makefile.in Sat Apr 29 15:17:56 2000	2	+++ types/Makefile.in
3	@@ -12,7 +12,7 @@	3	@@ -12,7 +12,7 @@
4	ECHO = echo	4	ECHO = echo
5	RANLIB = @RANLIB@	5	RANLIB = @RANLIB@

Return to bug 226799

Lines 1-6 Link Here

(-)deskutils/ical-2.2_6/files/patch-cal_tcl.C (-7 / +16 lines)
1	--- cal_tcl.C.orig Sun Nov 28 17:29:13 1999	1	--- cal_tcl.C.orig 1995-07-06 15:48:16 UTC
2	+++ cal_tcl.C Sun Nov 28 17:30:24 1999	2	+++ cal_tcl.C
3	@@ -214,27 +214,27 @@ static int cal_loopf (ClientData, Tcl_In	3	@@ -214,27 +214,27 @@ static int cal_loopf (ClientData, Tcl_Interp*, int, ch
4	static int cal_loopb (ClientData, Tcl_Interp, int, char[]);	4	static int cal_loopb (ClientData, Tcl_Interp, int, char[]);
5		5
6	static Dispatch_Entry calendar_dispatch[] = {	6	static Dispatch_Entry calendar_dispatch[] = {
Lines 49-55 Link Here
49	{ 0, 0, 0, 0 }	49	{ 0, 0, 0, 0 }
50	};	50	};
51		51
52	@@ -281,7 +281,7 @@ static int parse_items(Tcl_Interp* tcl,	52	@@ -281,7 +281,7 @@ static int parse_items(Tcl_Interp* tcl, Calendar_Tcl*
53		53
54	if ((argc >= 2) && (strcmp(argv[0], "-items") == 0)) {	54	if ((argc >= 2) && (strcmp(argv[0], "-items") == 0)) {
55	int count;	55	int count;
Lines 58-64 Link Here
58	if (Tcl_SplitList(tcl, argv[1], &count, &list) != TCL_OK) {	58	if (Tcl_SplitList(tcl, argv[1], &count, &list) != TCL_OK) {
59	TCL_Error(tcl, "invalid item list");	59	TCL_Error(tcl, "invalid item list");
60	}	60	}
61	@@ -516,7 +516,7 @@	61	@@ -516,7 +516,7 @@ static int cal_ronly(ClientData c, Tcl_Interp* tcl, in
62	TCL_Error(tcl, "no such calendar");	62	TCL_Error(tcl, "no such calendar");
63	}	63	}
64		64
Lines 67-73 Link Here
67	}	67	}
68		68
69	static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){	69	static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
70	@@ -527,7 +527,7 @@	70	@@ -527,7 +527,7 @@ static int cal_dirty(ClientData c, Tcl_Interp* tcl, in
71	TCL_Error(tcl, "no such calendar");	71	TCL_Error(tcl, "no such calendar");
72	}	72	}
73		73
Lines 76-82 Link Here
76	}	76	}
77		77
78	static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){	78	static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
79	@@ -538,7 +538,7 @@	79	@@ -538,7 +538,7 @@ static int cal_stale(ClientData c, Tcl_Interp* tcl, in
80	TCL_Error(tcl, "no such calendar");	80	TCL_Error(tcl, "no such calendar");
81	}	81	}
82		82
Lines 85-87 Link Here
85	}	85	}
86		86
87	static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){	87	static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
		88	@@ -609,7 +609,7 @@ static int item_loop(Tcl_Interp* tcl, Occurrences cons
		89
		90	if (dvar != 0) {
		91	char buffer[20];
		92	- sprintf(buffer, "%d", list[i].date.EpochDays());
		93	+ sprintf(buffer, "%ld", list[i].date.EpochDays());
		94	if (Tcl_SetVar(tcl, dvar, buffer, 0) == NULL) {
		95	TCL_Error(tcl, "could not set loop variable");
		96	}

Line 0 Link Here

(-)deskutils/ical-2.2_6/files/patch-calendar_calendar.C (+18 lines)
	1	--- calendar/calendar.C.orig 1997-05-21 20:32:59 UTC
	2	+++ calendar/calendar.C
	3	@@ -224,13 +224,13 @@ int Calendar::Read(Lexer* lex) {
	4	char* name = new char[len + 1];
	5	if (! lex->GetText(name, len) \|\|
	6	! lex->Skip(closer)) {
	7	- delete name;
	8	+ delete [] name;
	9	lex->SetError("error reading included file name");
	10	return 0;
	11	}
	12	name[len] = '\0';
	13	Include(name);
	14	- delete name;
	15	+ delete [] name;
	16	}
	17	else if (strcmp(keyword, "Hide") == 0) {
	18	char const* x;

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-ical.h (-2 / +18 lines)
1	--- ical.h.orig 1996-02-10 04:17:36.000000000 +0100	1	--- ical.h.orig 1996-02-10 03:17:36 UTC
2	+++ ical.h 2003-04-28 18:14:32.000000000 +0200	2	+++ ical.h
3	@@ -4,6 +4,11 @@	3	@@ -4,6 +4,11 @@
4		4
5	#include <tcl.h>	5	#include <tcl.h>
Lines 11-14 Link Here
11	+	11	+
12	// Proc for triggering tcl code based on changes	12	// Proc for triggering tcl code based on changes
13	// to calendars/items.	13	// to calendars/items.
		14
		15	@@ -25,13 +30,13 @@ extern void trigger(Tcl_Interp, char const ttype, ch
		16
		17	#define TCL_Return(tcl,str) \
		18	do { \
		19	- Tcl_SetResult(tcl, (str), TCL_STATIC); \
		20	+ Tcl_SetResult(tcl, ((char *)(str)), TCL_STATIC); \
		21	return TCL_OK; \
		22	} while (0)
		23
		24	#define TCL_Error(tcl,str) \
		25	do { \
		26	- Tcl_SetResult(tcl, (str), TCL_STATIC); \
		27	+ Tcl_SetResult(tcl, ((char *)(str)), TCL_STATIC); \
		28	return TCL_ERROR; \
		29	} while (0)
14		30

Lines 1-5 Link Here

(-)deskutils/ical-2.2_6/files/patch-main.C (-6 / +6 lines)
1	--- main.C.orig 1996-02-15 20:57:42.000000000 -0500	1	--- main.C.orig 1996-02-16 01:57:42 UTC
2	+++ main.C 2018-03-21 16:41:01.870226000 -0400	2	+++ main.C
3	@@ -27,13 +27,13 @@	3	@@ -27,13 +27,13 @@
4	/* Include various libraries converted to strings. */	4	/* Include various libraries converted to strings. */
5		5
Lines 16-22 Link Here
16	"rename source _orig_source",	16	"rename source _orig_source",
17	"proc source {args} {}",	17	"proc source {args} {}",
18	#include "tk_lib.gen"	18	#include "tk_lib.gen"
19	@@ -42,37 +42,37 @@	19	@@ -42,37 +42,37 @@ static char* tk_lib_str[] = {
20	0	20	0
21	};	21	};
22		22
Lines 60-66 Link Here
60	"set ical(tcl_interface_doc) {",	60	"set ical(tcl_interface_doc) {",
61	#include "tcldoc.gen"	61	#include "tcldoc.gen"
62	"}",	62	"}",
63	@@ -173,7 +173,7 @@	63	@@ -173,7 +173,7 @@ main(int argc, char* argv[]) {
64		64
65	#ifdef STANDALONE	65	#ifdef STANDALONE
66	extern "C" int MyTcl_Init(Tcl_Interp* tcl) {	66	extern "C" int MyTcl_Init(Tcl_Interp* tcl) {
Lines 69-75 Link Here
69	}	69	}
70	#else	70	#else
71	#define MyTcl_Init Tcl_Init	71	#define MyTcl_Init Tcl_Init
72	@@ -194,7 +194,7 @@	72	@@ -194,7 +194,7 @@ extern "C" int TkPlatformInit(Tcl_Interp* tcl) {
73		73
74	TkCreateXEventSource();	74	TkCreateXEventSource();
75		75
Lines 78-84 Link Here
78	}	78	}
79	#endif	79	#endif
80		80
81	@@ -245,37 +245,37 @@	81	@@ -245,37 +245,37 @@ int Ical_Init(Tcl_Interp* tcl) {
82	}	82	}
83		83
84	// Set-up postscript prolog	84	// Set-up postscript prolog