diff options
| -rw-r--r-- | devel/pilrc/Makefile | 8 | ||||
| -rw-r--r-- | devel/pilrc/distinfo | 3 | ||||
| -rw-r--r-- | devel/pilrc/patches/patch-ac | 148 |
3 files changed, 153 insertions, 6 deletions
diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile index 05ef0ea6084..721239a772a 100644 --- a/devel/pilrc/Makefile +++ b/devel/pilrc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2001/05/11 08:14:33 dillo Exp $ +# $NetBSD: Makefile,v 1.6 2001/05/18 09:51:59 dillo Exp $ # DISTNAME= pilrc-2.8p4 -PKGNAME= pilrc-2.8.4 +PKGNAME= pilrc-2.8.4nb1 CATEGORIES= devel MASTER_SITES= http://www.ardiri.com/download/palm/pilrc/patch/ #MASTER_SITES= http://www.ardiri.com/download/palm/pilrc/archive/ @@ -19,9 +19,7 @@ COMMENT= generate resources for PalmOS applications from textual description .include "../../mk/bsd.prefs.mk" -# pilrcui is broken in 2.8 -#PILRC_USE_GTK?= YES -PILRC_USE_GTK= NO +PILRC_USE_GTK?= YES .if ${PILRC_USE_GTK} == YES DEPENDS+= gtk+>=1.2.0:../../x11/gtk diff --git a/devel/pilrc/distinfo b/devel/pilrc/distinfo index 04c28e556ec..3a38337535d 100644 --- a/devel/pilrc/distinfo +++ b/devel/pilrc/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/05/11 08:14:33 dillo Exp $ +$NetBSD: distinfo,v 1.3 2001/05/18 09:51:59 dillo Exp $ SHA1 (pilrc-2.8p4.tar.gz) = fdd6cd2501f482e0f09165ee73ab832ad500845f Size (pilrc-2.8p4.tar.gz) = 192632 bytes SHA1 (patch-ab) = 54d94c0c999fc7775570fa0907ca574807dc0709 +SHA1 (patch-ac) = 09b33ad638ed729e8e8640fafbae4e95eb6a8d78 diff --git a/devel/pilrc/patches/patch-ac b/devel/pilrc/patches/patch-ac new file mode 100644 index 00000000000..43393ed8beb --- /dev/null +++ b/devel/pilrc/patches/patch-ac @@ -0,0 +1,148 @@ +$NetBSD: patch-ac,v 1.1 2001/05/18 09:52:00 dillo Exp $ + +--- xwin.c.orig Mon May 7 10:43:45 2001 ++++ xwin.c Fri May 18 05:43:27 2001 +@@ -100,7 +100,7 @@ + {"/Help/_About", NULL, pilrcui_about_create, 0, NULL} + }; + +-static int CurrentForm = -1; ++static p_int CurrentForm = -1; + + void + pilrcui_open(GtkWidget * w, +@@ -275,7 +275,7 @@ + { + GtkStateType state; + PLEXFORMOBJLIST *pplt; +- RCFORM *pform; ++ RCFormBA16Type *pform; + FRM *pfrm; + int ilt; + static GdkGC *pens[5] = { NULL, NULL, NULL, NULL, NULL }; +@@ -321,8 +321,8 @@ + + pfrm = (FRM *) PlexGetElementAt(&vprcpfile->plfrm, CurrentForm); + +- pform = &pfrm->form; +- pplt = &pfrm->pllt; ++ pform = &pfrm->s16.form; ++ pplt = &pfrm->s16.pllt; + + /* + * Select pen based on pform->window.frameType.width +@@ -374,19 +374,19 @@ + { + RCFORMOBJLIST *plt; + RCFORMOBJECT *pobj; +- RCFIELD field; +- RCFORMLABEL label; ++ RCFieldBA16Type field; ++ RCFormLabelBA16Type label; + RCRECT rc; + char *pchText; + int savepen; + + plt = (RCFORMOBJLIST *) PlexGetElementAt(pplt, ilt); +- pobj = &plt->u.object; ++ pobj = &plt->s16.u.object; + pchText = NULL; +- switch (plt->objectType) ++ switch (plt->s16.objectType) + { + case frmFieldObj: +- field = *pobj->field; ++ field = pobj->field->s16; + if (!field.attr.usable) + break; + if (field.attr.underlined) +@@ -434,13 +434,13 @@ + break; + case frmControlObj: + { +- RCCONTROL ctl; ++ RCControlBA16Type ctl; + +- ctl = *pobj->control; ++ ctl = pobj->control->s16; + if (!ctl.attr.usable) + break; + +- pchText = pobj->control->u.text; ++ pchText = pobj->control->s16.u.text; + switch (ctl.style) + { + case buttonCtl: +@@ -563,12 +563,12 @@ + break; + case frmListObj: + { +- RCLIST list; ++ RCListBA16Type list; + RCRECT rc; + char *s; + int x; + +- list = *pobj->list; ++ list = pobj->list->s16; + if (!list.attr.usable) + break; + gdk_draw_rectangle(GTK_WIDGET(w)->window, pens[pen], FALSE, +@@ -616,9 +616,9 @@ + break; + case frmBitmapObj: + { +- RCFORMBITMAP bitmap; ++ RCFormBitMapBA16Type bitmap; + +- bitmap = *pobj->bitmap; ++ bitmap = pobj->bitmap->s16; + if (!bitmap.attr.usable) + break; + +@@ -631,10 +631,10 @@ + case frmRectangleObj: + break; + case frmLabelObj: +- label = *pobj->label; ++ label = pobj->label->s16; + if (!label.attr.usable) + break; +- pchText = pobj->label->text; ++ pchText = pobj->label->s16.text; + rc.topLeft = label.pos; + pilrcui_pilot_text(w, pchText, org, &rc, label.fontID, + ptxLeft | ptxNoExtent); +@@ -752,7 +752,7 @@ + pilrcui_form_select(GtkWidget * w, + gpointer ifrm) + { +- CurrentForm = (int)ifrm; ++ CurrentForm = (p_int)ifrm; + + pilrcui_drawform(GTK_DRAWING_AREA(FormArea)); + } +@@ -808,11 +808,13 @@ + GtkWidget *menuitem; + + sprintf(buf, "Form %04x", +- ((FRM *) PlexGetElementAt(&vprcpfile->plfrm, ifrm))->form.formId); ++ (int)((FRM *) PlexGetElementAt(&vprcpfile->plfrm, ifrm)) ++ ->s16.form.formId); + menuitem = gtk_radio_menu_item_new_with_label(group, buf); + group = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(menuitem)); + gtk_signal_connect(GTK_OBJECT(menuitem), "activate", +- (GtkSignalFunc) pilrcui_form_select, (gpointer) ifrm); ++ (GtkSignalFunc) pilrcui_form_select, ++ (gpointer) (p_int)ifrm); + gtk_menu_append(GTK_MENU(menu), menuitem); + gtk_widget_show(menuitem); + } +@@ -1104,6 +1106,7 @@ + * gtk_rc_parse ("filerc"); + */ + ++ CbInit(); + create_main_window(); + + gtk_main(); |