rpms/mc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- update from CVS

Browse Source 
- drop .fish-upload patch, applied upstream
- sync .showfree patch
This commit is contained in:
Jindrich Novy 2006-05-17 12:49:47 +00:00
parent dea20ddd6c
commit 33442ae103
3 changed files with 61 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
mc-showfree.patch
View File

@ -1,6 +1,6 @@
--- mc-4.6.1a/src/setup.c.showfree 2006-01-29 21:26:05.000000000 +0100 --- mc-4.6.1a/src/setup.c.showfree 2006-02-23 16:32:18.000000000 +0100
+++ mc-4.6.1a/src/setup.c 2006-02-28 11:43:49.000000000 +0100 +++ mc-4.6.1a/src/setup.c 2006-05-17 13:16:47.000000000 +0200
@@ -133,6 +133,7 @@ static const struct { @@ -134,6 +134,7 @@
{ "show_mini_info", &show_mini_info }, { "show_mini_info", &show_mini_info },
{ "permission_mode", &permission_mode }, { "permission_mode", &permission_mode },
{ "filetype_mode", &filetype_mode }, { "filetype_mode", &filetype_mode },
@ -8,8 +8,8 @@
{ 0, 0 } { 0, 0 }
}; };
--- mc-4.6.1a/src/screen.c.showfree 2006-02-28 11:42:47.000000000 +0100 --- mc-4.6.1a/src/screen.c.showfree 2006-05-17 13:16:47.000000000 +0200
+++ mc-4.6.1a/src/screen.c 2006-02-28 11:42:48.000000000 +0100 +++ mc-4.6.1a/src/screen.c 2006-05-17 13:16:47.000000000 +0200
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
#define WANT_WIDGETS #define WANT_WIDGETS
#include "main.h" /* the_menubar */ #include "main.h" /* the_menubar */
@ -18,7 +18,7 @@
#define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) ) #define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) )
@@ -106,6 +107,12 @@ int filetype_mode = 1; @@ -106,6 +107,12 @@
/* The hook list for the select file function */ /* The hook list for the select file function */
Hook *select_file_hook = 0; Hook *select_file_hook = 0;
@ -31,7 +31,7 @@
static cb_ret_t panel_callback (Widget *, widget_msg_t msg, int parm); static cb_ret_t panel_callback (Widget *, widget_msg_t msg, int parm);
static int panel_event (Gpm_Event *event, void *); static int panel_event (Gpm_Event *event, void *);
static void paint_frame (WPanel *panel); static void paint_frame (WPanel *panel);
@@ -851,6 +858,41 @@ paint_dir (WPanel *panel) @@ -851,6 +858,41 @@
standend (); standend ();
} }
@ -73,7 +73,7 @@
static void static void
mini_info_separator (WPanel *panel) mini_info_separator (WPanel *panel)
{ {
@@ -866,6 +908,7 @@ mini_info_separator (WPanel *panel) @@ -866,6 +908,7 @@
hline ((slow_terminal ? '-' : ACS_HLINE) | NORMAL_COLOR, hline ((slow_terminal ? '-' : ACS_HLINE) | NORMAL_COLOR,
panel->widget.cols - 2); panel->widget.cols - 2);
#endif /* !HAVE_SLANG */ #endif /* !HAVE_SLANG */
@ -81,7 +81,7 @@
} }
static void static void
@@ -929,6 +972,8 @@ show_dir (WPanel *panel) @@ -929,6 +972,8 @@
widget_move (&panel->widget, 0, panel->widget.cols - 3); widget_move (&panel->widget, 0, panel->widget.cols - 3);
addstr ("v"); addstr ("v");
@ -90,9 +90,9 @@
if (panel->active) if (panel->active)
standend (); standend ();
} }
--- mc-4.6.1a/src/layout.c.showfree 2006-02-28 11:42:47.000000000 +0100 --- mc-4.6.1a/src/layout.c.showfree 2006-05-17 13:16:46.000000000 +0200
+++ mc-4.6.1a/src/layout.c 2006-02-28 11:42:48.000000000 +0100 +++ mc-4.6.1a/src/layout.c 2006-05-17 13:21:04.000000000 +0200
@@ -99,6 +99,9 @@ int message_visible = 1; @@ -99,6 +99,9 @@
/* Set to show current working dir in xterm window title */ /* Set to show current working dir in xterm window title */
int xterm_title = 1; int xterm_title = 1;
@ -102,7 +102,7 @@
/* The starting line for the output of the subprogram */ /* The starting line for the output of the subprogram */
int output_start_y = 0; int output_start_y = 0;
@@ -128,6 +131,7 @@ static int _command_prompt; @@ -128,6 +131,7 @@
static int _keybar_visible; static int _keybar_visible;
static int _message_visible; static int _message_visible;
static int _xterm_title; static int _xterm_title;
@ -110,7 +110,7 @@
static int _permission_mode; static int _permission_mode;
static int _filetype_mode; static int _filetype_mode;
@@ -158,6 +162,7 @@ static struct { @@ -158,6 +162,7 @@
int *variable; int *variable;
WCheck *widget; WCheck *widget;
} check_options [] = { } check_options [] = {
@ -118,7 +118,7 @@
{ N_("&Xterm window title"), &xterm_title, 0 }, { N_("&Xterm window title"), &xterm_title, 0 },
{ N_("h&Intbar visible"), &message_visible, 0 }, { N_("h&Intbar visible"), &message_visible, 0 },
{ N_("&Keybar visible"), &keybar_visible, 0 }, { N_("&Keybar visible"), &keybar_visible, 0 },
@@ -229,8 +234,8 @@ static int b2left_cback (int action) @@ -229,8 +234,8 @@
if (_equal_split){ if (_equal_split){
/* Turn equal split off */ /* Turn equal split off */
_equal_split = 0; _equal_split = 0;
@ -129,7 +129,7 @@
dlg_select_widget (bleft_widget); dlg_select_widget (bleft_widget);
} }
_first_panel_size++; _first_panel_size++;
@@ -244,8 +249,8 @@ static int b2right_cback (int action) @@ -244,8 +249,8 @@
if (_equal_split){ if (_equal_split){
/* Turn equal split off */ /* Turn equal split off */
_equal_split = 0; _equal_split = 0;
@ -140,7 +140,18 @@
dlg_select_widget (bright_widget); dlg_select_widget (bright_widget);
} }
_first_panel_size--; _first_panel_size--;
@@ -300,14 +305,15 @@ layout_callback (struct Dlg_head *h, dlg @@ -291,23 +296,24 @@
if (old_output_lines != _output_lines){
old_output_lines = _output_lines;
attrset (COLOR_NORMAL);
- dlg_move (h, 9, 16 + first_width);
+ dlg_move (h, 10, 16 + first_width);
addstr (output_lines_label);
- dlg_move (h, 9, 10 + first_width);
+ dlg_move (h, 10, 10 + first_width);
tty_printf ("%02d", _output_lines);
}
}
return MSG_HANDLED; return MSG_HANDLED;
case DLG_POST_KEY: case DLG_POST_KEY:
@ -164,7 +175,16 @@
if (console_flag){ if (console_flag){
int minimum; int minimum;
if (_output_lines < 0) if (_output_lines < 0)
@@ -374,7 +380,7 @@ init_layout (void) @@ -335,7 +341,7 @@
if (old_output_lines != _output_lines){
old_output_lines = _output_lines;
attrset (COLOR_NORMAL);
- dlg_move (h, 9, 10 + first_width);
+ dlg_move (h, 10, 10 + first_width);
tty_printf ("%02d", _output_lines);
}
}
@@ -374,7 +380,7 @@
first_width = l1; first_width = l1;
} }
@ -173,7 +193,7 @@
check_options[i].text = _(check_options[i].text); check_options[i].text = _(check_options[i].text);
l1 = mbstrlen (check_options[i].text) + 7; l1 = mbstrlen (check_options[i].text) + 7;
if (l1 > first_width) if (l1 > first_width)
@@ -391,7 +397,7 @@ init_layout (void) @@ -391,7 +397,7 @@
second_width = mbstrlen (title3) + 1; second_width = mbstrlen (title3) + 1;
@ -182,7 +202,17 @@
check_options[i].text = _(check_options[i].text); check_options[i].text = _(check_options[i].text);
l1 = mbstrlen (check_options[i].text) + 7; l1 = mbstrlen (check_options[i].text) + 7;
if (l1 > second_width) if (l1 > second_width)
@@ -454,15 +460,15 @@ init_layout (void) @@ -446,23 +452,23 @@
0));
if (console_flag) {
add_widget (layout_dlg,
- button_new (9, 12 + first_width, B_MINUS,
+ button_new (10, 12 + first_width, B_MINUS,
NARROW_BUTTON, "&-", bminus_cback));
add_widget (layout_dlg,
- button_new (9, 7 + first_width, B_PLUS, NARROW_BUTTON,
+ button_new (10, 7 + first_width, B_PLUS, NARROW_BUTTON,
"&+", bplus_cback));
} }
#define XTRACT(i) *check_options[i].variable, check_options[i].text #define XTRACT(i) *check_options[i].variable, check_options[i].text
@ -203,7 +233,7 @@
_filetype_mode = filetype_mode; _filetype_mode = filetype_mode;
_permission_mode = permission_mode; _permission_mode = permission_mode;
@@ -472,20 +478,21 @@ init_layout (void) @@ -472,20 +478,21 @@
_keybar_visible = keybar_visible; _keybar_visible = keybar_visible;
_message_visible = message_visible; _message_visible = message_visible;
_xterm_title = xterm_title; _xterm_title = xterm_title;
@ -224,12 +254,12 @@
_output_lines = output_lines; _output_lines = output_lines;
- add_widget (layout_dlg, check_options[6].widget); - add_widget (layout_dlg, check_options[6].widget);
+ add_widget (layout_dlg, check_options[7].widget); + add_widget (layout_dlg, check_options[7].widget);
radio_widget = radio_new (3, 6, 2, s_split_direction, 1); radio_widget = radio_new (3, 6, 2, s_split_direction);
add_widget (layout_dlg, radio_widget); add_widget (layout_dlg, radio_widget);
radio_widget->sel = horizontal_split; radio_widget->sel = horizontal_split;
--- mc-4.6.1a/src/layout.h.showfree 2004-12-03 20:17:47.000000000 +0100 --- mc-4.6.1a/src/layout.h.showfree 2004-12-03 20:17:47.000000000 +0100
+++ mc-4.6.1a/src/layout.h 2006-02-28 11:42:48.000000000 +0100 +++ mc-4.6.1a/src/layout.h 2006-05-17 13:16:47.000000000 +0200
@@ -39,6 +39,7 @@ extern int keybar_visible; @@ -39,6 +39,7 @@
extern int output_start_y; extern int output_start_y;
extern int message_visible; extern int message_visible;
extern int xterm_title; extern int xterm_title;
@ -237,39 +267,3 @@
extern int horizontal_split; extern int horizontal_split;
extern int nice_rotating_dash; extern int nice_rotating_dash;
--- mc-4.6.1a/src/layout.c.jn 2006-03-16 10:20:31.000000000 +0100
+++ mc-4.6.1a/src/layout.c 2006-03-16 10:23:14.000000000 +0100
@@ -296,9 +296,9 @@ layout_callback (struct Dlg_head *h, dlg
if (old_output_lines != _output_lines){
old_output_lines = _output_lines;
attrset (COLOR_NORMAL);
- dlg_move (h, 9, 16 + first_width);
+ dlg_move (h, 10, 16 + first_width);
addstr (output_lines_label);
- dlg_move (h, 9, 10 + first_width);
+ dlg_move (h, 10, 10 + first_width);
tty_printf ("%02d", _output_lines);
}
}
@@ -341,7 +341,7 @@ layout_callback (struct Dlg_head *h, dlg
if (old_output_lines != _output_lines){
old_output_lines = _output_lines;
attrset (COLOR_NORMAL);
- dlg_move (h, 9, 10 + first_width);
+ dlg_move (h, 10, 10 + first_width);
tty_printf ("%02d", _output_lines);
}
}
@@ -452,10 +452,10 @@ init_layout (void)
0));
if (console_flag) {
add_widget (layout_dlg,
- button_new (9, 12 + first_width, B_MINUS,
+ button_new (10, 12 + first_width, B_MINUS,
NARROW_BUTTON, "&-", bminus_cback));
add_widget (layout_dlg,
- button_new (9, 7 + first_width, B_PLUS, NARROW_BUTTON,
+ button_new (10, 7 + first_width, B_PLUS, NARROW_BUTTON,
"&+", bplus_cback));
}
#define XTRACT(i) *check_options[i].variable, check_options[i].text

9
mc.spec
View File

@ -1,7 +1,7 @@
Summary: User-friendly text console file manager and visual shell. Summary: User-friendly text console file manager and visual shell.
Name: mc Name: mc
Version: 4.6.1a Version: 4.6.1a
Release: 14 Release: 15
Epoch: 1 Epoch: 1
License: GPL License: GPL
Group: System Environment/Shells Group: System Environment/Shells
@ -14,7 +14,6 @@ Requires: dev >= 0:3.3-3
Patch0: mc-utf8.patch Patch0: mc-utf8.patch
Patch1: mc-extensions.patch Patch1: mc-extensions.patch
Patch2: mc-uglydir.patch Patch2: mc-uglydir.patch
Patch3: mc-fish-upload.patch
Patch4: mc-userhost.patch Patch4: mc-userhost.patch
Patch5: mc-64bit.patch Patch5: mc-64bit.patch
Patch6: mc-utf8-look-and-feel.patch Patch6: mc-utf8-look-and-feel.patch
@ -37,7 +36,6 @@ specific files.
%patch0 -p1 -b .utf8 %patch0 -p1 -b .utf8
%patch1 -p1 -b .extensions %patch1 -p1 -b .extensions
%patch2 -p1 -b .uglydir %patch2 -p1 -b .uglydir
%patch3 -p1 -b .fish-upload
%patch4 -p1 -b .userhost %patch4 -p1 -b .userhost
%patch5 -p1 -b .64bit %patch5 -p1 -b .64bit
%patch6 -p1 -b .laf %patch6 -p1 -b .laf
@ -190,6 +188,11 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/mc %dir %{_sysconfdir}/mc
%changelog %changelog
* Wed May 17 2006 Jindrich Novy <jnovy@redhat.com> 4.6.1a-15
- update from CVS
- drop .fish-upload patch, applied upstream
- sync .showfree patch
* Fri Apr 28 2006 Jindrich Novy <jnovy@redhat.com> 4.6.1a-14 * Fri Apr 28 2006 Jindrich Novy <jnovy@redhat.com> 4.6.1a-14
- don't reread panel contents while in panelized mode (#188438) - don't reread panel contents while in panelized mode (#188438)

2
sources
View File

@ -1 +1 @@
137ebb38714a6810bae5f33209e31a67 mc-4.6.1a.tar.bz2 20d6fdc8a8acddf44437e53985fd4cd6 mc-4.6.1a.tar.bz2