rpms/mc/devel mc-64bit.patch, 1.2, 1.3 mc-promptfix.patch, 1.1, 1.2 mc-userhost.patch, 1.3, 1.4 mc-utf8.patch, 1.11, 1.12 mc.spec, 1.65, 1.66 mc-cstrans.patch, 1.2, NONE mc-ctrl-t.patch, 1.1, NONE mc-find.patch, 1.2, NONE mc-ftpcrash.patch, 1.1, NONE mc-gcc4.patch, 1.1, NONE mc-searchfix.patch, 1.1, NONE mc-symcrash.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Oct 17 13:48:56 UTC 2005
Author: jnovy
Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32719
Modified Files:
mc-64bit.patch mc-promptfix.patch mc-userhost.patch
mc-utf8.patch mc.spec
Removed Files:
mc-cstrans.patch mc-ctrl-t.patch mc-find.patch
mc-ftpcrash.patch mc-gcc4.patch mc-searchfix.patch
mc-symcrash.patch
Log Message:
- update from CVS
- convert spec to UTF-8
- sync utf8, promptfix, 64bit patches
- drop upstreamed gcc4, ftpcrash, find, symcrash, cstrans, searchfix patches
- drop ctrl-t patch
- update userhost patch to let the edited/viewed file name be displayed in
xterm title
mc-64bit.patch:
mountlist.c | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
Index: mc-64bit.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-64bit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mc-64bit.patch 6 Jun 2005 13:25:29 -0000 1.2
+++ mc-64bit.patch 17 Oct 2005 13:48:52 -0000 1.3
@@ -52,14 +52,3 @@
}
#if defined(_AIX) && defined(_I386)
---- mc-4.6.1a/acinclude.m4.64bit 2005-05-10 17:09:24.084859280 +0200
-+++ mc-4.6.1a/acinclude.m4 2005-05-10 17:09:24.124853200 +0200
-@@ -501,7 +501,7 @@ dnl job is to detect a method to get fil
- if test $ac_cv_func_statvfs = yes; then
- space=yes
- AC_DEFINE(STAT_STATVFS, 1,
-- [Define if function `statfs' can be used])
-+ [Define if function `statvfs' can be used])
- fi
- fi
-
mc-promptfix.patch:
main.c | 8 +++++++-
subshell.c | 22 +++++++++-------------
2 files changed, 16 insertions(+), 14 deletions(-)
Index: mc-promptfix.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-promptfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mc-promptfix.patch 2 Feb 2005 13:54:20 -0000 1.1
+++ mc-promptfix.patch 17 Oct 2005 13:48:53 -0000 1.2
@@ -1,6 +1,6 @@
---- mc-4.6.1-20041124/src/subshell.c.promptfix 2004-11-03 20:43:17.000000000 +0100
-+++ mc-4.6.1-20041124/src/subshell.c 2004-11-24 10:24:49.760461024 +0100
-@@ -596,19 +596,15 @@
+--- mc-4.6.1a/src/subshell.c.promptfix 2005-09-05 04:04:23.000000000 +0200
++++ mc-4.6.1a/src/subshell.c 2005-10-16 18:05:26.000000000 +0200
+@@ -596,19 +596,15 @@ read_subshell_prompt (void)
bytes = read (subshell_pty, pty_buffer, pty_buffer_size);
/* Extract the prompt from the shell output */
@@ -29,9 +29,9 @@
subshell_prompt[prompt_pos] = '\0';
}
---- mc-4.6.1-20041124/src/main.c.promptfix 2004-10-22 07:47:25.000000000 +0200
-+++ mc-4.6.1-20041124/src/main.c 2004-11-24 10:28:29.172105384 +0100
-@@ -433,8 +433,14 @@
+--- mc-4.6.1a/src/main.c.promptfix 2005-10-16 18:05:26.000000000 +0200
++++ mc-4.6.1a/src/main.c 2005-10-16 18:09:00.000000000 +0200
+@@ -428,8 +428,14 @@ do_possible_cd (const char *new_dir)
void
do_update_prompt (void)
{
@@ -47,24 +47,3 @@
fflush (stdout);
update_prompt = 0;
}
-@@ -699,15 +705,11 @@
- prompt = strip_ctrl_codes (subshell_prompt);
- prompt_len = strlen (prompt);
-
-- /* Check for prompts too big */
-- if (COLS > 8 && prompt_len > COLS - 8) {
-- prompt[COLS - 8] = 0;
-- prompt_len = COLS - 8;
-- }
-- label_set_text (the_prompt, prompt);
-- winput_set_origin ((WInput *) cmdline, prompt_len,
-- COLS - prompt_len);
--
-+ /* Shrink the prompt if it's too big */
-+ label_set_text (the_prompt, name_trunc (prompt, COLS - 8));
-+ prompt_len = prompt_len <= COLS - 8 ? prompt_len : COLS - 8;
-+ winput_set_origin ((WInput *) cmdline, prompt_len,
-+ COLS - prompt_len);
- /* since the prompt has changed, and we are called from one of the
- * get_event channels, the prompt updating does not take place
- * automatically: force a cursor update and a screen refresh
mc-userhost.patch:
edit/editwidget.c | 10 ++++++++++
src/main.c | 20 +++++++++++++++++++-
src/main.h | 1 +
src/view.c | 7 +++++++
4 files changed, 37 insertions(+), 1 deletion(-)
Index: mc-userhost.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-userhost.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mc-userhost.patch 8 Jul 2005 09:56:28 -0000 1.3
+++ mc-userhost.patch 17 Oct 2005 13:48:53 -0000 1.4
@@ -1,33 +1,128 @@
---- mc-4.6.1-pre5/src/main.c.userhost 2005-07-08 11:04:37.718907992 +0200
-+++ mc-4.6.1-pre5/src/main.c 2005-07-08 11:07:53.888085744 +0200
-@@ -33,6 +33,7 @@
- # include <unistd.h>
- #endif
-
+--- mc-4.6.1a/src/main.c.userhost 2005-10-16 18:11:07.000000000 +0200
++++ mc-4.6.1a/src/main.c 2005-10-16 18:14:26.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+#include <pwd.h>
- #include <errno.h>
- #include <ctype.h>
- #include <signal.h>
-@@ -1607,9 +1608,22 @@ void
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -1608,9 +1609,22 @@ void
update_xterm_title_path (void)
{
- unsigned char *p, *s;
+ char *p, *s;
+ char h[64];
+ struct passwd *pw;
if (xterm_flag && xterm_title) {
p = s = g_strdup (strip_home_and_password (current_panel->cwd));
-+ if ( !gethostname (h, 64) ) {
-+ h[63] = '\0'; /* Be sure the hostname is NUL terminated */
-+ s = g_strdup_printf ("%s:%s", h, s);
-+ g_free (p);
-+ p = s;
-+ }
-+ if ( (pw = getpwuid(getuid())) ) {
-+ s = g_strdup_printf ("%s@%s", pw->pw_name, s);
-+ g_free (p);
-+ p = s;
-+ }
++ if ( !gethostname (h, 64) ) {
++ h[63] = '\0'; /* Be sure the hostname is NUL terminated */
++ s = g_strdup_printf ("%s:%s", h, s);
++ g_free (p);
++ p = s;
++ }
++ if ( (pw = getpwuid(getuid())) ) {
++ s = g_strdup_printf ("%s@%s", pw->pw_name, s);
++ g_free (p);
++ p = s;
++ }
do {
#ifndef UTF8
- if (!is_printable (*s))
+ if (!is_printable ((unsigned char) *s))
+--- mc-4.6.1a/src/main.h.viewfile 2005-09-05 04:10:48.000000000 +0200
++++ mc-4.6.1a/src/main.h 2005-10-17 14:41:46.000000000 +0200
+@@ -67,6 +67,7 @@ extern int alternate_plus_minus;
+ extern int only_leading_plus_minus;
+ extern int output_starts_shell;
+ extern int midnight_shutdown;
++extern char *xterm_title_str;
+ extern char cmd_buf [512];
+ extern const char *shell;
+
+--- mc-4.6.1a/src/view.c.viewfile 2005-10-17 14:41:46.000000000 +0200
++++ mc-4.6.1a/src/view.c 2005-10-17 15:11:54.000000000 +0200
+@@ -3344,6 +3344,11 @@ mc_internal_viewer (const char *command,
+ WButtonBar *bar;
+ Dlg_head *view_dlg;
+
++ if (xterm_flag && xterm_title && xterm_title_str) {
++ fprintf (stdout, "\33]0;mc - %s/%s\7", xterm_title_str, file);
++ fflush(stdout);
++ }
++
+ /* Create dialog and widgets, put them on the dialog */
+ view_dlg =
+ create_dlg (0, 0, LINES, COLS, NULL, view_dialog_callback,
+@@ -3367,6 +3372,8 @@ mc_internal_viewer (const char *command,
+ }
+ destroy_dlg (view_dlg);
+
++ update_xterm_title_path();
++
+ return succeeded;
+ }
+
+--- mc-4.6.1a/src/main.c.viewfile 2005-10-17 14:41:46.000000000 +0200
++++ mc-4.6.1a/src/main.c 2005-10-17 14:41:46.000000000 +0200
+@@ -270,6 +270,9 @@ int midnight_shutdown = 0;
+ /* The user's shell */
+ const char *shell = NULL;
+
++/* The xterm title */
++char *xterm_title_str = NULL;
++
+ /* mc_home: The home of MC */
+ char *mc_home = NULL;
+
+@@ -1617,6 +1620,7 @@ update_xterm_title_path (void)
+ struct passwd *pw;
+
+ if (xterm_flag && xterm_title) {
++ if ( xterm_title_str ) g_free (xterm_title_str);
+ p = s = g_strdup (strip_home_and_password (current_panel->cwd));
+ if ( !gethostname (h, 64) ) {
+ h[63] = '\0'; /* Be sure the hostname is NUL terminated */
+@@ -1639,7 +1643,7 @@ update_xterm_title_path (void)
+ } while (*++s);
+ fprintf (stdout, "\33]0;mc - %s\7", p);
+ fflush (stdout);
+- g_free (p);
++ xterm_title_str = p;
+ }
+ }
+
+--- mc-4.6.1a/edit/editwidget.c.viewfile 2005-10-17 14:41:46.000000000 +0200
++++ mc-4.6.1a/edit/editwidget.c 2005-10-17 14:41:46.000000000 +0200
+@@ -44,6 +44,9 @@
+ #include "../src/widget.h" /* buttonbar_redraw() */
+ #include "../src/menu.h" /* menubar_new() */
+ #include "../src/key.h" /* is_idle() */
++#include "../src/main.h" /* xterm_title_str */
++#include "../src/win.h" /* xterm_flag */
++#include "../src/layout.h" /* xterm_title */
+
+ WEdit *wedit;
+ struct WMenu *edit_menubar;
+@@ -184,6 +187,11 @@ edit_file (const char *_file, int line)
+ static int made_directory = 0;
+ Dlg_head *edit_dlg;
+ WButtonBar *edit_bar;
++
++ if (xterm_flag && xterm_title && xterm_title_str) {
++ fprintf (stdout, "\33]0;mc - %s/%s\7", xterm_title_str, _file);
++ fflush(stdout);
++ }
+
+ if (!made_directory) {
+ char *dir = concat_dir_and_file (home_dir, EDIT_DIR);
+@@ -219,6 +227,8 @@ edit_file (const char *_file, int line)
+ edit_done_menu (edit_menubar); /* editmenu.c */
+
+ destroy_dlg (edit_dlg);
++
++ update_xterm_title_path();
+
+ return 1;
+ }
mc-utf8.patch:
acinclude.m4 | 16 -
edit/edit-widget.h | 16 +
edit/edit.c | 265 +++++++++++++++++++-------
edit/edit.h | 39 +++
edit/editcmd.c | 521 +++++++++++++++++++++++++++++++++++++++++++++--------
edit/editdraw.c | 113 +++++++----
edit/editkeys.c | 29 ++
edit/editwidget.c | 3
edit/wordproc.c | 79 ++++++--
src/achown.c | 6
src/boxes.c | 50 ++---
src/dialog.c | 2
src/file.c | 9
src/filegui.c | 47 ++--
src/find.c | 12 -
src/help.c | 24 ++
src/hotlist.c | 14 -
src/layout.c | 26 +-
src/learn.c | 2
src/main.c | 6
src/menu.c | 120 +++++++++++-
src/menu.h | 2
src/myslang.h | 4
src/option.c | 20 +-
src/panelize.c | 8
src/screen.c | 269 ++++++++++++++++++++-------
src/tty.c | 10 -
src/tty.h | 2
src/util.c | 323 ++++++++++++++++++++++++++++++--
src/util.h | 7
src/view.c | 61 ++++++
src/widget.c | 371 +++++++++++++++++++++++++++++++------
src/widget.h | 16 +
src/wtools.c | 14 -
34 files changed, 2014 insertions(+), 492 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 mc-utf8.patch
Index: mc-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-utf8.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mc-utf8.patch 29 Sep 2005 17:49:11 -0000 1.11
+++ mc-utf8.patch 17 Oct 2005 13:48:53 -0000 1.12
@@ -1,6 +1,6 @@
---- mc-4.6.1/acinclude.m4.utf8 2005-05-11 20:53:22.000000000 +0200
-+++ mc-4.6.1/acinclude.m4 2005-09-29 19:13:29.000000000 +0200
-@@ -769,14 +769,14 @@ AC_DEFUN([MC_WITH_SLANG], [
+--- mc-4.6.1a/acinclude.m4.utf8 2005-09-28 23:49:06.000000000 +0200
++++ mc-4.6.1a/acinclude.m4 2005-10-17 14:34:41.000000000 +0200
+@@ -768,14 +768,14 @@ AC_DEFUN([MC_WITH_SLANG], [
fi
dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
@@ -23,9 +23,9 @@
if test x$with_screen = xslang; then
AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
---- mc-4.6.1/src/layout.c.utf8 2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/layout.c 2005-09-29 19:13:29.000000000 +0200
-@@ -362,36 +362,36 @@ init_layout (void)
+--- mc-4.6.1a/src/layout.c.utf8 2005-09-05 03:40:45.000000000 +0200
++++ mc-4.6.1a/src/layout.c 2005-10-17 14:34:41.000000000 +0200
+@@ -369,36 +369,36 @@ init_layout (void)
while (i--) {
s_split_direction[i] = _(s_split_direction[i]);
@@ -69,7 +69,7 @@
if (l1 > second_width)
second_width = l1;
}
-@@ -405,14 +405,14 @@ init_layout (void)
+@@ -412,14 +412,14 @@ init_layout (void)
*
* Now the last thing to do - properly space buttons...
*/
@@ -89,7 +89,7 @@
i18n_layt_flag = 1;
}
-@@ -684,7 +684,7 @@ setup_panels (void)
+@@ -687,7 +687,7 @@ setup_panels (void)
panel_do_cols (0);
panel_do_cols (1);
@@ -98,9 +98,28 @@
widget_set_size (&the_menubar->widget, 0, 0, 1, COLS);
---- mc-4.6.1/src/option.c.utf8 2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/option.c 2005-09-29 19:13:29.000000000 +0200
-@@ -124,12 +124,12 @@ init_configure (void)
+--- mc-4.6.1a/src/tty.c.utf8 2005-09-05 05:05:39.000000000 +0200
++++ mc-4.6.1a/src/tty.c 2005-10-17 14:34:41.000000000 +0200
+@@ -123,10 +123,12 @@ tty_print_char(int c)
+ * defined or not. Congratulations! At least, they left the API call
+ * for SLsmg_write_nchars as it has always been.
+ */
+- char ch;
+-
+- ch = c;
+- SLsmg_write_nchars(&ch, 1);
++
++ /* The above comment is a nonsense, SLsmg_write_char(c) works pretty
++ * good for me. So please don't mess with Red Hat people.
++ * Jindrich Novy (jnovy at redhat.com)
++ */
++ SLsmg_write_char(c);
+ #else
+ addch(c);
+ #endif
+--- mc-4.6.1a/src/option.c.utf8 2005-05-27 05:35:15.000000000 +0200
++++ mc-4.6.1a/src/option.c 2005-10-17 14:34:41.000000000 +0200
+@@ -123,12 +123,12 @@ init_configure (void)
title2 = _(" Pause after run... ");
title3 = _(" Other options ");
@@ -116,7 +135,7 @@
if (i >= OTHER_OPTIONS) {
if (l1 > first_width)
first_width = l1;
-@@ -142,23 +142,23 @@ init_configure (void)
+@@ -141,23 +141,23 @@ init_configure (void)
i = PAUSE_OPTIONS;
while (i--) {
pause_options[i] = _(pause_options[i]);
@@ -147,8 +166,8 @@
i18n_config_flag = 1;
}
---- mc-4.6.1/src/menu.h.utf8 2004-09-18 16:30:59.000000000 +0200
-+++ mc-4.6.1/src/menu.h 2005-09-29 19:13:29.000000000 +0200
+--- mc-4.6.1a/src/menu.h.utf8 2004-12-03 20:17:47.000000000 +0100
++++ mc-4.6.1a/src/menu.h 2005-10-17 14:34:41.000000000 +0200
@@ -21,6 +21,8 @@ typedef struct Menu {
menu_entry *entries;
int start_x; /* position relative to menubar start */
@@ -158,18 +177,17 @@
} Menu;
extern int menubar_visible;
---- mc-4.6.1/src/menu.c.utf8 2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/menu.c 2005-09-29 19:32:14.000000000 +0200
-@@ -20,6 +20,8 @@
- #include <stdarg.h>
+--- mc-4.6.1a/src/menu.c.utf8 2005-09-05 04:12:09.000000000 +0200
++++ mc-4.6.1a/src/menu.c 2005-10-17 14:34:41.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include <string.h>
+
#include <sys/types.h>
- #include <ctype.h>
+#include <wchar.h>
-+
+
#include "global.h"
#include "tty.h"
- #include "menu.h"
-@@ -50,34 +52,96 @@ create_menu (const char *name, menu_entr
+@@ -53,33 +54,95 @@ create_menu (const char *name, menu_entr
{
Menu *menu;
const char *cp;
@@ -186,15 +204,15 @@
+ menu->wentries = NULL;
+ menu->wname = NULL;
+ if (SLsmg_Is_Unicode) {
-+ const char *str = menu->name;
-+ memset (&s, 0, sizeof (s));
-+ wlen = mbsrtowcs (NULL, &str, -1, &s);
-+ if (wlen > 0)
-+ ++wlen;
-+ else {
-+ wlen = 0;
-+ memset (&s, 0, sizeof (s));
-+ }
++ const char *str = menu->name;
++ memset (&s, 0, sizeof (s));
++ wlen = mbsrtowcs (NULL, &str, -1, &s);
++ if (wlen > 0)
++ ++wlen;
++ else {
++ wlen = 0;
++ memset (&s, 0, sizeof (s));
++ }
+ }
+#endif
@@ -207,18 +225,17 @@
mp->text = _(mp->text);
#endif /* ENABLE_NLS */
cp = strchr (mp->text,'&');
-
+#ifdef UTF8
+ if (SLsmg_Is_Unicode) {
-+ len = mbstrlen(mp->text) + 1;
-+ wlen += len;
-+ menu->max_entry_len = max (len - 1, menu->max_entry_len);
-+ } else
++ len = mbstrlen(mp->text) + 1;
++ wlen += len;
++ menu->max_entry_len = max (len - 1, menu->max_entry_len);
++ } else
+#endif
-+ len = strlen (mp->text);
-+
++ len = strlen (mp->text);
+
if (cp != NULL && *(cp+1) != '\0') {
- mp->hot_key = tolower (*(cp+1));
+ mp->hot_key = tolower ((unsigned char) *(cp+1));
- menu->max_entry_len = max ((int) (strlen (mp->text) - 1),
- menu->max_entry_len);
+ menu->max_entry_len = max (len - 1, menu->max_entry_len);
@@ -231,48 +248,47 @@
}
}
-- menu->name = g_strdup (name);
+#ifdef UTF8
+ if (wlen) {
-+ wchar_t *wp;
-+ const char *str;
-+ int len;
-+
-+ menu->wentries = (wchar_t **)
-+ g_malloc (sizeof (wchar_t *) * menu->count
-+ + wlen * sizeof (wchar_t));
-+ wp = (wchar_t *) (menu->wentries + menu->count);
-+ str = menu->name;
-+ len = mbsrtowcs (wp, &str, wlen, &s);
-+ if (len > 0) {
-+ menu->wname = wp;
-+ wlen -= len + 1;
-+ wp += len + 1;
-+ } else
[...3045 lines suppressed...]
*/
static long
@@ -4792,7 +4832,7 @@
}
/* is called whenever a modification is made by one of the four routines below */
-@@ -831,7 +942,7 @@ static inline void edit_modification (WE
+@@ -827,7 +939,7 @@ static inline void edit_modification (WE
*/
void
@@ -4801,7 +4841,7 @@
{
/* check if file has grown to large */
if (edit->last_byte >= SIZE_LIMIT)
-@@ -869,12 +980,11 @@ edit_insert (WEdit *edit, int c)
+@@ -865,12 +977,11 @@ edit_insert (WEdit *edit, int c)
/* add a new buffer if we've reached the end of the last one */
if (!(edit->curs1 & M_EDIT_BUF_SIZE))
edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE] =
@@ -4817,7 +4857,7 @@
/* update file length */
edit->last_byte++;
-@@ -885,7 +995,7 @@ edit_insert (WEdit *edit, int c)
+@@ -881,7 +992,7 @@ edit_insert (WEdit *edit, int c)
/* same as edit_insert and move left */
@@ -4826,7 +4866,7 @@
{
if (edit->last_byte >= SIZE_LIMIT)
return;
-@@ -908,7 +1018,7 @@ void edit_insert_ahead (WEdit * edit, in
+@@ -904,7 +1015,7 @@ void edit_insert_ahead (WEdit * edit, in
edit->last_get_rule += (edit->last_get_rule >= edit->curs1);
if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
@@ -4835,7 +4875,7 @@
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
edit->last_byte++;
-@@ -918,7 +1028,7 @@ void edit_insert_ahead (WEdit * edit, in
+@@ -914,7 +1025,7 @@ void edit_insert_ahead (WEdit * edit, in
int edit_delete (WEdit * edit)
{
@@ -4844,7 +4884,7 @@
if (!edit->curs2)
return 0;
-@@ -942,7 +1052,7 @@ int edit_delete (WEdit * edit)
+@@ -938,7 +1049,7 @@ int edit_delete (WEdit * edit)
edit->total_lines--;
edit->force |= REDRAW_AFTER_CURSOR;
}
@@ -4853,7 +4893,7 @@
if (edit->curs1 < edit->start_display) {
edit->start_display--;
if (p == '\n')
-@@ -956,7 +1066,7 @@ int edit_delete (WEdit * edit)
+@@ -952,7 +1063,7 @@ int edit_delete (WEdit * edit)
static int
edit_backspace (WEdit * edit)
{
@@ -4862,7 +4902,7 @@
if (!edit->curs1)
return 0;
-@@ -980,7 +1090,7 @@ edit_backspace (WEdit * edit)
+@@ -976,7 +1087,7 @@ edit_backspace (WEdit * edit)
edit->total_lines--;
edit->force |= REDRAW_AFTER_CURSOR;
}
@@ -4871,7 +4911,7 @@
if (edit->curs1 < edit->start_display) {
edit->start_display--;
-@@ -993,10 +1103,18 @@ edit_backspace (WEdit * edit)
+@@ -989,10 +1100,18 @@ edit_backspace (WEdit * edit)
#ifdef FAST_MOVE_CURSOR
@@ -4891,7 +4931,7 @@
edit->curs_line--;
next -= (unsigned long) dest;
n -= next;
-@@ -1009,7 +1127,7 @@ int
+@@ -1005,7 +1124,7 @@ int
edit_move_backward_lots (WEdit *edit, long increment)
{
int r, s, t;
@@ -4900,7 +4940,7 @@
if (increment > edit->curs1)
increment = edit->curs1;
-@@ -1049,7 +1167,7 @@ edit_move_backward_lots (WEdit *edit, lo
+@@ -1045,7 +1164,7 @@ edit_move_backward_lots (WEdit *edit, lo
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p;
else
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] =
@@ -4909,7 +4949,7 @@
} else {
g_free (p);
}
-@@ -1087,7 +1205,7 @@ edit_move_backward_lots (WEdit *edit, lo
+@@ -1083,7 +1202,7 @@ edit_move_backward_lots (WEdit *edit, lo
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p;
else
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] =
@@ -4918,7 +4958,7 @@
} else {
g_free (p);
}
-@@ -1119,7 +1237,7 @@ int edit_cursor_move (WEdit * edit, long
+@@ -1115,7 +1234,7 @@ int edit_cursor_move (WEdit * edit, long
c = edit_get_byte (edit, edit->curs1 - 1);
if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
@@ -4927,7 +4967,7 @@
edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
edit->curs2++;
c = edit->buffers1[(edit->curs1 - 1) >> S_EDIT_BUF_SIZE][(edit->curs1 - 1) & M_EDIT_BUF_SIZE];
-@@ -1144,7 +1262,7 @@ int edit_cursor_move (WEdit * edit, long
+@@ -1140,7 +1259,7 @@ int edit_cursor_move (WEdit * edit, long
c = edit_get_byte (edit, edit->curs1);
if (!(edit->curs1 & M_EDIT_BUF_SIZE))
@@ -4936,7 +4976,7 @@
edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE][edit->curs1 & M_EDIT_BUF_SIZE] = c;
edit->curs1++;
c = edit->buffers2[(edit->curs2 - 1) >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - ((edit->curs2 - 1) & M_EDIT_BUF_SIZE) - 1];
-@@ -1251,7 +1369,7 @@ long edit_move_forward3 (WEdit * edit, l
+@@ -1247,7 +1366,7 @@ long edit_move_forward3 (WEdit * edit, l
q = edit->last_byte + 2;
for (col = 0, p = current; p < q; p++) {
@@ -4945,7 +4985,7 @@
if (cols != -10) {
if (col == cols)
return p;
-@@ -1269,7 +1387,7 @@ long edit_move_forward3 (WEdit * edit, l
+@@ -1265,7 +1384,7 @@ long edit_move_forward3 (WEdit * edit, l
} else if (c < 32 || c == 127)
col += 2; /* Caret notation for control characters */
else
@@ -4954,7 +4994,7 @@
}
return col;
}
-@@ -1402,7 +1520,7 @@ static int
+@@ -1398,7 +1517,7 @@ static int
is_blank (WEdit *edit, long offset)
{
long s, f;
@@ -4963,7 +5003,7 @@
s = edit_bol (edit, offset);
f = edit_eol (edit, offset) - 1;
while (s <= f) {
-@@ -1774,13 +1892,13 @@ static void edit_left_delete_word (WEdit
+@@ -1770,13 +1889,13 @@ static void edit_left_delete_word (WEdit
static void
edit_do_undo (WEdit * edit)
{
@@ -4980,7 +5020,7 @@
case STACK_BOTTOM:
goto done_undo;
case CURS_RIGHT:
-@@ -1801,31 +1919,33 @@ edit_do_undo (WEdit * edit)
+@@ -1797,31 +1916,33 @@ edit_do_undo (WEdit * edit)
case COLUMN_OFF:
column_highlighting = 0;
break;
@@ -5027,7 +5067,7 @@
edit_update_curs_row (edit);
done_undo:;
-@@ -2102,7 +2222,7 @@ static void edit_goto_matching_bracket (
+@@ -2098,7 +2219,7 @@ static void edit_goto_matching_bracket (
* passed as -1. Commands are executed, and char_for_insertion is
* inserted at the cursor.
*/
@@ -5036,7 +5076,7 @@
{
if (command == CK_Begin_Record_Macro) {
edit->macro_i = 0;
-@@ -2137,7 +2257,7 @@ static const char * const shell_cmd[] =
+@@ -2133,7 +2254,7 @@ static const char * const shell_cmd[] =
all of them. It also does not check for the Undo command.
*/
void
@@ -5045,7 +5085,7 @@
{
edit->force |= REDRAW_LINE;
-@@ -2170,7 +2290,7 @@ edit_execute_cmd (WEdit *edit, int comma
+@@ -2166,7 +2287,7 @@ edit_execute_cmd (WEdit *edit, int comma
}
/* An ordinary key press */
Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mc.spec 7 Oct 2005 07:29:17 -0000 1.65
+++ mc.spec 17 Oct 2005 13:48:53 -0000 1.66
@@ -1,11 +1,11 @@
Summary: User-friendly text console file manager and visual shell.
Name: mc
Version: 4.6.1a
-Release: 0.18
+Release: 0.19
Epoch: 1
License: GPL
Group: System Environment/Shells
-Source0: http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-4.6.1.tar.bz2
+Source0: http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-%{version}.tar.bz2
URL: http://www.ibiblio.org/mc/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gpm-devel, slang-devel, glib2-devel
@@ -19,14 +19,7 @@
Patch4: mc-fish-upload.patch
Patch5: mc-userhost.patch
Patch6: mc-64bit.patch
-Patch7: mc-gcc4.patch
-Patch8: mc-ftpcrash.patch
-Patch9: mc-specsyntax.patch
-Patch10: mc-find.patch
-Patch11: mc-symcrash.patch
-Patch12: mc-cstrans.patch
-Patch13: mc-ctrl-t.patch
-Patch14: mc-searchfix.patch
+Patch7: mc-specsyntax.patch
%description
Midnight Commander is a visual shell much like a file manager, only
@@ -36,7 +29,7 @@
poke into RPMs for specific files.
%prep
-%setup -q -n %{name}-4.6.1
+%setup -q -n %{name}-%{version}
%patch0 -p1 -b .utf8
%patch1 -p1 -b .extensions
@@ -45,14 +38,7 @@
%patch4 -p1 -b .fish-upload
%patch5 -p1 -b .userhost
%patch6 -p1 -b .64bit
-%patch7 -p1 -b .gcc4
-%patch8 -p1 -b .ftpcrash
-%patch9 -p1 -b .specsyntax
-%patch10 -p1 -b .find
-%patch11 -p1 -b .symcrash
-%patch12 -p1 -b .cstrans
-%patch13 -p1 -b .ctrl-t
-%patch14 -p1 -b .searchfix
+%patch7 -p1 -b .specsyntax
# convert files in /lib to UTF-8
pushd lib
@@ -189,6 +175,15 @@
%dir %{_datadir}/mc
%changelog
+* Mon Oct 16 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.19
+- update from CVS
+- convert spec to UTF-8
+- sync utf8, promptfix, 64bit patches
+- drop upstreamed gcc4, ftpcrash, find, symcrash, cstrans, searchfix patches
+- drop ctrl-t patch
+- update userhost patch to let the edited/viewed file name be displayed in
+ xterm title
+
* Tue Oct 4 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.18
- fix off-by-one highlighting when searching backwards in mcedit (#169823)
- fix yet another duplicates in menus for Czech locale
@@ -560,7 +555,7 @@
- Add patch to recognize kudzu's fstab entries
- Fix path to memstick icon
-* Fri Feb 23 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Feb 23 2001 Trond Eivind Glomsrød <teg at redhat.com>
- use %%{_tmppath}
- langify
@@ -574,7 +569,7 @@
- include both sys/time.h and time.h on glibc 2.2.2
- fix Japanese patch to include locale.h.
-* Tue Feb 6 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Feb 6 2001 Trond Eivind Glomsrød <teg at redhat.com>
- i18nize initscript
* Sat Jan 27 2001 Akira TAGOH <tagoh at redhat.com>
@@ -771,7 +766,7 @@
* Wed Apr 8 1998 Marc Ewing <marc at redhat.com>
- add %{prefix}/lib/mc/layout to gmc
-* Tue Dec 23 1997 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl>
+* Tue Dec 23 1997 Tomasz KÅ‚oczko <kloczek at rudy.mif.pg.gda.pl>
- added --without-debug to configure,
- modification in %%build and %%install and cosmetic modification in packages
headers,
@@ -795,7 +790,7 @@
- fixed spec file.
- Updated to 4.1.8
-* Sun Oct 26 1997 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl>
+* Sun Oct 26 1997 Tomasz KÅ‚oczko <kloczek at rudy.mif.pg.gda.pl>
- updated to 4.1.6
- added %attr macros in %%files,
@@ -839,7 +834,7 @@
- reverted to un-gzipped man pages (RedHat style)
- removed double install line for mcserv.pamd
-* Tue May 13 1997 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl>
+* Tue May 13 1997 Tomasz KÅ‚oczko <kloczek at rudy.mif.pg.gda.pl>
- added new rpmfs script,
- removed mcfn_install from mc (adding mc() to bash enviroment is in
@@ -848,25 +843,25 @@
- removed %{prefix}/lib/mc/bin/create_vcs,
- removed %{prefix}/lib/mc/term.
-* Wed May 9 1997 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl>
+* Wed May 9 1997 Tomasz KÅ‚oczko <kloczek at rudy.mif.pg.gda.pl>
- changed source url,
- fixed link mcedit to mc,
-* Tue May 7 1997 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl>
+* Tue May 7 1997 Tomasz KÅ‚oczko <kloczek at rudy.mif.pg.gda.pl>
- new version 3.5.27,
- %dir %{prefix}/lib/mc/icons and icons removed from tkmc,
- added commented xmc part.
-* Tue Apr 22 1997 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl>
+* Tue Apr 22 1997 Tomasz KÅ‚oczko <kloczek at rudy.mif.pg.gda.pl>
- FIX spec:
- added URL field,
- in mc added missing %{prefix}/lib/mc/mc.ext, %{prefix}/lib/mc/mc.hint,
%{prefix}/lib/mc/mc.hlp, %{prefix}/lib/mc/mc.lib, %{prefix}/lib/mc/mc.menu.
-* Fri Apr 18 1997 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl>
+* Fri Apr 18 1997 Tomasz KÅ‚oczko <kloczek at rudy.mif.pg.gda.pl>
- added making packages: tkmc, mcserv (xmc not work yet),
- gziped man pages,
--- mc-cstrans.patch DELETED ---
--- mc-ctrl-t.patch DELETED ---
--- mc-find.patch DELETED ---
--- mc-ftpcrash.patch DELETED ---
--- mc-gcc4.patch DELETED ---
--- mc-searchfix.patch DELETED ---
--- mc-symcrash.patch DELETED ---
More information about the fedora-cvs-commits
mailing list