Hello community,
here is the log from the commit of package dialog
checked in at Tue Jul 11 20:28:08 CEST 2006.
--------
--- dialog/dialog.changes 2006-01-25 21:35:28.000000000 +0100
+++ dialog/dialog.changes 2006-07-10 16:24:23.000000000 +0200
@@ -1 +1,6 @@
--------------------------------------------------------------------
+------------------------------------------------------------------
+Mon Jul 10 16:21:33 CEST 2006 - werner@suse.de
+
+- Update to new version 1.0 (20060221 TD)
+
+------------------------------------------------------------------
Old:
----
dialog-0.9b-20040316.dif
dialog-0.9b-20040316.tar.bz2
New:
----
dialog-1.0-20060221.dif
dialog-1.0-20060221.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dialog.spec ++++++
--- /var/tmp/diff_new_pack.DWewYy/_old 2006-07-11 20:27:35.000000000 +0200
+++ /var/tmp/diff_new_pack.DWewYy/_new 2006-07-11 20:27:35.000000000 +0200
@@ -1,24 +1,25 @@
#
-# spec file for package dialog (Version 0.9b)
+# spec file for package dialog (Version 1.0)
#
-# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: dialog
+BuildRequires: ncurses-devel
License: GPL
Group: Development/Libraries/Other
Autoreqprov: on
-Version: 0.9b
-Release: 188
+Version: 1.0
+Release: 1
Summary: Menus and Input Boxes for Shell Scripts
-Source: dialog-0.9b-20040316.tar.bz2
-Patch: dialog-0.9b-20040316.dif
+Source: dialog-1.0-20060221.tar.bz2
+Patch: dialog-1.0-20060221.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -35,7 +36,7 @@
T.Dickey
%prep
-%setup -n dialog-0.9b-20040316
+%setup -n dialog-1.0-20060221
%patch
%build
@@ -53,6 +54,8 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
+ rm -rf $RPM_BUILD_ROOT/usr/share/locale/mg/ # Malagasy (Malayalam??)
+ rm -rf $RPM_BUILD_ROOT/usr/share/locale/rm/ # Rhaeto-Romance
%find_lang %name
%clean
@@ -65,6 +68,8 @@
%_mandir/man1/dialog.1.gz
%changelog -n dialog
+* Mon Jul 10 2006 - werner@suse.de
+- Update to new version 1.0 (20060221 TD)
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Tue Apr 06 2004 - werner@suse.de
++++++ dialog-0.9b-20040316.dif -> dialog-1.0-20060221.dif ++++++
--- dialog/dialog-0.9b-20040316.dif 2004-04-06 14:26:50.000000000 +0200
+++ dialog/dialog-1.0-20060221.dif 2006-07-10 16:18:36.000000000 +0200
@@ -1,14 +1,14 @@
--- dialog.c
-+++ dialog.c 2004-04-06 13:09:09.000000000 +0200
-@@ -941,7 +941,6 @@
++++ dialog.c 2006-07-10 14:09:10.000000000 +0200
+@@ -1295,7 +1295,6 @@ init_result(char *buffer)
int
main(int argc, char *argv[])
{
- FILE *input = stdin;
char temp[256];
bool esc_pressed = FALSE;
- bool ignore_unknown = FALSE;
-@@ -969,6 +968,7 @@
+ int offset = 1;
+@@ -1321,6 +1320,7 @@ main(int argc, char *argv[])
unescape_argv(&argc, &argv);
program = argv[0];
dialog_state.output = stderr;
@@ -16,7 +16,7 @@
/*
* Look for the last --stdout, --stderr or --output-fd option, and use
-@@ -987,7 +987,7 @@
+@@ -1339,7 +1339,7 @@ main(int argc, char *argv[])
break;
case o_input_fd:
if ((j = optionValue(argv, &offset)) < 0
@@ -25,7 +25,7 @@
dlg_exiterr("Cannot open input-fd\n");
break;
case o_output_fd:
-@@ -1052,7 +1052,7 @@
+@@ -1405,7 +1405,7 @@ main(int argc, char *argv[])
}
#endif
@@ -35,8 +35,8 @@
while (offset < argc && !esc_pressed) {
init_result(my_buffer);
--- dialog.h
-+++ dialog.h 2004-04-06 14:22:31.000000000 +0200
-@@ -35,6 +35,23 @@
++++ dialog.h 2006-07-10 14:39:40.000000000 +0200
+@@ -39,6 +39,23 @@
#include
#include /* fork() etc. */
#include /* sqrt() */
@@ -60,7 +60,7 @@
#if defined(HAVE_NCURSESW_NCURSES_H)
#include
-@@ -68,14 +85,6 @@
+@@ -72,14 +89,6 @@
#define _(s) s
#endif
@@ -75,7 +75,7 @@
#ifndef HAVE_WGET_WCH
#undef USE_WIDE_CURSES
#endif
-@@ -348,6 +357,7 @@
+@@ -348,6 +357,7 @@ typedef struct {
DIALOG_CALLBACK *getc_redirect;
DIALOG_WINDOWS *all_windows;
FILE *output; /* option "--output-fd fd" */
@@ -83,7 +83,7 @@
FILE *pipe_input; /* used for gauge widget */
FILE *screen_output; /* newterm(), etc. */
bool screen_initialized;
-@@ -358,6 +368,7 @@
+@@ -359,6 +369,7 @@ typedef struct {
int aspect_ratio; /* option "--aspect ratio" */
int output_count; /* # of widgets that may have done output */
int tab_len; /* option "--tab-len n" */
@@ -91,17 +91,17 @@
} DIALOG_STATE;
extern DIALOG_STATE dialog_state;
-@@ -507,6 +518,7 @@
+@@ -554,6 +565,7 @@ extern void dlg_killall_bg(int *retval);
/* util.c */
- extern WINDOW * dlg_new_window(int height, int width, int y, int x);
-+extern void dlg_move_window(WINDOW *win, int height, int width, int y, int x);
- extern WINDOW * dlg_sub_window(WINDOW *win, int height, int width, int y, int x);
- extern char * dlg_strclone(const char *cprompt);
- extern int dlg_box_x_ordinate(int width);
-@@ -540,7 +552,7 @@
+ extern WINDOW * dlg_new_window(int /*height*/, int /*width*/, int /*y*/, int /*x*/);
++extern void dlg_move_window(WINDOW * /*win*/, int /*height*/, int /*width*/, int /*y*/, int /*x*/);
+ extern WINDOW * dlg_sub_window(WINDOW * /*win*/, int /*height*/, int /*width*/, int /*y*/, int /*x*/);
+ extern char * dlg_set_result(const char * /*string*/);
+ extern char * dlg_strclone(const char * /*cprompt*/);
+@@ -591,7 +603,7 @@ extern void dlg_trim_string(char * /*src
extern void end_dialog(void);
- extern void init_dialog(FILE *input, FILE * output);
+ extern void init_dialog(FILE * /*input*/, FILE * /*output*/);
-extern void dlg_exiterr(const char *, ...)
+extern void dlg_exiterr(const char *, ...) GCC_NORETURN
@@ -109,61 +109,63 @@
__attribute__((format(printf,1,2)))
#endif
--- dlg_colors.h
-+++ dlg_colors.h 2004-04-06 13:09:09.000000000 +0200
-@@ -38,13 +38,13 @@
-
- #define SHADOW_FG COLOR_BLACK
- #define SHADOW_BG COLOR_BLACK
--#define SHADOW_HL TRUE
-+#define SHADOW_HL FALSE
-
- #define DIALOG_FG COLOR_BLACK
- #define DIALOG_BG COLOR_WHITE
- #define DIALOG_HL FALSE
-
--#define TITLE_FG COLOR_BLUE
-+#define TITLE_FG COLOR_YELLOW
- #define TITLE_BG COLOR_WHITE
- #define TITLE_HL TRUE
-
-@@ -88,7 +88,7 @@
- #define SEARCHBOX_BG COLOR_WHITE
- #define SEARCHBOX_HL FALSE
-
--#define SEARCHBOX_TITLE_FG COLOR_BLUE
-+#define SEARCHBOX_TITLE_FG COLOR_YELLOW
- #define SEARCHBOX_TITLE_BG COLOR_WHITE
- #define SEARCHBOX_TITLE_HL TRUE
-
-@@ -96,7 +96,7 @@
- #define SEARCHBOX_BORDER_BG COLOR_WHITE
- #define SEARCHBOX_BORDER_HL TRUE
-
--#define POSITION_INDICATOR_FG COLOR_BLUE
-+#define POSITION_INDICATOR_FG COLOR_YELLOW
- #define POSITION_INDICATOR_BG COLOR_WHITE
- #define POSITION_INDICATOR_HL TRUE
-
-@@ -116,7 +116,7 @@
- #define ITEM_SELECTED_BG COLOR_BLUE
- #define ITEM_SELECTED_HL TRUE
-
--#define TAG_FG COLOR_BLUE
-+#define TAG_FG COLOR_YELLOW
- #define TAG_BG COLOR_WHITE
- #define TAG_HL TRUE
++++ dlg_colors.h 2006-07-10 14:42:18.000000000 +0200
+@@ -43,13 +43,13 @@
+ #define DLGC_FG_SHADOW COLOR_BLACK
+ #define DLGC_BG_SHADOW COLOR_BLACK
+-#define DLGC_HL_SHADOW TRUE
++#define DLGC_HL_SHADOW FALSE
+
+ #define DLGC_FG_DIALOG COLOR_BLACK
+ #define DLGC_BG_DIALOG COLOR_WHITE
+ #define DLGC_HL_DIALOG FALSE
+
+-#define DLGC_FG_TITLE COLOR_BLUE
++#define DLGC_FG_TITLE COLOR_YELLOW
+ #define DLGC_BG_TITLE COLOR_WHITE
+ #define DLGC_HL_TITLE TRUE
+
+@@ -93,7 +93,7 @@
+ #define DLGC_BG_SEARCHBOX COLOR_WHITE
+ #define DLGC_HL_SEARCHBOX FALSE
+
+-#define DLGC_FG_SEARCHBOX_TITLE COLOR_BLUE
++#define DLGC_FG_SEARCHBOX_TITLE COLOR_YELLOW
+ #define DLGC_BG_SEARCHBOX_TITLE COLOR_WHITE
+ #define DLGC_HL_SEARCHBOX_TITLE TRUE
+
+@@ -101,7 +101,7 @@
+ #define DLGC_BG_SEARCHBOX_BORDER COLOR_WHITE
+ #define DLGC_HL_SEARCHBOX_BORDER TRUE
+
+-#define DLGC_FG_POSITION_INDICATOR COLOR_BLUE
++#define DLGC_FG_POSITION_INDICATOR COLOR_YELLOW
+ #define DLGC_BG_POSITION_INDICATOR COLOR_WHITE
+ #define DLGC_HL_POSITION_INDICATOR TRUE
+
+@@ -121,7 +121,7 @@
+ #define DLGC_BG_ITEM_SELECTED COLOR_BLUE
+ #define DLGC_HL_ITEM_SELECTED TRUE
+
+-#define DLGC_FG_TAG COLOR_BLUE
++#define DLGC_FG_TAG COLOR_YELLOW
+ #define DLGC_BG_TAG COLOR_WHITE
+ #define DLGC_HL_TAG TRUE
+
+--- guage.c
++++ guage.c 2006-07-10 16:10:33.000000000 +0200
+@@ -229,6 +229,7 @@ dialog_gauge(const char *title,
+ nodelay(stdscr, FALSE);
+ #endif
+ fclose(dialog_state.pipe_input);
++ dialog_state.pipe_input = (FILE*)0;
+ curs_set(1);
+ dlg_del_window(dialog);
+ if (prompt != prompt_buf)
--- msgbox.c
-+++ msgbox.c 2004-04-06 14:25:12.000000000 +0200
-@@ -34,6 +34,7 @@
- int x, y;
- int key = 0, fkey;
- WINDOW *dialog = 0;
-+ WINDOW *shadow = 0;
- char *prompt = dlg_strclone(cprompt);
- const char **buttons = dlg_ok_label();
-
-@@ -54,11 +55,9 @@
++++ msgbox.c 2006-07-10 14:49:08.000000000 +0200
+@@ -174,11 +174,9 @@ dialog_msgbox(const char *title, const c
y = dlg_box_y_ordinate(height);
#ifdef KEY_RESIZE
@@ -176,30 +178,11 @@
+ dlg_move_window(dialog, height, width, y, x);
+ else
#endif
+ {
dialog = dlg_new_window(height, width, y, x);
-
--- ui_getc.c
-+++ ui_getc.c 2004-04-06 13:09:09.000000000 +0200
-@@ -294,6 +294,7 @@
- static void
- finish_bg(int sig GCC_UNUSED)
- {
-+ end_dialog();
- dlg_exit(DLG_EXIT_ERROR);
- }
-
-@@ -344,6 +345,10 @@
- /* wait for child */
- #ifdef HAVE_WAITPID
- while (-1 == waitpid(pid, &wstatus, 0)) {
-+#ifdef ECHILD
-+ if (errno == ECHILD)
-+ break;
-+#endif /* ECHILD */
- #ifdef EINTR
- if (errno == EINTR)
- continue;
-@@ -364,6 +369,7 @@
++++ ui_getc.c 2006-07-10 16:01:22.000000000 +0200
+@@ -374,6 +374,7 @@ dlg_killall_bg(int *retval)
(void) signal(SIGHUP, finish_bg);
(void) signal(SIGINT, finish_bg);
(void) signal(SIGQUIT, finish_bg);
@@ -208,21 +191,19 @@
int fkey = 0;
dlg_getc_callbacks(ERR, fkey, retval);
--- util.c
-+++ util.c 2004-04-06 14:26:40.000000000 +0200
-@@ -360,6 +360,7 @@
++++ util.c 2006-07-10 16:11:23.000000000 +0200
+@@ -373,6 +373,7 @@ dlg_color_setup(void)
if (has_colors()) { /* Terminal supports color? */
(void) start_color();
+ use_default_colors();
- for (i = 0; i < sizeof(dlg_color_table) /
- sizeof(dlg_color_table[0]); i++) {
-@@ -371,8 +372,22 @@
- /* Setup color attributes */
- dlg_color_table[i].atr = C_ATTR(dlg_color_table[i].hilite, i + 1);
+ #if defined(__NetBSD__) && defined(_CURSES_)
+ #define C_ATTR(x,y) (((x) != 0 ? A_BOLD : 0) | COLOR_PAIR((y)))
+@@ -404,7 +405,22 @@ dlg_color_setup(void)
+ | color);
}
-+ init_pair(i + 1, -1, -1);
- defined_colors = i + 1;
+ #endif
+ } else {
+ dialog_state.use_colors = 0;
+ dialog_state.use_shadow = 0;
@@ -230,22 +211,24 @@
+
+ dialog_state.tty.ws_row = 0;
+ dialog_state.tty.ws_col = 0;
-+ if (isatty(STDOUT_FILENO))
++
++ if (isatty(STDOUT_FILENO))
+ ioctl(STDOUT_FILENO, TIOCGWINSZ, &dialog_state.tty);
+ else if (isatty(STDIN_FILENO))
+ ioctl(STDIN_FILENO, TIOCGWINSZ, &dialog_state.tty);
+
+ if (dialog_state.tty.ws_row == 0 || dialog_state.tty.ws_col == 0)
+ dialog_state.use_shadow = 0;
++
}
int
-@@ -936,23 +951,53 @@
+@@ -1037,24 +1053,57 @@ dlg_draw_box(WINDOW *win, int y, int x,
#ifdef HAVE_COLOR
/*
* Draw shadows along the right and bottom edge to give a more 3D look
- * to the boxes
-+ * to the overlying boxes like search boxes.
++* to the overlying boxes like search boxes.
*/
void
dlg_draw_shadow(WINDOW *win, int y, int x, int height, int width)
@@ -253,22 +236,25 @@
int i, j;
+ int col = dialog_state.tty.ws_col;
+ int row = dialog_state.tty.ws_row;
++
if (has_colors()) { /* Whether terminal supports color? */
wattrset(win, shadow_attr);
for (i = y + height; i < y + height + SHADOW_ROWS; ++i) {
- (void) wmove(win, i, x + SHADOW_COLS);
-- for (j = 0; j < width; ++j)
-- (void) waddch(win, CharOf(winch(win)));
-+ if (height + i < row)
-+ for (j = 0; j < width; ++j)
-+ (void) waddch(win, CharOf(winch(win)));
+ if (wmove(win, i, x + SHADOW_COLS) != ERR) {
+- for (j = 0; j < width; ++j)
+- (void) waddch(win, CharOf(winch(win)));
++ if (height + i < row)
++ for (j = 0; j < width; ++j)
++ (void) waddch(win, CharOf(winch(win)));
+ }
}
for (i = y + SHADOW_ROWS; i < y + height + SHADOW_ROWS; i++) {
- (void) wmove(win, i, x + width);
- for (j = 0; j < SHADOW_COLS; ++j)
-+ if (width + x + j < col && i < row)
-+ (void) waddch(win, CharOf(winch(win)));
+ if (wmove(win, i, x + width) != ERR) {
+ for (j = 0; j < SHADOW_COLS; ++j)
++ if (width + x + j < col && i < row)
++ (void) waddch(win, CharOf(winch(win)));
++ }
+ }
+ (void) wnoutrefresh(win);
+ }
@@ -287,20 +273,21 @@
+ if (has_colors()) { /* Whether terminal supports color? */
+ wattrset(win, shadow_attr);
+ for (i = y; i < height; ++i) {
-+ (void) wmove(win, i, 0);
-+ for (j = 0; j < width; j++)
-+ (void) waddch(win, CharOf(winch(win)));
++ if (wmove(win, i, 0) != ERR) {
++ for (j = 0; j < width; j++)
++ (void) waddch(win, CharOf(winch(win)));
++ }
+ }
+ for (i = 0; i < y; i++) {
-+ (void) wmove(win, i, x);
-+ for (j = 0; j < SHADOW_COLS; ++j)
- (void) waddch(win, CharOf(winch(win)));
- }
- (void) wnoutrefresh(win);
-@@ -996,7 +1041,18 @@
- break;
++ if (wmove(win, i, x) != ERR) {
++ for (j = 0; j < SHADOW_COLS; ++j)
+ (void) waddch(win, CharOf(winch(win)));
+ }
}
- }
+@@ -1120,7 +1169,20 @@ dlg_exit(int code)
+ _nc_free_and_exit(code);
+ #endif
+ #endif
- exit(code);
+
+ if (dialog_state.input == stdin)
@@ -311,13 +298,15 @@
+ */
+ if (dialog_state.input)
+ fclose(dialog_state.input);
-+ if (dialog_state.pipe_input)
++ if (dialog_state.pipe_input != stdin)
+ fclose(dialog_state.pipe_input);
++ dialog_state.input = (FILE*)0;
++ dialog_state.pipe_input = (FILE*)0;
+ _exit(code);
}
/* quit program killing all tailbg */
-@@ -1046,8 +1102,11 @@
+@@ -1170,8 +1232,11 @@ dlg_ctl_size(int height, int width)
height, width, LINES, COLS);
}
#ifdef HAVE_COLOR
@@ -331,18 +320,16 @@
dlg_exiterr("Window+Shadow too big. (height, width) = (%d, %d). Max allowed (%d, %d).",
height, width, SLINES, SCOLS);
}
-@@ -1226,8 +1285,8 @@
-
- #ifdef HAVE_COLOR
- if (dialog_state.use_shadow) {
-- if ((win = newwin(height, width, y + 1, x + 2)) != 0) {
-- dlg_draw_shadow(win, 0, 0, height, width);
-+ if ((win = newwin(height, width, y + SHADOW_ROWS, x + SHADOW_COLS)) != 0) {
+@@ -1370,7 +1435,7 @@ dlg_new_window(int height, int width, in
+ if ((win = newwin(height, width,
+ y + SHADOW_ROWS,
+ x + SHADOW_COLS)) != 0) {
+- dlg_draw_shadow(win, -SHADOW_ROWS, -SHADOW_COLS, height, width);
+ dlg_draw_shadow_box(win, height, width);
}
p->shadow = win;
}
-@@ -1244,6 +1303,46 @@
+@@ -1387,6 +1452,46 @@ dlg_new_window(int height, int width, in
return win;
}
@@ -389,27 +376,9 @@
WINDOW *
dlg_sub_window(WINDOW *parent, int height, int width, int y, int x)
{
-@@ -1281,12 +1380,16 @@
- {
- if (USE_ITEM_HELP(txt)) {
- chtype attr = A_NORMAL;
-+ int len = COLS;
-
- wattrset(stdscr, itemhelp_attr);
- (void) wmove(stdscr, LINES - 1, 0);
- (void) wclrtoeol(stdscr);
-- (void) addch(' ');
-+ while (len-- > 0)
-+ (void) addch(' ');
-+ (void) wmove(stdscr, LINES - 1, 1);
- dlg_print_text(stdscr, txt, COLS - 2, &attr);
-+ wattrset(stdscr, screen_attr);
- (void) wnoutrefresh(stdscr);
- }
- }
--- yesno.c
-+++ yesno.c 2004-04-06 14:25:50.000000000 +0200
-@@ -52,11 +52,9 @@
++++ yesno.c 2006-07-10 14:09:14.000000000 +0200
+@@ -72,11 +72,9 @@ dialog_yesno(const char *title, const ch
y = dlg_box_y_ordinate(height);
#ifdef KEY_RESIZE
@@ -422,5 +391,5 @@
+ dlg_move_window(dialog, height, width, y, x);
+ else
#endif
+ {
dialog = dlg_new_window(height, width, y, x);
-
++++++ dialog-0.9b-20040316.tar.bz2 -> dialog-1.0-20060221.tar.bz2 ++++++
++++ 31917 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org