Massive patch failures
Cheryl Homiak
chomiak at worldfront.com
Mon May 14 12:25:01 EDT 2001
Ok, here's my install.log but it doesn't tell a lot, so I'm also inserting
my /usr/src/linux/scripts/lxdialog/*.rej files. Enjoy!
Patching version v22
Creating .orig files [....................] done.
Patching files [ppppppppppppppppppp8 out of 8 hunks FAILED -- saving rejects to /usr/src/linux/scripts/lxdialog/checklist.c.rej
p3 out of 5 hunks FAILED -- saving rejects to /usr/src/linux/scripts/lxdialog/menubox.c.rej
] done.
Copying files [ccccc] done.
.rej file for first batch of fails: 8 out of 8
***************
*** 269,275 ****
print_buttons (dialog, height, width, 0);
while (key != ESC) {
- key = wgetch(dialog);
if (key < 256 && isalpha(key)) key = tolower(key);
--- 273,279 ----
print_buttons (dialog, height, width, 0);
while (key != ESC) {
+ key = wgetch(menu);
if (key < 256 && isalpha(key)) key = tolower(key);
***************
*** 372,379 ****
print_arrows(dialog, item_no, scroll,
box_y, box_x+item_x+1, menu_height);
- wnoutrefresh (menu);
- wrefresh (dialog);
continue; /* wait for another key press */
}
--- 376,383 ----
print_arrows(dialog, item_no, scroll,
box_y, box_x+item_x+1, menu_height);
+ wnoutrefresh (dialog);
+ wrefresh (menu);
continue; /* wait for another key press */
}
***************
*** 386,392 ****
? 2 : (button > 2 ? 0 : button);
print_buttons(dialog, height, width, button);
- wrefresh (dialog);
break;
case ' ':
case 's':
--- 390,396 ----
? 2 : (button > 2 ? 0 : button);
print_buttons(dialog, height, width, button);
+ wrefresh (menu);
break;
case ' ':
case 's':
Second .rej file: 3 out of 5 failed
***************
*** 51,56 ****
mvwaddch(win, choice, item_x, item[0]);
wattrset (win, selected ? item_selected_attr : item_attr);
waddstr (win, (char *)item+1);
}
/*
--- 51,60 ----
mvwaddch(win, choice, item_x, item[0]);
wattrset (win, selected ? item_selected_attr : item_attr);
waddstr (win, (char *)item+1);
+ if (selected) {
+ wmove (win, choice, check_x+1);
+ wrefresh (win);
+ }
}
/*
***************
*** 104,111 ****
print_button (dialog, "Select", y, x, selected == 0);
print_button (dialog, " Help ", y, x + 14, selected == 1);
- wmove(dialog, y, x+1 + 14*selected);
- wrefresh (dialog);
}
/*
--- 108,115 ----
print_button (dialog, "Select", y, x, selected == 0);
print_button (dialog, " Help ", y, x + 14, selected == 1);
+ /* wmove(dialog, y, x+1 + 14*selected);
+ wrefresh (dialog);*/
}
/*
***************
*** 215,221 ****
print_buttons(dialog, height, width, 0);
while (key != ESC) {
- key = wgetch (dialog);
for (i = 0; i < max_choice; i++)
if (toupper(key) == toupper(items[(scroll+i)*3+1][0]))
--- 219,225 ----
print_buttons(dialog, height, width, 0);
while (key != ESC) {
+ key = wgetch (list);
for (i = 0; i < max_choice; i++)
if (toupper(key) == toupper(items[(scroll+i)*3+1][0]))
***************
*** 245,251 ****
print_arrows(dialog, choice, item_no, scroll,
box_y, box_x + check_x + 5, list_height);
- wrefresh (dialog);
continue; /* wait for another key press */
} else
--- 249,255 ----
print_arrows(dialog, choice, item_no, scroll,
box_y, box_x + check_x + 5, list_height);
+ wnoutrefresh (dialog);
continue; /* wait for another key press */
} else
***************
*** 273,279 ****
print_arrows(dialog, choice, item_no, scroll,
box_y, box_x + check_x + 5, list_height);
- wrefresh (dialog);
continue; /* wait for another key press */
} else
--- 277,283 ----
print_arrows(dialog, choice, item_no, scroll,
box_y, box_x + check_x + 5, list_height);
+ wnoutrefresh (dialog);
continue; /* wait for another key press */
} else
***************
*** 288,294 ****
print_item (list, items[(scroll + choice) * 3 + 1],
status[scroll + choice], choice, TRUE);
wnoutrefresh (list);
- wrefresh (dialog);
}
continue; /* wait for another key press */
}
--- 292,298 ----
print_item (list, items[(scroll + choice) * 3 + 1],
status[scroll + choice], choice, TRUE);
wnoutrefresh (list);
+ wnoutrefresh (dialog);
}
continue; /* wait for another key press */
}
***************
*** 306,312 ****
? 1 : (button > 1 ? 0 : button);
print_buttons(dialog, height, width, button);
- wrefresh (dialog);
break;
case 'S':
case 's':
--- 310,316 ----
? 1 : (button > 1 ? 0 : button);
print_buttons(dialog, height, width, button);
+ wnoutrefresh (dialog);
break;
case 'S':
case 's':
***************
*** 329,335 ****
}
}
wnoutrefresh (list);
- wrefresh (dialog);
for (i = 0; i < item_no; i++) {
if (status[i]) {
--- 333,339 ----
}
}
wnoutrefresh (list);
+ wnoutrefresh (dialog);
for (i = 0; i < item_no; i++) {
if (status[i]) {
Let me know if other files would be helpful. I may come on the reflector
later today as I am having sound card problems you guys might be able to
help with. Thanks. Cheryl
More information about the Speakup
mailing list