Attachment 191722 Details for Bug 226799 – [patch] fix the compilation problems

[patch] [patch] fix the compilation problems

ical-2.2_5.diff (text/plain), 10.84 KB, created by J.R. Oldroyd on 2018-03-21 20:57:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: J.R. Oldroyd

Created: 2018-03-21 20:57:22 UTC

Size: 10.84 KB

patch

obsolete

>diff -ruN /usr/ports/deskutils/ical/Makefile deskutils/ical/Makefile
>--- /usr/ports/deskutils/ical/Makefile	2018-03-21 16:00:32.078048000 -0400
>+++ deskutils/ical/Makefile	2018-03-21 16:51:57.878442000 -0400
>@@ -3,14 +3,14 @@
> 
> PORTNAME=	ical
> PORTVERSION=	2.2
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	deskutils tk
> MASTER_SITES=	ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/
> 
> PATCH_SITES=	http://www.isi.edu/~johnh/SOFTWARE/ICAL/
> PATCHFILES=	ical-2.3.1-upvar.patch
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	fbsd@opal.com
> COMMENT=	Calendar application
> 
> LICENSE=	GPLv2
>diff -ruN /usr/ports/deskutils/ical/files/patch-bitmaps-dleft.xbm deskutils/ical/files/patch-bitmaps-dleft.xbm
>--- /usr/ports/deskutils/ical/files/patch-bitmaps-dleft.xbm	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical/files/patch-bitmaps-dleft.xbm	2018-03-21 16:35:06.697814000 -0400
>@@ -0,0 +1,10 @@
>+--- bitmaps/dleft.xbm.orig	1994-12-17 16:41:32.000000000 -0500
>++++ bitmaps/dleft.xbm	2018-03-21 16:30:16.156611000 -0400
>+@@ -1,6 +1,6 @@
>+ #define dleft_width 16
>+ #define dleft_height 16
>+-static char dleft_bits[] = {
>++static unsigned char dleft_bits[] = {
>+    0x00, 0x00, 0x80, 0x61, 0xc0, 0x71, 0xe0, 0x79, 0xf0, 0x7d, 0xf8, 0x7f,
>+    0xfc, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfc, 0x7f, 0xf8, 0x7f, 0xf0, 0x7d,
>+    0xe0, 0x79, 0xc0, 0x71, 0x80, 0x61, 0x00, 0x00};
>diff -ruN /usr/ports/deskutils/ical/files/patch-bitmaps-done.xbm deskutils/ical/files/patch-bitmaps-done.xbm
>--- /usr/ports/deskutils/ical/files/patch-bitmaps-done.xbm	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical/files/patch-bitmaps-done.xbm	2018-03-21 16:35:06.710395000 -0400
>@@ -0,0 +1,10 @@
>+--- bitmaps/done.xbm.orig	1994-12-17 16:29:47.000000000 -0500
>++++ bitmaps/done.xbm	2018-03-21 16:30:37.428943000 -0400
>+@@ -1,6 +1,6 @@
>+ #define done_width 16
>+ #define done_height 16
>+-static char done_bits[] = {
>++static unsigned char done_bits[] = {
>+    0x00, 0x00, 0xff, 0x8f, 0xff, 0x67, 0x03, 0x30, 0x03, 0x18, 0x03, 0x4c,
>+    0x33, 0x6e, 0x7b, 0x67, 0xff, 0x67, 0xfb, 0x63, 0xf3, 0x63, 0xe3, 0x61,
>+    0xc3, 0x61, 0x83, 0x60, 0xff, 0x7f, 0xff, 0x7f};
>diff -ruN /usr/ports/deskutils/ical/files/patch-bitmaps-dright.xbm deskutils/ical/files/patch-bitmaps-dright.xbm
>--- /usr/ports/deskutils/ical/files/patch-bitmaps-dright.xbm	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical/files/patch-bitmaps-dright.xbm	2018-03-21 16:35:06.722931000 -0400
>@@ -0,0 +1,10 @@
>+--- bitmaps/dright.xbm.orig	1994-12-17 16:41:33.000000000 -0500
>++++ bitmaps/dright.xbm	2018-03-21 16:30:44.179406000 -0400
>+@@ -1,6 +1,6 @@
>+ #define dright_width 16
>+ #define dright_height 16
>+-static char dright_bits[] = {
>++static unsigned char dright_bits[] = {
>+    0x00, 0x00, 0x86, 0x01, 0x8e, 0x03, 0x9e, 0x07, 0xbe, 0x0f, 0xfe, 0x1f,
>+    0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x3f, 0xfe, 0x1f, 0xbe, 0x0f,
>+    0x9e, 0x07, 0x8e, 0x03, 0x86, 0x01, 0x00, 0x00};
>diff -ruN /usr/ports/deskutils/ical/files/patch-bitmaps-ical.xbm deskutils/ical/files/patch-bitmaps-ical.xbm
>--- /usr/ports/deskutils/ical/files/patch-bitmaps-ical.xbm	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical/files/patch-bitmaps-ical.xbm	2018-03-21 16:35:06.735338000 -0400
>@@ -0,0 +1,10 @@
>+--- bitmaps/ical.xbm.orig	1996-01-23 19:43:16.000000000 -0500
>++++ bitmaps/ical.xbm	2018-03-21 16:31:00.051970000 -0400
>+@@ -1,6 +1,6 @@
>+ #define ical_width 64
>+ #define ical_height 54
>+-static char ical_bits[] = {
>++static unsigned char ical_bits[] = {
>+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
>+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
>+    0x00, 0x00, 0x30, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00,
>diff -ruN /usr/ports/deskutils/ical/files/patch-bitmaps-left.xbm deskutils/ical/files/patch-bitmaps-left.xbm
>--- /usr/ports/deskutils/ical/files/patch-bitmaps-left.xbm	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical/files/patch-bitmaps-left.xbm	2018-03-21 16:35:06.747981000 -0400
>@@ -0,0 +1,11 @@
>+--- bitmaps/left.xbm.orig	1994-12-17 16:29:48.000000000 -0500
>++++ bitmaps/left.xbm	2018-03-21 16:31:06.288351000 -0400
>+@@ -1,7 +1,7 @@
>+ /* Copyright (c) 1993 by Sanjay Ghemawat */
>+ #define left_width 16
>+ #define left_height 16
>+-static char left_bits[] = {
>++static unsigned char left_bits[] = {
>+    0x00, 0x00, 0x80, 0x01, 0x40, 0x01, 0x20, 0x01, 0x10, 0x01, 0x08, 0x7f,
>+    0x04, 0x40, 0x02, 0x40, 0x02, 0x40, 0x04, 0x40, 0x08, 0x7f, 0x10, 0x01,
>+    0x20, 0x01, 0x40, 0x01, 0x80, 0x01, 0x00, 0x00};
>diff -ruN /usr/ports/deskutils/ical/files/patch-bitmaps-right.xbm deskutils/ical/files/patch-bitmaps-right.xbm
>--- /usr/ports/deskutils/ical/files/patch-bitmaps-right.xbm	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical/files/patch-bitmaps-right.xbm	2018-03-21 16:35:06.760566000 -0400
>@@ -0,0 +1,11 @@
>+--- bitmaps/right.xbm.orig	1994-12-17 16:29:49.000000000 -0500
>++++ bitmaps/right.xbm	2018-03-21 16:31:10.705826000 -0400
>+@@ -1,7 +1,7 @@
>+ /* Copyright (c) 1993 by Sanjay Ghemawat */
>+ #define right_width 16
>+ #define right_height 16
>+-static char right_bits[] = {
>++static unsigned char right_bits[] = {
>+    0x00, 0x00, 0x80, 0x01, 0x80, 0x02, 0x80, 0x04, 0x80, 0x08, 0xfe, 0x10,
>+    0x02, 0x20, 0x02, 0x40, 0x02, 0x40, 0x02, 0x20, 0xfe, 0x10, 0x80, 0x08,
>+    0x80, 0x04, 0x80, 0x02, 0x80, 0x01, 0x00, 0x00};
>diff -ruN /usr/ports/deskutils/ical/files/patch-bitmaps-sleft.xbm deskutils/ical/files/patch-bitmaps-sleft.xbm
>--- /usr/ports/deskutils/ical/files/patch-bitmaps-sleft.xbm	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical/files/patch-bitmaps-sleft.xbm	2018-03-21 16:35:06.772953000 -0400
>@@ -0,0 +1,10 @@
>+--- bitmaps/sleft.xbm.orig	1994-12-17 16:41:34.000000000 -0500
>++++ bitmaps/sleft.xbm	2018-03-21 16:29:50.989271000 -0400
>+@@ -1,6 +1,6 @@
>+ #define sleft_width 16
>+ #define sleft_height 16
>+-static char sleft_bits[] = {
>++static unsigned char sleft_bits[] = {
>+    0x00, 0x00, 0x00, 0x0c, 0x00, 0x0e, 0x00, 0x0f, 0x80, 0x0f, 0xc0, 0x0f,
>+    0xe0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xe0, 0x0f, 0xc0, 0x0f, 0x80, 0x0f,
>+    0x00, 0x0f, 0x00, 0x0e, 0x00, 0x0c, 0x00, 0x00};
>diff -ruN /usr/ports/deskutils/ical/files/patch-bitmaps-sright.xbm deskutils/ical/files/patch-bitmaps-sright.xbm
>--- /usr/ports/deskutils/ical/files/patch-bitmaps-sright.xbm	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical/files/patch-bitmaps-sright.xbm	2018-03-21 16:35:06.785431000 -0400
>@@ -0,0 +1,10 @@
>+--- bitmaps/sright.xbm.orig	1994-12-17 16:41:34.000000000 -0500
>++++ bitmaps/sright.xbm	2018-03-21 16:31:20.968994000 -0400
>+@@ -1,6 +1,6 @@
>+ #define sright_width 16
>+ #define sright_height 16
>+-static char sright_bits[] = {
>++static unsigned char sright_bits[] = {
>+    0x00, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00, 0xf0, 0x01, 0xf0, 0x03,
>+    0xf0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x07, 0xf0, 0x03, 0xf0, 0x01,
>+    0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x00, 0x00};
>diff -ruN /usr/ports/deskutils/ical/files/patch-bitmaps-todo.xbm deskutils/ical/files/patch-bitmaps-todo.xbm
>--- /usr/ports/deskutils/ical/files/patch-bitmaps-todo.xbm	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical/files/patch-bitmaps-todo.xbm	2018-03-21 16:35:06.797824000 -0400
>@@ -0,0 +1,10 @@
>+--- bitmaps/todo.xbm.orig	1994-12-17 16:29:49.000000000 -0500
>++++ bitmaps/todo.xbm	2018-03-21 16:31:31.632338000 -0400
>+@@ -1,6 +1,6 @@
>+ #define todo_width 16
>+ #define todo_height 16
>+-static char todo_bits[] = {
>++static unsigned char todo_bits[] = {
>+    0x00, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60,
>+    0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60,
>+    0x03, 0x60, 0x03, 0x60, 0xff, 0x7f, 0xff, 0x7f};
>diff -ruN /usr/ports/deskutils/ical/files/patch-main.C deskutils/ical/files/patch-main.C
>--- /usr/ports/deskutils/ical/files/patch-main.C	2018-03-21 16:50:15.215144000 -0400
>+++ deskutils/ical/files/patch-main.C	2018-03-21 16:41:39.927260000 -0400
>@@ -1,8 +1,99 @@
>---- main.C.tcl84fixes	1996-02-16 02:57:42.000000000 +0100
>-+++ main.C	2003-04-28 18:14:32.000000000 +0200
>-@@ -255,14 +255,14 @@ int Ical_Init(Tcl_Interp* tcl) {
>+--- main.C.orig	1996-02-15 20:57:42.000000000 -0500
>++++ main.C	2018-03-21 16:41:01.870226000 -0400
>+@@ -27,13 +27,13 @@
>+ /* Include various libraries converted to strings. */
>+ 
>+ #ifdef STANDALONE
>+-static char* tcl_lib_str[] = {
>++static const char* tcl_lib_str[] = {
>+ #include "tcl_lib.gen"
>+ 0
>+ };
>+ 
>+ // Need to disable "source" command
>+-static char* tk_lib_str[] = {
>++static const char* tk_lib_str[] = {
>+ "rename source _orig_source",
>+ "proc source {args} {}",
>+ #include "tk_lib.gen"
>+@@ -42,37 +42,37 @@
>+ 0
>+ };
>+ 
>+-static char* ical_lib_str[] = {
>++static const char* ical_lib_str[] = {
>+ #include "ical_lib.gen"
>+ 0
>+ };
>+ 
>+-static char* tcllib_str[] = {
>++static const char* tcllib_str[] = {
>+ #include "tcllib.gen"
>+ 0
>+ };
>+ #endif
>+ 
>+-static char* ical_startup[] = {
>++static const char* ical_startup[] = {
>+ #include "ical_start.gen"
>+ 0
>+ };
>+ 
>+-static char* psheader_str[] = {
>++static const char* psheader_str[] = {
>+ "set ical(psheader) {%!PS-Adobe-",
>+ #include "psheader.gen"
>+ "}",
>+ 0
>+ };
>+ 
>+-static char* ical_doc_str[] = {
>++static const char* ical_doc_str[] = {
>+ "set ical(doc) {",
>+ #include "icaldoc.gen"
>+ "}",
>+ 0
>+ };
>+ 
>+-static char* tcl_doc_str[] = {
>++static const char* tcl_doc_str[] = {
>+ "set ical(tcl_interface_doc) {",
>+ #include "tcldoc.gen"
>+ "}",
>+@@ -173,7 +173,7 @@
>+ 
>+ #ifdef STANDALONE
>+ extern "C" int MyTcl_Init(Tcl_Interp* tcl) {
>+-    return (eval_list(tcl, tcl_lib_str));
>++    return (eval_list(tcl, (char **)tcl_lib_str));
>+ }
>+ #else
>+ #define MyTcl_Init Tcl_Init
>+@@ -194,7 +194,7 @@
>+ 
>+     TkCreateXEventSource();
>+ 
>+-    return (eval_list(tcl, tk_lib_str));
>++    return (eval_list(tcl, (char **)tk_lib_str));
>+ }
>+ #endif
>+ 
>+@@ -245,37 +245,37 @@
>+     }
>+ 
>+     // Set-up postscript prolog
>+-    if (eval_list(tcl, psheader_str) != TCL_OK)
>++    if (eval_list(tcl, (char **)psheader_str) != TCL_OK)
>  	return TCL_ERROR;
>  
>+     // Set-up documentation
>+-    if (eval_list(tcl, ical_doc_str) != TCL_OK)
>++    if (eval_list(tcl, (char **)ical_doc_str) != TCL_OK)
>+ 	return TCL_ERROR;
>+-    if (eval_list(tcl, tcl_doc_str) != TCL_OK)
>++    if (eval_list(tcl, (char **)tcl_doc_str) != TCL_OK)
>+ 	return TCL_ERROR;
>+ 
>      // Non-Tk ical commands
> -    Tcl_CreateCommand(tcl, "calendar",     Cmd_CreateCalendar,	NULL, NULL);
> -    Tcl_CreateCommand(tcl, "notice",       Cmd_CreateNotice,	NULL, NULL);
>@@ -23,3 +114,19 @@
>  
>  #ifdef STANDALONE
>      // Load tcllib files
>+-    if (eval_list(tcl, tcllib_str) != TCL_OK)
>++    if (eval_list(tcl, (char **)tcllib_str) != TCL_OK)
>+ 	return TCL_ERROR;
>+ 
>+     // Load ical library files
>+-    if (eval_list(tcl, ical_lib_str) != TCL_OK)
>++    if (eval_list(tcl, (char **)ical_lib_str) != TCL_OK)
>+ 	return TCL_ERROR;
>+ #endif
>+ 
>+     // Initialize ical stuff
>+-    if (eval_list(tcl, ical_startup) != TCL_OK)
>++    if (eval_list(tcl, (char **)ical_startup) != TCL_OK)
>+ 	return TCL_ERROR;
>+ 
>+     if (Tcl_Eval(tcl, "ical_init") == TCL_ERROR)

Actions: View | Diff

Attachments on bug 226799: 191659 | 191722 | 191755 | 191756