From 24e3021aa974b3117994cfcc60a29f21cfe32740 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Fri, 6 Dec 1996 23:02:15 +0000 Subject: Author fixed a path bug. Broke up huge patchfile by filename. --- sysutils/xloadface/files/patch-01 | 331 +------------------------------------- sysutils/xloadface/files/patch-02 | 40 +++++ sysutils/xloadface/files/patch-03 | 29 ++++ sysutils/xloadface/files/patch-04 | 65 ++++++++ sysutils/xloadface/files/patch-05 | 9 ++ sysutils/xloadface/files/patch-06 | 20 +++ sysutils/xloadface/files/patch-07 | 11 ++ sysutils/xloadface/files/patch-08 | 11 ++ 8 files changed, 192 insertions(+), 324 deletions(-) create mode 100644 sysutils/xloadface/files/patch-02 create mode 100644 sysutils/xloadface/files/patch-03 create mode 100644 sysutils/xloadface/files/patch-04 create mode 100644 sysutils/xloadface/files/patch-05 create mode 100644 sysutils/xloadface/files/patch-06 create mode 100644 sysutils/xloadface/files/patch-07 create mode 100644 sysutils/xloadface/files/patch-08 (limited to 'sysutils/xloadface') diff --git a/sysutils/xloadface/files/patch-01 b/sysutils/xloadface/files/patch-01 index 9a5acf43e589..7fd6d41e33a7 100644 --- a/sysutils/xloadface/files/patch-01 +++ b/sysutils/xloadface/files/patch-01 @@ -1,324 +1,7 @@ -diff -cr xloadface-1.6.1.org/ArrangeBox.c xloadface-1.6.1/ArrangeBox.c -*** xloadface-1.6.1.org/ArrangeBox.c Tue Oct 29 23:39:53 1996 ---- xloadface-1.6.1/ArrangeBox.c Thu Nov 28 11:26:32 1996 -*************** -*** 69,75 **** - }, - { - /* box_class fields */ -! /* empty */ NULL, - }, - { - /* ArrangeBox class fields */ ---- 69,75 ---- - }, - { - /* box_class fields */ -! /* empty */ 0, - }, - { - /* ArrangeBox class fields */ -*************** -*** 194,201 **** - w->core.parent->core.border_width); - XtResizeWindow(w->core.parent); - } -! XtResizeWidget(w,width,height,w->core.border_width); -! XtResizeWindow(w); - } - } - ---- 194,201 ---- - w->core.parent->core.border_width); - XtResizeWindow(w->core.parent); - } -! XtResizeWidget((Widget)w,width,height,w->core.border_width); -! XtResizeWindow((Widget)w); - } - } - -*************** -*** 203,217 **** - * Insert child method - */ - static void -! InsertChild(w,arg,num_args) - Widget w; -- ArgList arg; -- Cardinal *num_args; - { - ArrangeBoxWidget ab; - - ab = (ArrangeBoxWidget)w->core.parent; -! (*((CompositeClassRec*)XtSuperclass(ab))->composite_class.insert_child)(w,arg,num_args); - RearrangeSize(ab); - } - ---- 203,215 ---- - * Insert child method - */ - static void -! InsertChild(w) - Widget w; - { - ArrangeBoxWidget ab; - - ab = (ArrangeBoxWidget)w->core.parent; -! (*((CompositeClassRec*)XtSuperclass(ab))->composite_class.insert_child)(w); - RearrangeSize(ab); - } - -diff -cr xloadface-1.6.1.org/Imakefile xloadface-1.6.1/Imakefile -*** xloadface-1.6.1.org/Imakefile Tue Oct 29 23:39:53 1996 ---- xloadface-1.6.1/Imakefile Thu Nov 28 11:26:32 1996 -*************** -*** 11,14 **** - SYS_LIBRARIES = -lm - - ComplexProgramTarget(xloadface) -- InstallManPage(xloadface.1,$(MANDIR)/xalive.n) ---- 11,13 ---- -diff -cr xloadface-1.6.1.org/LabeledPicture.c xloadface-1.6.1/LabeledPicture.c -*** xloadface-1.6.1.org/LabeledPicture.c Tue Oct 29 23:39:53 1996 ---- xloadface-1.6.1/LabeledPicture.c Thu Nov 28 11:26:32 1996 -*************** -*** 153,159 **** - Window rootwin; - - lp->label_width = XTextWidth(lp->font,lp->label,strlen(lp->label)); -! if (lp->pixmap != NULL && lp->pixmap != AiNullPixmap) { - XGetGeometry(XtDisplay(w),lp->pixmap, - &rootwin, - &x, ---- 153,159 ---- - Window rootwin; - - lp->label_width = XTextWidth(lp->font,lp->label,strlen(lp->label)); -! if (lp->pixmap != 0 && lp->pixmap != AiNullPixmap) { - XGetGeometry(XtDisplay(w),lp->pixmap, - &rootwin, - &x, -*************** -*** 355,361 **** - { - UnSelectIt(w); - if (w->labeled_picture.sensitive) { -! XtCallCallbacks(w, AiNcallback, (caddr_t)event); - } - } - ---- 355,361 ---- - { - UnSelectIt(w); - if (w->labeled_picture.sensitive) { -! XtCallCallbacks((Widget)w, AiNcallback, (caddr_t)event); - } - } - -*************** -*** 391,397 **** - AdjustSize(w,True); - - if (width != w->core.width || height != w->core.height) { -! XtResizeWidget(w, - w->core.width, - w->core.height, - w->core.border_width); ---- 391,397 ---- - AdjustSize(w,True); - - if (width != w->core.width || height != w->core.height) { -! XtResizeWidget((Widget)w, - w->core.width, - w->core.height, - w->core.border_width); -diff -cr xloadface-1.6.1.org/LoadFace.c xloadface-1.6.1/LoadFace.c -*** xloadface-1.6.1.org/LoadFace.c Tue Oct 29 23:39:53 1996 ---- xloadface-1.6.1/LoadFace.c Thu Nov 28 11:26:32 1996 -*************** -*** 2,7 **** ---- 2,8 ---- - #include - #include "LoadFaceP.h" - #include -+ #include - #include - #include - #include -*************** -*** 166,172 **** - { - LoadFaceWidget w = (LoadFaceWidget)new; - -! CALL_SUPER(w,expose,(new)); - } - - #define HERE(w,tag) (w)->core_class.tag ---- 167,173 ---- - { - LoadFaceWidget w = (LoadFaceWidget)new; - -! CALL_SUPER(w,expose,(new,NULL,NULL)); - } - - #define HERE(w,tag) (w)->core_class.tag -*************** -*** 208,221 **** - picture = class->faces_data[0].pixmap; - } - AiChangePixmap(w,picture,False,True); -! CALL_SUPER(new,initialize,(request,new)); - if (w->load_face.interval > 0) { - if (w->load_face.shuffle) - firstInterval = random()%(w->load_face.interval*2000); - else - firstInterval = w->load_face.interval*1000; - w->load_face.interval_id = -! XtAppAddTimeOut(XtWidgetToApplicationContext(w), - firstInterval, - updateLoad, - (caddr_t)w); ---- 209,222 ---- - picture = class->faces_data[0].pixmap; - } - AiChangePixmap(w,picture,False,True); -! CALL_SUPER(new,initialize,(request,new,NULL,NULL)); - if (w->load_face.interval > 0) { - if (w->load_face.shuffle) - firstInterval = random()%(w->load_face.interval*2000); - else - firstInterval = w->load_face.interval*1000; - w->load_face.interval_id = -! XtAppAddTimeOut(XtWidgetToApplicationContext((Widget)w), - firstInterval, - updateLoad, - (caddr_t)w); -*************** -*** 262,268 **** - wd.wd_sendtime = wd.wd_recvtime = 0; - AiChangeLoad(w,&wd); - w->load_face.interval_id = -! XtAppAddTimeOut(XtWidgetToApplicationContext(w), - w->load_face.interval*1000, - updateLoad, - (caddr_t)w); ---- 263,269 ---- - wd.wd_sendtime = wd.wd_recvtime = 0; - AiChangeLoad(w,&wd); - w->load_face.interval_id = -! XtAppAddTimeOut(XtWidgetToApplicationContext((Widget)w), - w->load_face.interval*1000, - updateLoad, - (caddr_t)w); -*************** -*** 290,297 **** - newFace = FACE(w,newload); - AiChangePixmap(w,newFace->pixmap,False,False); - -! if (XtIsRealized(w) && oldload != newload) -! CALL_SELF(w, expose, (w)); - } - - static void ---- 291,298 ---- - newFace = FACE(w,newload); - AiChangePixmap(w,newFace->pixmap,False,False); - -! if (XtIsRealized((Widget)w) && oldload != newload) -! CALL_SELF(w, expose, (w,NULL,NULL)); - } - - static void -diff -cr xloadface-1.6.1.org/MachineInfo.c xloadface-1.6.1/MachineInfo.c -*** xloadface-1.6.1.org/MachineInfo.c Tue Oct 29 23:39:53 1996 ---- xloadface-1.6.1/MachineInfo.c Thu Nov 28 11:26:32 1996 -*************** -*** 295,299 **** - LINE_SKIP(w->machine_info.title_font)+ - LINE_SKIP(w->machine_info.load_info_font)*3+ - LINE_SKIP(w->machine_info.user_info_font)*nusers(wd); -! XtResizeWidget(w, w->core.width, h, w->core.border_width); - } ---- 295,299 ---- - LINE_SKIP(w->machine_info.title_font)+ - LINE_SKIP(w->machine_info.load_info_font)*3+ - LINE_SKIP(w->machine_info.user_info_font)*nusers(wd); -! XtResizeWidget((Widget)w, w->core.width, h, w->core.border_width); - } -diff -cr xloadface-1.6.1.org/alive.h xloadface-1.6.1/alive.h -*** xloadface-1.6.1.org/alive.h Tue Oct 29 23:39:53 1996 ---- xloadface-1.6.1/alive.h Thu Nov 28 11:27:09 1996 -*************** -*** 31,37 **** - #define SSIZE sizeof(u_short) - #define LSIZE sizeof(u_long) - -! #define SPOOLDIR "/usr/spool/rwho" - #define ORGAN_FILE "/etc/host_org" - - typedef char bool; ---- 31,37 ---- - #define SSIZE sizeof(u_short) - #define LSIZE sizeof(u_long) - -! #define SPOOLDIR "/var/rwho" - #define ORGAN_FILE "/etc/host_org" - - typedef char bool; -diff -cr xloadface-1.6.1.org/widgets.c xloadface-1.6.1/widgets.c -*** xloadface-1.6.1.org/widgets.c Tue Oct 29 23:39:53 1996 ---- xloadface-1.6.1/widgets.c Thu Nov 28 11:26:32 1996 -*************** -*** 224,230 **** - - /***** Popup Info *****/ - PopupInfo = XtCreatePopupShell("PopupInfo",transientShellWidgetClass, -! Toplevel,NULL,NULL); - PopupPane = mkWidget("InfoPane",arrangeBoxWidgetClass,PopupInfo, - AiNvertNum, 1, - AiNresizeParent, True, ---- 224,230 ---- - - /***** Popup Info *****/ - PopupInfo = XtCreatePopupShell("PopupInfo",transientShellWidgetClass, -! Toplevel,NULL,0); - PopupPane = mkWidget("InfoPane",arrangeBoxWidgetClass,PopupInfo, - AiNvertNum, 1, - AiNresizeParent, True, -*************** -*** 236,242 **** - - /***** Popup Help *****/ - helpScreen = XtCreatePopupShell("Help",transientShellWidgetClass, -! Toplevel,NULL,NULL); - - addFaces(); - adjustWindowSize(); ---- 236,242 ---- - - /***** Popup Help *****/ - helpScreen = XtCreatePopupShell("Help",transientShellWidgetClass, -! Toplevel,NULL,0); - - addFaces(); - adjustWindowSize(); -diff -cr xloadface-1.6.1.org/xloadface.1 xloadface-1.6.1/xloadface.1 -*** xloadface-1.6.1.org/xloadface.1 Tue Oct 29 23:39:53 1996 ---- xloadface-1.6.1/xloadface.1 Thu Nov 28 11:26:51 1996 -*************** -*** 104,110 **** - グループ名を省略した場合にはこのグループが表示される． - .SH FILES - .TP -! .IR /usr/spool/rwho/whod.* 各ホストの情報 - .TP - .IR /etc/host_org グループ記述ファイル - .SH RELATED INFORMATION ---- 104,110 ---- - グループ名を省略した場合にはこのグループが表示される． - .SH FILES - .TP -! .IR /var/rwho/whod.* 各ホストの情報 - .TP - .IR /etc/host_org グループ記述ファイル - .SH RELATED INFORMATION +--- Imakefile.orig Tue Feb 18 17:59:43 1992 ++++ Imakefile Fri Dec 6 14:27:44 1996 +@@ -11,4 +11,3 @@ + SYS_LIBRARIES = -lm + + ComplexProgramTarget(xloadface) +-InstallManPage(xloadface.1,$(MANDIR)/xalive.n) diff --git a/sysutils/xloadface/files/patch-02 b/sysutils/xloadface/files/patch-02 new file mode 100644 index 000000000000..65124a746fb8 --- /dev/null +++ b/sysutils/xloadface/files/patch-02 @@ -0,0 +1,40 @@ +--- ArrangeBox.c.orig Tue Apr 2 06:44:19 1991 ++++ ArrangeBox.c Fri Dec 6 14:27:43 1996 +@@ -69,7 +69,7 @@ + }, + { + /* box_class fields */ +- /* empty */ NULL, ++ /* empty */ 0, + }, + { + /* ArrangeBox class fields */ +@@ -194,8 +194,8 @@ + w->core.parent->core.border_width); + XtResizeWindow(w->core.parent); + } +- XtResizeWidget(w,width,height,w->core.border_width); +- XtResizeWindow(w); ++ XtResizeWidget((Widget)w,width,height,w->core.border_width); ++ XtResizeWindow((Widget)w); + } + } + +@@ -203,15 +203,13 @@ + * Insert child method + */ + static void +-InsertChild(w,arg,num_args) ++InsertChild(w) + Widget w; +-ArgList arg; +-Cardinal *num_args; + { + ArrangeBoxWidget ab; + + ab = (ArrangeBoxWidget)w->core.parent; +- (*((CompositeClassRec*)XtSuperclass(ab))->composite_class.insert_child)(w,arg,num_args); ++ (*((CompositeClassRec*)XtSuperclass(ab))->composite_class.insert_child)(w); + RearrangeSize(ab); + } + diff --git a/sysutils/xloadface/files/patch-03 b/sysutils/xloadface/files/patch-03 new file mode 100644 index 000000000000..d02ff122b7ee --- /dev/null +++ b/sysutils/xloadface/files/patch-03 @@ -0,0 +1,29 @@ +--- LabeledPicture.c.orig Thu Apr 4 05:36:23 1991 ++++ LabeledPicture.c Fri Dec 6 14:27:44 1996 +@@ -153,7 +153,7 @@ + Window rootwin; + + lp->label_width = XTextWidth(lp->font,lp->label,strlen(lp->label)); +- if (lp->pixmap != NULL && lp->pixmap != AiNullPixmap) { ++ if (lp->pixmap != 0 && lp->pixmap != AiNullPixmap) { + XGetGeometry(XtDisplay(w),lp->pixmap, + &rootwin, + &x, +@@ -355,7 +355,7 @@ + { + UnSelectIt(w); + if (w->labeled_picture.sensitive) { +- XtCallCallbacks(w, AiNcallback, (caddr_t)event); ++ XtCallCallbacks((Widget)w, AiNcallback, (caddr_t)event); + } + } + +@@ -391,7 +391,7 @@ + AdjustSize(w,True); + + if (width != w->core.width || height != w->core.height) { +- XtResizeWidget(w, ++ XtResizeWidget((Widget)w, + w->core.width, + w->core.height, + w->core.border_width); diff --git a/sysutils/xloadface/files/patch-04 b/sysutils/xloadface/files/patch-04 new file mode 100644 index 000000000000..aaf6d80287c8 --- /dev/null +++ b/sysutils/xloadface/files/patch-04 @@ -0,0 +1,65 @@ +--- LoadFace.c.orig Fri Jun 12 04:52:31 1992 ++++ LoadFace.c Fri Dec 6 14:27:44 1996 +@@ -2,6 +2,7 @@ + #include + #include "LoadFaceP.h" + #include ++#include + #include + #include + #include +@@ -47,7 +48,7 @@ + {AiNinterval, AiCInterval, XtRInt, sizeof(int), + LFOffset(interval), XtRString, (caddr_t)"60"}, + {AiNwhodDirectory, AiCWhodDirectory, XtRString,sizeof(String), +- LFOffset(whod_directory), XtRString, (caddr_t)"/usr/spool/rwho"}, ++ LFOffset(whod_directory), XtRString, (caddr_t)"/var/rwho"}, + {AiNshuffle, AiCShuffle, XtRBoolean,sizeof(Boolean), + LFOffset(shuffle), XtRString, (caddr_t)"TRUE"}, + {AiNloadBound, AiCLoadBound, AiRLoadBound, sizeof(AiLoadBound), +@@ -166,7 +167,7 @@ + { + LoadFaceWidget w = (LoadFaceWidget)new; + +- CALL_SUPER(w,expose,(new)); ++ CALL_SUPER(w,expose,(new,NULL,NULL)); + } + + #define HERE(w,tag) (w)->core_class.tag +@@ -208,14 +209,14 @@ + picture = class->faces_data[0].pixmap; + } + AiChangePixmap(w,picture,False,True); +- CALL_SUPER(new,initialize,(request,new)); ++ CALL_SUPER(new,initialize,(request,new,NULL,NULL)); + if (w->load_face.interval > 0) { + if (w->load_face.shuffle) + firstInterval = random()%(w->load_face.interval*2000); + else + firstInterval = w->load_face.interval*1000; + w->load_face.interval_id = +- XtAppAddTimeOut(XtWidgetToApplicationContext(w), ++ XtAppAddTimeOut(XtWidgetToApplicationContext((Widget)w), + firstInterval, + updateLoad, + (caddr_t)w); +@@ -262,7 +263,7 @@ + wd.wd_sendtime = wd.wd_recvtime = 0; + AiChangeLoad(w,&wd); + w->load_face.interval_id = +- XtAppAddTimeOut(XtWidgetToApplicationContext(w), ++ XtAppAddTimeOut(XtWidgetToApplicationContext((Widget)w), + w->load_face.interval*1000, + updateLoad, + (caddr_t)w); +@@ -290,8 +291,8 @@ + newFace = FACE(w,newload); + AiChangePixmap(w,newFace->pixmap,False,False); + +- if (XtIsRealized(w) && oldload != newload) +- CALL_SELF(w, expose, (w)); ++ if (XtIsRealized((Widget)w) && oldload != newload) ++ CALL_SELF(w, expose, (w,NULL,NULL)); + } + + static void diff --git a/sysutils/xloadface/files/patch-05 b/sysutils/xloadface/files/patch-05 new file mode 100644 index 000000000000..cb8a360f1fe5 --- /dev/null +++ b/sysutils/xloadface/files/patch-05 @@ -0,0 +1,9 @@ +--- MachineInfo.c.orig Mon Apr 22 18:44:26 1991 ++++ MachineInfo.c Fri Dec 6 14:27:44 1996 +@@ -295,5 +295,5 @@ + LINE_SKIP(w->machine_info.title_font)+ + LINE_SKIP(w->machine_info.load_info_font)*3+ + LINE_SKIP(w->machine_info.user_info_font)*nusers(wd); +- XtResizeWidget(w, w->core.width, h, w->core.border_width); ++ XtResizeWidget((Widget)w, w->core.width, h, w->core.border_width); + } diff --git a/sysutils/xloadface/files/patch-06 b/sysutils/xloadface/files/patch-06 new file mode 100644 index 000000000000..33f503ff4692 --- /dev/null +++ b/sysutils/xloadface/files/patch-06 @@ -0,0 +1,20 @@ +--- widgets.c.orig Tue Feb 18 18:06:34 1992 ++++ widgets.c Fri Dec 6 14:27:45 1996 +@@ -224,7 +224,7 @@ + + /***** Popup Info *****/ + PopupInfo = XtCreatePopupShell("PopupInfo",transientShellWidgetClass, +- Toplevel,NULL,NULL); ++ Toplevel,NULL,0); + PopupPane = mkWidget("InfoPane",arrangeBoxWidgetClass,PopupInfo, + AiNvertNum, 1, + AiNresizeParent, True, +@@ -236,7 +236,7 @@ + + /***** Popup Help *****/ + helpScreen = XtCreatePopupShell("Help",transientShellWidgetClass, +- Toplevel,NULL,NULL); ++ Toplevel,NULL,0); + + addFaces(); + adjustWindowSize(); diff --git a/sysutils/xloadface/files/patch-07 b/sysutils/xloadface/files/patch-07 new file mode 100644 index 000000000000..ab4805d4189f --- /dev/null +++ b/sysutils/xloadface/files/patch-07 @@ -0,0 +1,11 @@ +--- alive.h.orig Fri Mar 15 08:49:43 1991 ++++ alive.h Fri Dec 6 14:27:44 1996 +@@ -31,7 +31,7 @@ + #define SSIZE sizeof(u_short) + #define LSIZE sizeof(u_long) + +-#define SPOOLDIR "/usr/spool/rwho" ++#define SPOOLDIR "/var/rwho" + #define ORGAN_FILE "/etc/host_org" + + typedef char bool; diff --git a/sysutils/xloadface/files/patch-08 b/sysutils/xloadface/files/patch-08 new file mode 100644 index 000000000000..51f04e9b746c --- /dev/null +++ b/sysutils/xloadface/files/patch-08 @@ -0,0 +1,11 @@ +--- xloadface.1.orig Mon Apr 22 20:03:17 1991 ++++ xloadface.1 Fri Dec 6 14:27:45 1996 +@@ -104,7 +104,7 @@ + グループ名を省略した場合にはこのグループが表示される． + .SH FILES + .TP +-.IR /usr/spool/rwho/whod.* 各ホストの情報 ++.IR /var/rwho/whod.* 各ホストの情報 + .TP + .IR /etc/host_org グループ記述ファイル + .SH RELATED INFORMATION -- cgit v1.2.3