rpms/mc/devel mc-gcc4.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 mc-extensions.patch, 1.1, 1.2 mc-utf8.patch, 1.8, 1.9 mc.spec, 1.57, 1.58 sources, 1.23, 1.24
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 25 11:07:21 UTC 2005
Author: jnovy
Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15163
Modified Files:
.cvsignore mc-extensions.patch mc-utf8.patch mc.spec sources
Added Files:
mc-gcc4.patch
Log Message:
- new mc release 4.6.1
- sync extensions 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 */
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 8 Jul 2005 09:56:28 -0000 1.21
+++ .cvsignore 25 Jul 2005 11:07:17 -0000 1.22
@@ -13,3 +13,4 @@
mc-4.6.1a-20050504.tar.bz2
mc-4.6.1a-20050606.tar.bz2
mc-4.6.1-pre5.tar.bz2
+mc-4.6.1.tar.bz2
mc-extensions.patch:
mc.ext.in | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
Index: mc-extensions.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/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 25 Jul 2005 11:07:17 -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-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(-)
Index: mc-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-utf8.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mc-utf8.patch 8 Jul 2005 09:56:28 -0000 1.8
+++ mc-utf8.patch 25 Jul 2005 11:07:17 -0000 1.9
@@ -4441,7 +4441,7 @@
int is_password; /* Is this a password input line? */
unsigned char *buffer; /* pointer to editing buffer */
+#ifdef UTF8
-+ unsigned char charbuf[MB_LEN_MAX];
++ char charbuf[MB_LEN_MAX];
+#endif /* UTF8 */
+ int charpoint;
GList *history; /* The history */
Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mc.spec 8 Jul 2005 09:56:28 -0000 1.57
+++ mc.spec 25 Jul 2005 11:07:17 -0000 1.58
@@ -1,11 +1,11 @@
Summary: User-friendly text console file manager and visual shell.
Name: mc
Version: 4.6.1a
-Release: 0.11
+Release: 0.12
Epoch: 1
License: GPL
Group: System Environment/Shells
-Source0: http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-4.6.1-pre5.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
@@ -19,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
@@ -28,7 +29,7 @@
poke into RPMs for specific files.
%prep
-%setup -q -n %{name}-4.6.1-pre5
+%setup -q -n %{name}-4.6.1
%patch0 -p1 -b .utf8
%patch1 -p1 -b .extensions
@@ -37,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
@@ -171,6 +173,11 @@
%dir %{_datadir}/mc
%changelog
+* Mon Jul 25 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.12
+- new mc release 4.6.1
+- sync extensions patch
+- fix several gcc4 signedness warnings
+
* Fri Jul 08 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.11
- update to mc-4.6.1-pre5
- sync .utf8, .userhost patch
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 8 Jul 2005 09:56:28 -0000 1.23
+++ sources 25 Jul 2005 11:07:17 -0000 1.24
@@ -1 +1 @@
-68f51b904790111faf784a845e4fca59 mc-4.6.1-pre5.tar.bz2
+4976127bc1bf45219beae8535539804f mc-4.6.1.tar.bz2
More information about the fedora-cvs-commits
mailing list