diff options
author | dillo <dillo> | 2002-10-24 16:37:31 +0000 |
---|---|---|
committer | dillo <dillo> | 2002-10-24 16:37:31 +0000 |
commit | a42fd68cc504d69f9abea18c03a731ca447d8d4c (patch) | |
tree | 8c7c5b0a19e89fd4d9dadc795f9f6759cfaa03e9 /devel | |
parent | 0b92535e863d302ca3d94c7e49b4e11fe8edbc75 (diff) | |
download | pkgsrc-a42fd68cc504d69f9abea18c03a731ca447d8d4c.tar.gz |
remove unneeded patches -- should have been done during package update
Diffstat (limited to 'devel')
-rw-r--r-- | devel/pilrc/patches/patch-ab | 222 | ||||
-rw-r--r-- | devel/pilrc/patches/patch-ac | 148 |
2 files changed, 0 insertions, 370 deletions
diff --git a/devel/pilrc/patches/patch-ab b/devel/pilrc/patches/patch-ab deleted file mode 100644 index 222057766f2..00000000000 --- a/devel/pilrc/patches/patch-ab +++ /dev/null @@ -1,222 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2001/05/11 08:14:34 dillo Exp $ - ---- configure.orig Wed May 9 11:27:23 2001 -+++ configure -@@ -12,6 +12,8 @@ - ac_default_prefix=/usr/local - # Any additions from configure.in: - ac_help="$ac_help -+ --enable-pilrcui build pilrcui (needs gtk; default: enabled)" -+ac_help="$ac_help - --with-gtk-prefix=PFX Prefix where GTK is installed (optional)" - ac_help="$ac_help - --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)" -@@ -1033,7 +1035,19 @@ - fi - - --# Check whether --with-gtk-prefix or --without-gtk-prefix was given. -+# Check whether --enable-pilrcui or --disable-pilrcui was given. -+if test "${enable_pilrcui+set}" = set; then -+ enableval="$enable_pilrcui" -+ : -+fi -+ -+ -+echo $ac_n "checking whether pilrcui should be built""... $ac_c" 1>&6 -+echo "configure:1047: checking whether pilrcui should be built" >&5 -+if test -z "$enable_pilrcui" -o "$enable_pilrcui" = yes -+then -+ echo "$ac_t""yes" 1>&6 -+ # Check whether --with-gtk-prefix or --without-gtk-prefix was given. - if test "${with_gtk_prefix+set}" = set; then - withval="$with_gtk_prefix" - gtk_config_prefix="$withval" -@@ -1315,17 +1329,186 @@ - PILRCUI_TRUE='#' - PILRCUI_FALSE= - fi -- -+ - fi - - - rm -f conf.gtktest - -+else -+ echo "$ac_t""no" 1>&6 -+ -+ -+if false; then -+ PILRCUI_TRUE= -+ PILRCUI_FALSE='#' -+else -+ PILRCUI_TRUE='#' -+ PILRCUI_FALSE= -+fi -+fi - - # Check for warnings flag if gcc was detected. - if test "x$ac_cv_prog_gcc" = "xyes"; then - CFLAGS="$CFLAGS -Wall" - fi -+ -+echo $ac_n "checking size of short""... $ac_c" 1>&6 -+echo "configure:1358: checking size of short" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -+else -+ cat > conftest.$ac_ext <<EOF -+#line 1366 "configure" -+#include "confdefs.h" -+#include <stdio.h> -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(short)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:1377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_short=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_short=0 -+fi -+rm -fr conftest* -+fi -+ -+fi -+echo "$ac_t""$ac_cv_sizeof_short" 1>&6 -+cat >> confdefs.h <<EOF -+#define SIZEOF_SHORT $ac_cv_sizeof_short -+EOF -+ -+ -+echo $ac_n "checking size of int""... $ac_c" 1>&6 -+echo "configure:1397: checking size of int" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -+else -+ cat > conftest.$ac_ext <<EOF -+#line 1405 "configure" -+#include "confdefs.h" -+#include <stdio.h> -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(int)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:1416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_int=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_int=0 -+fi -+rm -fr conftest* -+fi -+ -+fi -+echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -+cat >> confdefs.h <<EOF -+#define SIZEOF_INT $ac_cv_sizeof_int -+EOF -+ -+ -+echo $ac_n "checking size of long""... $ac_c" 1>&6 -+echo "configure:1436: checking size of long" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -+else -+ cat > conftest.$ac_ext <<EOF -+#line 1444 "configure" -+#include "confdefs.h" -+#include <stdio.h> -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(long)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:1455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_long=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_long=0 -+fi -+rm -fr conftest* -+fi -+ -+fi -+echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -+cat >> confdefs.h <<EOF -+#define SIZEOF_LONG $ac_cv_sizeof_long -+EOF -+ -+ -+echo $ac_n "checking size of char *""... $ac_c" 1>&6 -+echo "configure:1475: checking size of char *" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -+else -+ cat > conftest.$ac_ext <<EOF -+#line 1483 "configure" -+#include "confdefs.h" -+#include <stdio.h> -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(char *)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:1494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_char_p=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_char_p=0 -+fi -+rm -fr conftest* -+fi -+ -+fi -+echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6 -+cat >> confdefs.h <<EOF -+#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p -+EOF -+ -+ - - cat >> confdefs.h <<\EOF - #define UNIX 1 diff --git a/devel/pilrc/patches/patch-ac b/devel/pilrc/patches/patch-ac deleted file mode 100644 index 43393ed8beb..00000000000 --- a/devel/pilrc/patches/patch-ac +++ /dev/null @@ -1,148 +0,0 @@ -$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(); |