[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/mc/FC-4 mc-gcc4.patch, NONE, 1.1 mc-extensions.patch, 1.1, 1.2 mc-userhost.patch, 1.2, 1.3 mc-utf8.patch, 1.7, 1.8 mc.spec, 1.56, 1.57 sources, 1.22, 1.23



Author: jnovy

Update of /cvs/dist/rpms/mc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13392

Modified Files:
	mc-extensions.patch mc-userhost.patch mc-utf8.patch mc.spec 
	sources 
Added Files:
	mc-gcc4.patch 
Log Message:
- update to the new mc release - 4.6.1
- sync extensions, utf8, userhost patch
- fix several gcc4 signedness warnings


mc-gcc4.patch:
 src/file.c       |   18 +++++++++---------
 src/learn.c      |    2 +-
 src/main.c       |    2 +-
 src/menu.c       |    2 +-
 src/poptconfig.c |    2 +-
 src/popthelp.c   |    4 ++--
 src/view.c       |    4 ++--
 src/widget.c     |    2 +-
 src/widget.h     |    2 +-
 vfs/utilvfs.c    |    4 ++--
 10 files changed, 21 insertions(+), 21 deletions(-)

--- NEW FILE mc-gcc4.patch ---
--- mc-4.6.1/vfs/utilvfs.c.gcc4	2005-05-27 16:19:19.000000000 +0200
+++ mc-4.6.1/vfs/utilvfs.c	2005-07-25 12:47:57.623838864 +0200
@@ -202,7 +202,7 @@ vfs_findgid (const char *gname)
 int
 vfs_mkstemps (char **pname, const char *prefix, const char *basename)
 {
-    const unsigned char *p;
+    const char *p;
     char *suffix, *q;
     int shift;
     int fd;
@@ -337,7 +337,7 @@ is_month (const char *str, struct tm *ti
  * NB: It is assumed there are no whitespaces in month.
  */
 static int
-is_localized_month (const unsigned char *month)
+is_localized_month (const char *month)
 {
     int i = 0;
 
--- mc-4.6.1/src/menu.c.gcc4	2005-07-25 12:47:57.591843728 +0200
+++ mc-4.6.1/src/menu.c	2005-07-25 12:47:57.624838712 +0200
@@ -171,7 +171,7 @@ static void menubar_paint_idx (WMenu *me
         widget_move (&menubar->widget, y, x + 1);
     	hline (slow_terminal ? ' ' : ACS_HLINE, menubar->max_entry_len);
     } else {
-	const unsigned char *text;
+	const char *text;
 
 	addch((unsigned char)menu->entries [idx].first_letter);
 #ifdef UTF8
--- mc-4.6.1/src/learn.c.gcc4	2005-07-25 12:47:57.567847376 +0200
+++ mc-4.6.1/src/learn.c	2005-07-25 12:47:57.625838560 +0200
@@ -75,7 +75,7 @@ static const char* learn_title = N_("Lea
 
 static int learn_button (int action)
 {
-    unsigned char *seq;
+    char *seq;
     Dlg_head *d = create_message (D_ERROR, _(" Teach me a key "),
 _("Please press the %s\n"
 "and then wait until this message disappears.\n\n"
--- mc-4.6.1/src/main.c.gcc4	2005-07-25 12:47:57.615840080 +0200
+++ mc-4.6.1/src/main.c	2005-07-25 12:47:57.626838408 +0200
@@ -1607,7 +1607,7 @@ midnight_callback (struct Dlg_head *h, d
 void
 update_xterm_title_path (void)
 {
-    unsigned char *p, *s;
+    char *p, *s;
     char h[64];
     struct passwd *pw;
 
--- mc-4.6.1/src/file.c.gcc4	2005-07-25 12:47:57.582845096 +0200
+++ mc-4.6.1/src/file.c	2005-07-25 12:47:57.628838104 +0200
@@ -161,14 +161,14 @@ convert_case (int c, enum CaseConvs *con
 
 static int transform_error = 0;
 
-static const unsigned char *
-do_transform_source (FileOpContext *ctx, const unsigned char *source)
+static const char *
+do_transform_source (FileOpContext *ctx, const char *source)
 {
     size_t j, k, l, len;
-    unsigned const char *fnsource = g_strdup (x_basename (source));
+    char *fnsource = g_strdup (x_basename (source));
     int next_reg;
     enum CaseConvs case_conv = NO_CONV;
-    static unsigned char fntarget[MC_MAXPATHLEN];
+    static char fntarget[MC_MAXPATHLEN];
 
 #ifdef UTF8
     fix_utf8(fnsource);
@@ -241,12 +241,12 @@ do_transform_source (FileOpContext *ctx,
     return fntarget;
 }
 
-static const unsigned char *
-transform_source (FileOpContext *ctx, const unsigned char *source)
+static const char *
+transform_source (FileOpContext *ctx, const char *source)
 {
-    unsigned char *s = g_strdup (source);
-    unsigned char *q;
-    const unsigned char *p;
+    char *s = g_strdup (source);
+    char *q;
+    const char *p;
 
     /* We remove \n from the filename since regex routines would use \n as an anchor */
     /* this is just to be allowed to maniupulate file names with \n on it */
--- mc-4.6.1/src/widget.c.gcc4	2005-07-25 12:47:57.000000000 +0200
+++ mc-4.6.1/src/widget.c	2005-07-25 12:52:17.902270528 +0200
@@ -345,7 +345,7 @@ radio_callback (WRadio *r, int msg, int 
     case WIDGET_FOCUS:
     case WIDGET_DRAW:
 	for (i = 0; i < r->count; i++) {
-	    register const unsigned char *cp;
+	    const char *cp;
 	    attrset ((i == r->pos
 		      && msg == WIDGET_FOCUS) ? FOCUSC : NORMALC);
 	    widget_move (&r->widget, i, 0);
--- mc-4.6.1/src/popthelp.c.gcc4	2004-11-11 18:37:20.000000000 +0100
+++ mc-4.6.1/src/popthelp.c	2005-07-25 12:47:57.629837952 +0200
@@ -65,9 +65,9 @@ static void singleOptionHelp(FILE * f, i
 			     const char *translation_domain) {
     int indentLength = maxLeftCol + 5;
     int lineLength = 79 - indentLength;
-    const unsigned char * help = D_(translation_domain, opt->descrip);
+    const char * help = D_(translation_domain, opt->descrip);
     int helpLength;
-    const unsigned char * ch;
+    const char * ch;
     char * left;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
 
--- mc-4.6.1/src/poptconfig.c.gcc4	2004-09-25 15:46:23.000000000 +0200
+++ mc-4.6.1/src/poptconfig.c	2005-07-25 12:47:57.630837800 +0200
@@ -17,7 +17,7 @@
 #include "popt.h"
 #include "poptint.h"
 
-static void configLine(poptContext con, unsigned char * line) {
+static void configLine(poptContext con, char * line) {
     int nameLength = strlen(con->appName);
     char * opt;
     struct poptAlias alias;
--- mc-4.6.1/src/view.c.gcc4	2005-07-25 12:47:57.584844792 +0200
+++ mc-4.6.1/src/view.c	2005-07-25 12:50:16.187773944 +0200
@@ -102,7 +102,7 @@ struct WView {
     int view_active;
     int have_frame;
     
-    unsigned char *data;	/* Memory area for the file to be viewed */
+    char *data;			/* Memory area for the file to be viewed */
 
     /* File information */
     int file;			/* File descriptor (for mmap and munmap) */
@@ -580,7 +580,7 @@ load_view_file (WView *view, int fd)
 
     /* Make sure view->s.st_size is not truncated when passed to g_malloc */
     if ((gulong) view->s.st_size == view->s.st_size)
-	view->data = (unsigned char *) g_try_malloc ((gulong) view->s.st_size);
+	view->data = g_try_malloc ((gulong) view->s.st_size);
     else
 	view->data = NULL;
 
--- mc-4.6.1/src/widget.h.gcc4	2005-07-25 12:47:57.587844336 +0200
+++ mc-4.6.1/src/widget.h	2005-07-25 12:47:57.633837344 +0200
@@ -69,7 +69,7 @@ typedef struct {
     int  first;			/* Is first keystroke? */
     int  disable_update;	/* Do we want to skip updates? */
     int  is_password;		/* Is this a password input line? */
-    unsigned char *buffer;	/* pointer to editing buffer */
+    char *buffer;		/* pointer to editing buffer */
 #ifdef UTF8
     char charbuf[MB_LEN_MAX];
 #endif /* UTF8 */

mc-extensions.patch:
 mc.ext.in |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-4/mc-extensions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mc-extensions.patch	2 Feb 2005 13:54:20 -0000	1.1
+++ mc-extensions.patch	11 Aug 2005 08:34:03 -0000	1.2
@@ -1,6 +1,6 @@
---- mc-4.6.1-20041103/lib/mc.ext.in.extensions	2004-10-28 08:19:23.000000000 +0200
-+++ mc-4.6.1-20041103/lib/mc.ext.in	2004-11-03 13:20:09.889755600 +0100
-@@ -108,14 +108,25 @@
+--- mc-4.6.1/lib/mc.ext.in.extensions	2005-07-23 18:51:15.000000000 +0200
++++ mc-4.6.1/lib/mc.ext.in	2005-07-25 09:53:08.367448216 +0200
+@@ -210,14 +210,25 @@ shell/.7z
  
  # C
  shell/.c
@@ -28,22 +28,7 @@
  	Open=%var{EDITOR:vi} %f
  
  # Object
-@@ -123,14 +134,6 @@
- 	#Open=%var{PAGER:more} %f
- 	View=%view{ascii} file %f && nm %f
- 
--# Asm
--shell/.s
--	Open=%var{EDITOR:vi} %f
--
--# C++
--regex/\.(C|cc|cpp)$
--	Open=%var{EDITOR:vi} %f
--
- ### Documentation ###
- 
- # Texinfo
-@@ -139,9 +142,11 @@
+@@ -242,9 +253,11 @@ regex/\.(te?xi|texinfo)$
  # GNU Info page
  type/^Info\ text
  	Open=info -f %f
@@ -55,7 +40,7 @@
  
  # Manual page
  # Exception - .so libraries are not manual pages
-@@ -210,6 +215,12 @@
+@@ -313,6 +326,12 @@ type/^PPM
  type/^Netpbm
  	Include=image
  
@@ -68,7 +53,7 @@
  shell/.xcf
  	Open=gimp %f
  
-@@ -221,7 +232,7 @@
+@@ -324,7 +343,7 @@ shell/.xpm
  	View=sxpm %f
  
  include/image
@@ -77,7 +62,7 @@
  	View=%view{ascii} identify %f
  	#View=%view{ascii} asciiview %f
  
-@@ -239,8 +250,12 @@
+@@ -342,8 +361,12 @@ regex/\.([wW][aA][wW]22)$
         Open=vplay -s 22 %f
  
  regex/\.([mM][pP]3)$
@@ -92,7 +77,7 @@
  
  regex/\.([oO][gG][gG])$
  	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
-@@ -253,6 +268,9 @@
+@@ -356,6 +379,9 @@ regex/\.([wW][mM][aA])$
  	Open=mplayer -vo null %f
  	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
  
@@ -102,7 +87,7 @@
  
  ### Play lists ###
  
-@@ -277,20 +295,28 @@
+@@ -380,20 +406,28 @@ regex/\.([mM][oO][vV]|[qQ][tT])$
  regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$
  	Include=video
  

mc-userhost.patch:
 main.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

Index: mc-userhost.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-4/mc-userhost.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mc-userhost.patch	16 Jun 2005 13:02:36 -0000	1.2
+++ mc-userhost.patch	11 Aug 2005 08:34:03 -0000	1.3
@@ -1,17 +1,17 @@
---- mc-4.6.1a/src/main.c.userhost	2005-06-06 13:35:08.926427736 +0200
-+++ mc-4.6.1a/src/main.c	2005-06-06 13:39:11.551543112 +0200
-@@ -32,6 +32,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <pwd.h>
+--- 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
  
- #include "global.h"
- #include "tty.h"
-@@ -1611,9 +1612,22 @@ void
++#include <pwd.h>
+ #include <errno.h>
+ #include <ctype.h>
+ #include <signal.h>
+@@ -1607,9 +1608,22 @@ void
  update_xterm_title_path (void)
  {
-     char *p, *s;
+     unsigned char *p, *s;
 +    char h[64];
 +    struct passwd *pw;
  
@@ -30,4 +30,4 @@
 +        }
  	do {
  #ifndef UTF8
- 	    if (!is_printable ((unsigned char) *s))
+ 	    if (!is_printable (*s))

mc-utf8.patch:
 acinclude.m4       |   16 -
 edit/edit-widget.h |   16 +
 edit/edit.c        |  266 +++++++++++++++++++--------
 edit/edit.h        |   55 +++--
 edit/editcmd.c     |  520 +++++++++++++++++++++++++++++++++++++++++++++--------
 edit/editdraw.c    |  115 ++++++++---
 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         |   10 -
 src/help.c         |   24 ++
 src/hotlist.c      |   14 -
 src/layout.c       |   26 +-
 src/learn.c        |    2 
 src/main.c         |    4 
 src/menu.c         |  124 +++++++++++-
 src/menu.h         |    2 
 src/myslang.h      |    4 
 src/option.c       |   20 +-
 src/panelize.c     |    8 
 src/screen.c       |  268 ++++++++++++++++++++-------
 src/util.c         |  324 ++++++++++++++++++++++++++++++---
 src/util.h         |    7 
 src/view.c         |   61 +++++-
 src/widget.c       |  373 +++++++++++++++++++++++++++++++-------
 src/widget.h       |   16 +
 src/wtools.c       |   14 -
 32 files changed, 2006 insertions(+), 508 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.7 -r 1.8 mc-utf8.patch
Index: mc-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-4/mc-utf8.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mc-utf8.patch	16 Jun 2005 13:02:36 -0000	1.7
+++ mc-utf8.patch	11 Aug 2005 08:34:03 -0000	1.8
@@ -1,6 +1,6 @@
---- mc-4.6.1a/edit/editdraw.c.utf8	2005-05-27 05:35:12.000000000 +0200
-+++ mc-4.6.1a/edit/editdraw.c	2005-06-06 14:46:19.160253520 +0200
-@@ -61,7 +61,7 @@
+--- mc-4.6.1-pre5/edit/editdraw.c.utf8	2005-05-27 16:19:18.000000000 +0200
++++ mc-4.6.1-pre5/edit/editdraw.c	2005-07-08 11:22:41.891088768 +0200
+@@ -48,7 +48,7 @@
  
  static void status_string (WEdit * edit, char *s, int w)
  {
@@ -9,7 +9,7 @@
  
      /*
       * If we are at the end of file, print <EOF>,
-@@ -69,11 +69,16 @@ static void status_string (WEdit * edit,
+@@ -56,11 +56,16 @@ static void status_string (WEdit * edit,
       * as decimal and as hex.
       */
      if (edit->curs1 < edit->last_byte) {
@@ -29,7 +29,7 @@
      } else {
  	strcpy (byte_str, "<EOF>");
      }
-@@ -198,11 +203,16 @@ void edit_scroll_screen_over_cursor (WEd
+@@ -183,11 +188,16 @@ void edit_scroll_screen_over_cursor (WEd
  #define lowlevel_set_color(x) attrset(MY_COLOR_PAIR(color))
  #endif
  
@@ -48,7 +48,7 @@
  
      int x = start_col_real + EDIT_TEXT_HORIZONTAL_OFFSET;
      int x1 = start_col + EDIT_TEXT_HORIZONTAL_OFFSET;
-@@ -216,9 +226,9 @@ print_to_widget (WEdit *edit, long row, 
+@@ -201,9 +211,9 @@ print_to_widget (WEdit *edit, long row, 
      edit_move (x1 + FONT_OFFSET_X, y + FONT_OFFSET_Y);
      p = line;
  
@@ -60,7 +60,7 @@
  	int color;
  
  	if (cols_to_skip) {
-@@ -227,9 +237,9 @@ print_to_widget (WEdit *edit, long row, 
+@@ -212,9 +222,9 @@ print_to_widget (WEdit *edit, long row, 
  	    continue;
  	}
  
@@ -73,7 +73,7 @@
  
  	if (style & MOD_ABNORMAL) {
  	    /* Non-printable - use black background */
-@@ -243,8 +253,11 @@ print_to_widget (WEdit *edit, long row, 
+@@ -228,8 +238,11 @@ print_to_widget (WEdit *edit, long row, 
  	} else {
  	    lowlevel_set_color (color);
  	}
@@ -86,7 +86,7 @@
  	p++;
      }
  }
-@@ -254,11 +267,11 @@ static void
+@@ -239,11 +252,11 @@ static void
  edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
  		     long end_col)
  {
@@ -101,7 +101,7 @@
      int color;
      int i, book_mark = -1;
  
-@@ -280,66 +293,96 @@ edit_draw_this_line (WEdit *edit, long b
+@@ -265,66 +278,96 @@ edit_draw_this_line (WEdit *edit, long b
  
  	if (row <= edit->total_lines - edit->start_line) {
  	    while (col <= end_col - edit->start_col) {
@@ -218,7 +218,7 @@
  		    }
  		    col++;
  		    break;
-@@ -349,7 +392,7 @@ edit_draw_this_line (WEdit *edit, long b
+@@ -334,7 +377,7 @@ edit_draw_this_line (WEdit *edit, long b
      } else {
  	start_col_real = start_col = 0;
      }
@@ -227,9 +227,9 @@
  
      print_to_widget (edit, row, start_col, start_col_real, end_col, line);
  }
---- mc-4.6.1a/edit/editkeys.c.utf8	2005-05-27 05:35:12.000000000 +0200
-+++ mc-4.6.1a/edit/editkeys.c	2005-06-06 14:46:19.161253368 +0200
-@@ -176,10 +176,10 @@ static long const common_key_map[] = {
+--- mc-4.6.1-pre5/edit/editkeys.c.utf8	2005-05-27 16:19:18.000000000 +0200
++++ mc-4.6.1-pre5/edit/editkeys.c	2005-07-08 11:22:41.892088616 +0200
+@@ -162,10 +162,10 @@ static long const common_key_map[] = {
   * 'command' is one of the editor commands from editcmddef.h.
   */
  int
@@ -242,7 +242,7 @@
      int i = 0;
      static const long *key_map;
  
-@@ -256,9 +256,30 @@ edit_translate_key (WEdit *edit, long x_
+@@ -242,9 +242,30 @@ edit_translate_key (WEdit *edit, long x_
      /* an ordinary insertable character */
      if (x_key < 256) {
  	int c = convert_from_input_c (x_key);
@@ -274,7 +274,7 @@
  	    goto fin;
  	}
      }
-@@ -299,7 +320,7 @@ edit_translate_key (WEdit *edit, long x_
+@@ -285,7 +306,7 @@ edit_translate_key (WEdit *edit, long x_
      *cmd = command;
      *ch = char_for_insertion;
  
@@ -283,9 +283,9 @@
  	/* unchanged, key has no function here */
  	return 0;
      }
---- mc-4.6.1a/edit/editwidget.c.utf8	2005-05-27 05:35:12.000000000 +0200
-+++ mc-4.6.1a/edit/editwidget.c	2005-06-06 14:46:19.162253216 +0200
-@@ -349,7 +349,8 @@ edit_callback (Widget *w, widget_msg_t m
+--- mc-4.6.1-pre5/edit/editwidget.c.utf8	2005-05-27 16:19:18.000000000 +0200
++++ mc-4.6.1-pre5/edit/editwidget.c	2005-07-08 11:22:41.893088464 +0200
+@@ -337,7 +337,8 @@ edit_callback (WEdit *e, widget_msg_t ms
  
      case WIDGET_KEY:
  	{
@@ -295,9 +295,9 @@
  
  	    /* first check alt-f, alt-e, alt-s, etc for drop menus */
  	    if (edit_drop_hotkey_menu (e, parm))
---- mc-4.6.1a/edit/wordproc.c.utf8	2005-05-27 05:35:12.000000000 +0200
-+++ mc-4.6.1a/edit/wordproc.c	2005-06-06 14:46:19.162253216 +0200
-@@ -40,7 +40,12 @@
+--- mc-4.6.1-pre5/edit/wordproc.c.utf8	2005-05-27 16:19:18.000000000 +0200
++++ mc-4.6.1-pre5/edit/wordproc.c	2005-07-08 11:22:41.894088312 +0200
+@@ -24,7 +24,12 @@
  
  #define tab_width option_tab_spacing
  
@@ -310,7 +310,7 @@
  #define FONT_MEAN_WIDTH 1
  
  static long
-@@ -57,14 +62,21 @@ line_start (WEdit *edit, long line)
+@@ -41,14 +46,21 @@ line_start (WEdit *edit, long line)
  	p = edit_move_forward (edit, p, line - l, 0);
  
      p = edit_bol (edit, p);
@@ -333,7 +333,7 @@
      c = edit_get_byte (edit, p);
      if (c == '.') {		/* `...' is acceptable */
  	if (edit_get_byte (edit, p + 1) == '.')
-@@ -78,7 +90,13 @@ static int bad_line_start (WEdit * edit,
+@@ -62,7 +74,13 @@ static int bad_line_start (WEdit * edit,
  		return 0;	/* `---' is acceptable */
  	return 1;
      }
@@ -347,7 +347,7 @@
  	return 1;
      return 0;
  }
-@@ -131,33 +149,37 @@ end_paragraph (WEdit *edit, int force)
+@@ -115,33 +133,37 @@ end_paragraph (WEdit *edit, int force)
  					i - edit->curs_line, 0));
  }
  
@@ -393,7 +393,7 @@
      while (size--) {
  	*p = *p == '\n' ? ' ' : *p;
  	p++;
-@@ -174,7 +196,7 @@ static inline int next_tab_pos (int x)
+@@ -158,7 +180,7 @@ static inline int next_tab_pos (int x)
  {
      return x += tab_width - x % tab_width;
  }
@@ -402,32 +402,25 @@
  {
      int x = 0, c, xn = 0;
      for (;;) {
-@@ -198,7 +220,7 @@ static int line_pixel_length (unsigned c
+@@ -182,7 +204,7 @@ static int line_pixel_length (unsigned c
  }
  
- static int
--next_word_start (unsigned char *t, int q)
-+next_word_start (mc_wchar_t *t, int q)
+ /* find the start of a word */
+-static int next_word_start (unsigned char *t, int q, int size)
++static int next_word_start (mc_wchar_t *t, int q, int size)
  {
      int i;
      for (i = q;; i++) {
[...2515 lines suppressed...]
-+                len = strlen (mp->text);
++                    len = strlen (mp->text);
 +
  		if (cp != NULL && *(cp+1) != '\0') {
- 		    mp->hot_key = tolower ((unsigned char) *(cp+1));
+ 		    mp->hot_key = tolower (*(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);
++		    menu->max_entry_len = max (len - 1, menu->max_entry_len);
  		} else {
 -		    menu->max_entry_len = max ((int) strlen (mp->text),
 -			menu->max_entry_len);
-+                    menu->max_entry_len = max (len, menu->max_entry_len);
++		    menu->max_entry_len = max (len, menu->max_entry_len);
  		}
  	    }
  	}
@@ -4743,8 +4748,8 @@
      menu->name = g_strdup (name);
      menu_scan_hotkey(menu);
      menu->start_x = 0;
-@@ -112,8 +176,26 @@ static void menubar_paint_idx (WMenu *me
- 	const char *text;
+@@ -109,8 +174,26 @@ static void menubar_paint_idx (WMenu *me
+ 	const unsigned char *text;
  
  	addch((unsigned char)menu->entries [idx].first_letter);
 -	for (text = menu->entries [idx].text; *text; text++)
@@ -4772,7 +4777,7 @@
  		if (*text != '&')
  		    addch(*text);
  		else {
-@@ -122,7 +204,7 @@ static void menubar_paint_idx (WMenu *me
+@@ -119,7 +202,7 @@ static void menubar_paint_idx (WMenu *me
  		    addch(*(++text));
  		    attrset(color);
  		}
@@ -4781,7 +4786,7 @@
      }
      widget_move (&menubar->widget, y, x + 1);
  }
-@@ -170,7 +252,13 @@ static void menubar_draw (WMenu *menubar
+@@ -167,7 +250,13 @@ static void menubar_draw (WMenu *menubar
  	if (menubar->active)
  	    attrset(i == menubar->selected?MENU_SELECTED_COLOR:SELECTED_COLOR);
  	widget_move (&menubar->widget, 0, menubar->menu [i]->start_x);
@@ -4796,7 +4801,7 @@
      }
  
      if (menubar->dropped)
-@@ -495,7 +583,13 @@ menubar_arrange(WMenu* menubar)
+@@ -489,7 +578,13 @@ menubar_arrange(WMenu* menubar)
  
  	for (i = 0; i < items; i++)
  	{
@@ -4811,7 +4816,7 @@
  		menubar->menu[i]->start_x = start_x;
  		start_x += len + gap;
  	}
-@@ -508,7 +602,13 @@ menubar_arrange(WMenu* menubar)
+@@ -502,7 +597,13 @@ menubar_arrange(WMenu* menubar)
  	for (i = 0; i < items; i++)
  	{
  		/* preserve length here, to be used below */
@@ -4826,7 +4831,7 @@
  	}
  
  	gap /= (items - 1);
-@@ -532,6 +632,9 @@ menubar_arrange(WMenu* menubar)
+@@ -526,6 +627,9 @@ menubar_arrange(WMenu* menubar)
  void
  destroy_menu (Menu *menu)
  {
@@ -4836,9 +4841,9 @@
      g_free (menu->name);
      g_free (menu->help_node);
      g_free (menu);
---- mc-4.6.1a/src/option.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.1a/src/option.c	2005-06-06 14:46:19.195248200 +0200
-@@ -123,12 +123,12 @@ init_configure (void)
+--- mc-4.6.1-pre5/src/option.c.utf8	2005-05-27 16:19:18.000000000 +0200
++++ mc-4.6.1-pre5/src/option.c	2005-07-08 11:22:41.927083296 +0200
+@@ -124,12 +124,12 @@ init_configure (void)
  	title2 = _(" Pause after run... ");
  	title3 = _(" Other options ");
  
@@ -4854,7 +4859,7 @@
  	    if (i >= OTHER_OPTIONS) {
  		if (l1 > first_width)
  		    first_width = l1;
-@@ -141,23 +141,23 @@ init_configure (void)
+@@ -142,23 +142,23 @@ init_configure (void)
  	i = PAUSE_OPTIONS;
  	while (i--) {
  	    pause_options[i] = _(pause_options[i]);
@@ -4885,9 +4890,9 @@
  
  	i18n_config_flag = 1;
      }
---- mc-4.6.1a/src/filegui.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.1a/src/filegui.c	2005-06-06 14:46:19.196248048 +0200
-@@ -65,6 +65,7 @@
+--- mc-4.6.1-pre5/src/filegui.c.utf8	2005-05-27 16:19:18.000000000 +0200
++++ mc-4.6.1-pre5/src/filegui.c	2005-07-08 11:22:41.928083144 +0200
+@@ -69,6 +69,7 @@
  #include "filegui.h"
  #include "key.h"		/* get_event */
  #include "util.h"               /* strip_password() */
@@ -4895,7 +4900,7 @@
  
  /* }}} */
  
-@@ -563,8 +564,8 @@ init_replace (FileOpContext *ctx, enum O
+@@ -564,8 +565,8 @@ init_replace (FileOpContext *ctx, enum O
  	 * longest of "Overwrite..." labels 
  	 * (assume "Target date..." are short enough)
  	 */
@@ -4906,7 +4911,7 @@
  
  	/* longest of button rows */
  	i = sizeof (rd_widgets) / sizeof (rd_widgets[0]);
-@@ -575,7 +576,7 @@ init_replace (FileOpContext *ctx, enum O
+@@ -576,7 +577,7 @@ init_replace (FileOpContext *ctx, enum O
  		    l2 = max (l2, l);
  		    l = 0;
  		}
@@ -4915,7 +4920,7 @@
  	    }
  	}
  	l2 = max (l2, l);	/* last row */
-@@ -593,12 +594,12 @@ init_replace (FileOpContext *ctx, enum O
+@@ -594,12 +595,12 @@ init_replace (FileOpContext *ctx, enum O
  		    l = l1;
  		}
  		rd_widgets[i].xpos = l;
@@ -4930,7 +4935,7 @@
      }
  #endif				/* ENABLE_NLS */
  
-@@ -617,7 +618,7 @@ init_replace (FileOpContext *ctx, enum O
+@@ -618,7 +619,7 @@ init_replace (FileOpContext *ctx, enum O
  
      ADD_RD_LABEL (ui, 0,
  		  name_trunc (ui->replace_filename,
@@ -4939,7 +4944,7 @@
      ADD_RD_BUTTON (1);
  
      ADD_RD_BUTTON (2);
-@@ -804,36 +805,36 @@ fmd_init_i18n (int force)
+@@ -805,36 +806,36 @@ fmd_init_i18n (int force)
  	if (fmd_widgets[i].text[0] != '\0')
  	    fmd_widgets[i].text = _(fmd_widgets[i].text);
  
@@ -4986,7 +4991,7 @@
  
      chkbox_xpos (FMCB0);
      chkbox_xpos (FMCB21);
-@@ -855,7 +856,7 @@ fmd_init_i18n (int force)
+@@ -856,7 +857,7 @@ fmd_init_i18n (int force)
  
  char *
  file_mask_dialog (FileOpContext *ctx, FileOperation operation, const char *text,
@@ -4995,7 +5000,7 @@
  {
      int source_easy_patterns = easy_patterns;
      char *source_mask, *orig_mask, *dest_dir, *tmpdest;
-@@ -864,12 +865,20 @@ file_mask_dialog (FileOpContext *ctx, Fi
+@@ -865,12 +866,20 @@ file_mask_dialog (FileOpContext *ctx, Fi
      struct stat buf;
      int val;
      QuickDialog Quick_input;
@@ -5017,7 +5022,7 @@
      fmd_init_i18n (FALSE);
  
      /* Set up the result pointers */
-@@ -928,6 +937,7 @@ file_mask_dialog (FileOpContext *ctx, Fi
+@@ -929,6 +938,7 @@ file_mask_dialog (FileOpContext *ctx, Fi
      orig_mask = source_mask;
      if (!dest_dir || !*dest_dir) {
  	g_free (source_mask);
@@ -5025,15 +5030,15 @@
  	return dest_dir;
      }
      if (source_easy_patterns) {
-@@ -981,5 +991,6 @@ file_mask_dialog (FileOpContext *ctx, Fi
+@@ -982,5 +992,6 @@ file_mask_dialog (FileOpContext *ctx, Fi
      }
      if (val == B_USER)
  	*do_background = 1;
 +    g_free(def_text);
      return dest_dir;
  }
---- mc-4.6.1a/acinclude.m4.utf8	2005-05-11 23:56:57.000000000 +0200
-+++ mc-4.6.1a/acinclude.m4	2005-06-06 14:46:19.197247896 +0200
+--- mc-4.6.1-pre5/acinclude.m4.utf8	2005-05-11 20:53:22.000000000 +0200
++++ mc-4.6.1-pre5/acinclude.m4	2005-07-08 11:22:41.929082992 +0200
 @@ -769,14 +769,14 @@ AC_DEFUN([MC_WITH_SLANG], [
      fi
  


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-4/mc.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- mc.spec	16 Jun 2005 13:06:51 -0000	1.56
+++ mc.spec	11 Aug 2005 08:34:03 -0000	1.57
@@ -1,13 +1,11 @@
 Summary:	User-friendly text console file manager and visual shell.
 Name:		mc
 Version:	4.6.1a
-Release:	0.10.FC4
+Release:	0.11.FC4
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
-#Source0:	http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-%{version}.tar.gz
-%define date 20050606
-Source0:	mc-%{version}-%{date}.tar.bz2
+Source0:	http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-4.6.1.tar.bz2
 URL:		http://www.ibiblio.org/mc/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	gpm-devel, slang-devel, glib2-devel
@@ -21,6 +19,7 @@
 Patch4:		mc-fish-upload.patch
 Patch5:		mc-userhost.patch
 Patch6:		mc-64bit.patch
+Patch7:		mc-gcc4.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -30,7 +29,7 @@
 poke into RPMs for specific files.
 
 %prep
-%setup -q -n mc-%{version}
+%setup -q -n mc-4.6.1
 
 %patch0 -p1 -b .utf8
 %patch1 -p1 -b .extensions
@@ -39,6 +38,7 @@
 %patch4 -p1 -b .fish-upload
 %patch5 -p1 -b .userhost
 %patch6 -p1 -b .64bit
+%patch7 -p1 -b .gcc4
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -100,7 +100,7 @@
 popd
 
 %build
-export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-pointer-sign"
+export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
 %configure --with-screen=slang \
 	     --host=%{_host} --build=%{_build} \
 	     --target=%{_target_platform} \
@@ -173,7 +173,12 @@
 %dir %{_datadir}/mc
 
 %changelog
-* Thu Jun 16 2005 Jindrich Novy <jnovy redhat com> 4.6.11-0.10.FC4
+* Thu Aug 11 2005 Jindrich Novy <jnovy redhat com> 4.6.1a-0.11.FC4
+- update to the new mc release - 4.6.1
+- sync extensions, utf8, userhost patch
+- fix several gcc4 signedness warnings
+
+* Thu Jun 16 2005 Jindrich Novy <jnovy redhat com> 4.6.1a-0.10.FC4
 - update to more recent mc version to fix problems with dislaying
   sizes of files larger than 2GB (#160295)
 - drop spaceprompt patch - applied in newer version
@@ -187,7 +192,7 @@
 
 * Mon Apr 04 2005 Jindrich Novy <jnovy redhat com> 4.6.1a-0.8
 - fix truncation to lower 32bits in statfs (src/mountlist.c)
-
+    
 * Thu Mar 24 2005 Jindrich Novy <jnovy redhat com> 4.6.1a-0.7
 - update from CVS
 - sync with .utf8 patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-4/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	16 Jun 2005 13:02:36 -0000	1.22
+++ sources	11 Aug 2005 08:34:03 -0000	1.23
@@ -1 +1 @@
-4d84248d7aa985aee2ecaf89e1b779cc  mc-4.6.1a-20050606.tar.bz2
+4976127bc1bf45219beae8535539804f  mc-4.6.1.tar.bz2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]