Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55816707945a5c5a9dd826d4a5c484265b0cce2d
commit 55816707945a5c5a9dd826d4a5c484265b0cce2d
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sun Dec 27 20:02:24 2009 +0100
mc-4.7.0-1-i686
- version bump
- dropped several no longer relevant patches (they were hacks and the
proper fix is now in upstream)
- added a quick fix to keep alt-o do what it used to till now
diff --git a/source/apps/mc/00-mc-4.6.1-fpm.patch
b/source/apps/mc/00-mc-4.6.1-fpm.patch
index a7798c0..3b9149c 100644
--- a/source/apps/mc/00-mc-4.6.1-fpm.patch
+++ b/source/apps/mc/00-mc-4.6.1-fpm.patch
@@ -1,6 +1,6 @@
-diff -urN mc-4.6.1.orig/lib/mc.ext.in mc-4.6.1/lib/mc.ext.in
---- mc-4.6.1.orig/lib/mc.ext.in 2005-07-23 18:51:15.000000000 +0200
-+++ mc-4.6.1/lib/mc.ext.in 2006-05-11 16:41:25.000000000 +0200
+diff -urN mc-4.6.1.orig/misc/mc.ext.in mc-4.6.1/misc/mc.ext.in
+--- mc-4.6.1.orig/misc/mc.ext.in 2005-07-23 18:51:15.000000000 +0200
++++ mc-4.6.1/misc/mc.ext.in 2006-05-11 16:41:25.000000000 +0200
@@ -119,6 +119,10 @@
Open=%cd %p#utar
View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
diff --git a/source/apps/mc/01-mc-4.6.1-uglydir.patch.gz
b/source/apps/mc/01-mc-4.6.1-uglydir.patch.gz
deleted file mode 100644
index 3a1ec8c..0000000
Binary files a/source/apps/mc/01-mc-4.6.1-uglydir.patch.gz and /dev/null differ
diff --git a/source/apps/mc/03-mc-4.6.1-xterm-title.patch
b/source/apps/mc/03-mc-4.6.1-xterm-title.patch
deleted file mode 100644
index 6effce5..0000000
--- a/source/apps/mc/03-mc-4.6.1-xterm-title.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur mc-4.6.1.orig/src/main.c mc-4.6.1/src/main.c
---- mc-4.6.1.orig/src/main.c 2005-07-28 12:12:27.000000000 +0200
-+++ mc-4.6.1/src/main.c 2005-07-28 12:18:44.000000000 +0200
-@@ -1604,7 +1604,7 @@
- void
- update_xterm_title_path (void)
- {
-- unsigned char *p, *s;
-+ unsigned char *p, *s, *tmp;
-
- if (xterm_flag && xterm_title) {
- p = s = g_strdup (strip_home_and_password (current_panel->cwd));
-@@ -1612,8 +1612,15 @@
- if (!is_printable (*s))
- *s = '?';
- } while (*++s);
-+#ifdef HAVE_SLANG
-+ SLtt_set_alt_char_set (0);
-+ tmp = g_strdup_printf("\33]0;mc - %s\7", p);
-+ SLtt_write_string(tmp);
-+ g_free(tmp);
-+#else
- fprintf (stdout, "\33]0;mc - %s\7", p);
- fflush (stdout);
-+#endif
- g_free (p);
- }
- }
diff --git a/source/apps/mc/04-mc-4.6.1-promptfix.patch.gz
b/source/apps/mc/04-mc-4.6.1-promptfix.patch.gz
deleted file mode 100644
index a54a566..0000000
Binary files a/source/apps/mc/04-mc-4.6.1-promptfix.patch.gz and /dev/null
differ
diff --git a/source/apps/mc/05-mc-4.6.1-use-system-popt.patch.gz
b/source/apps/mc/05-mc-4.6.1-use-system-popt.patch.gz
deleted file mode 100644
index 1e4402d..0000000
Binary files a/source/apps/mc/05-mc-4.6.1-use-system-popt.patch.gz and
/dev/null differ
diff --git a/source/apps/mc/07-uhu-pkg-add.patch
b/source/apps/mc/07-uhu-pkg-add.patch
index e3e1560..339a51b 100644
--- a/source/apps/mc/07-uhu-pkg-add.patch
+++ b/source/apps/mc/07-uhu-pkg-add.patch
@@ -1,6 +1,6 @@
-diff -Naur mc-4.6.1.orig/lib/mc.ext.in mc-4.6.1/lib/mc.ext.in
---- mc-4.6.1.orig/lib/mc.ext.in 2005-11-27 00:24:39.985297500 +0100
-+++ mc-4.6.1/lib/mc.ext.in 2005-11-27 00:26:34.552457500 +0100
+diff -Naur mc-4.6.1.orig/misc/mc.ext.in mc-4.6.1/misc/mc.ext.in
+--- mc-4.6.1.orig/misc/mc.ext.in 2005-11-27 00:24:39.985297500 +0100
++++ mc-4.6.1/misc/mc.ext.in 2005-11-27 00:26:34.552457500 +0100
@@ -196,6 +196,11 @@
Open=%cd %p#deb
View=%view{ascii} dpkg-deb -c %f
diff --git a/source/apps/mc/08-mc-64bit.patch b/source/apps/mc/08-mc-64bit.patch
deleted file mode 100644
index 12356e9..0000000
--- a/source/apps/mc/08-mc-64bit.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- mc-4.6.1a/src/mountlist.c.64bit 2005-02-08 23:33:52.000000000 +0100
-+++ mc-4.6.1a/src/mountlist.c 2005-05-10 17:09:24.122853504 +0200
-@@ -131,11 +131,19 @@ struct mount_entry
-
- struct fs_usage
- {
-+#ifndef HAVE_SYS_STATVFS_H
- long fsu_blocks; /* Total blocks. */
- long fsu_bfree; /* Free blocks available to superuser. */
- long fsu_bavail; /* Free blocks available to non-superuser. */
- long fsu_files; /* Total file nodes. */
- long fsu_ffree; /* Free file nodes. */
-+#else /* We have sys/statvfs.h, use proper data types when
_FILE_OFFSET_BITS=64 */
-+ fsblkcnt_t fsu_blocks;
-+ fsblkcnt_t fsu_bfree;
-+ fsblkcnt_t fsu_bavail;
-+ fsblkcnt_t fsu_files;
-+ fsblkcnt_t fsu_ffree;
-+#endif /* HAVE_SYS_STATVFS_H */
- };
-
- static int get_fs_usage (char *path, struct fs_usage *fsp);
-@@ -665,6 +673,7 @@ my_statfs (struct my_statfs *myfs_stats,
- BLOCKS FROMSIZE-byte blocks, rounding away from zero.
- TOSIZE must be positive. Return -1 if FROMSIZE is not positive. */
-
-+#if !defined(HAVE_SYS_STATFS_H) || !defined(STAT_STATVFS)
- static long
- fs_adjust_blocks (long blocks, int fromsize, int tosize)
- {
-@@ -672,13 +681,21 @@ fs_adjust_blocks (long blocks, int froms
- abort ();
- if (fromsize <= 0)
- return -1;
--
-+#else
-+static fsblkcnt_t
-+fs_adjust_blocks (fsblkcnt_t blocks, unsigned long fromsize, unsigned long
tosize)
-+{
-+ if (!tosize)
-+ abort ();
-+ if (!fromsize)
-+ return -1;
-+#endif
- if (fromsize == tosize) /* E.g., from 512 to 512. */
- return blocks;
- else if (fromsize > tosize) /* E.g., from 2048 to 512. */
- return blocks * (fromsize / tosize);
- else /* E.g., from 256 to 512. */
-- return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize);
-+ return (blocks + 1) / (tosize / fromsize);
- }
-
- #if defined(_AIX) && defined(_I386)
diff --git a/source/apps/mc/09-mc-assembly.patch
b/source/apps/mc/09-mc-assembly.patch
deleted file mode 100644
index 37d480c..0000000
--- a/source/apps/mc/09-mc-assembly.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- mc-2006-08-12-18/syntax/assembler.syntax.x86_64 2005-09-06
22:36:24.000000000 +0200
-+++ mc-2006-08-12-18/syntax/assembler.syntax 2006-08-23 12:43:34.000000000
+0200
-@@ -248,6 +248,58 @@
- keyword whole TR0 magenta
- keyword whole TR1 magenta
-
-+# Generic AMD64 registers set
-+ keyword whole rax brightmagenta
-+ keyword whole rbx brightmagenta
-+ keyword whole rcx brightmagenta
-+ keyword whole rdx brightmagenta
-+ keyword whole rsi brightmagenta
-+ keyword whole rdi brightmagenta
-+ keyword whole rbp brightmagenta
-+ keyword whole rsp brightmagenta
-+ keyword whole r8 brightmagenta
-+ keyword whole r9 brightmagenta
-+ keyword whole r10 brightmagenta
-+ keyword whole r11 brightmagenta
-+ keyword whole r12 brightmagenta
-+ keyword whole r13 brightmagenta
-+ keyword whole r14 brightmagenta
-+ keyword whole r15 brightmagenta
-+
-+ keyword whole %rax brightmagenta
-+ keyword whole %rbx brightmagenta
-+ keyword whole %rcx brightmagenta
-+ keyword whole %rdx brightmagenta
-+ keyword whole %rsi brightmagenta
-+ keyword whole %rdi brightmagenta
-+ keyword whole %rbp brightmagenta
-+ keyword whole %rsp brightmagenta
-+ keyword whole %r8 brightmagenta
-+ keyword whole %r9 brightmagenta
-+ keyword whole %r10 brightmagenta
-+ keyword whole %r11 brightmagenta
-+ keyword whole %r12 brightmagenta
-+ keyword whole %r13 brightmagenta
-+ keyword whole %r14 brightmagenta
-+ keyword whole %r15 brightmagenta
-+
-+ keyword whole RAX brightmagenta
-+ keyword whole RBX brightmagenta
-+ keyword whole RCX brightmagenta
-+ keyword whole RDX brightmagenta
-+ keyword whole RSI brightmagenta
-+ keyword whole RDI brightmagenta
-+ keyword whole RBP brightmagenta
-+ keyword whole RSP brightmagenta
-+ keyword whole R8 brightmagenta
-+ keyword whole R9 brightmagenta
-+ keyword whole R10 brightmagenta
-+ keyword whole R11 brightmagenta
-+ keyword whole R12 brightmagenta
-+ keyword whole R13 brightmagenta
-+ keyword whole R14 brightmagenta
-+ keyword whole R15 brightmagenta
-+
- # FPU registers set
- keyword whole st0 brightcyan
- keyword whole st1 brightcyan
diff --git a/source/apps/mc/11-case-sensitive-find-fix-4.6.1.patch
b/source/apps/mc/11-case-sensitive-find-fix-4.6.1.patch
deleted file mode 100644
index e776e7a..0000000
--- a/source/apps/mc/11-case-sensitive-find-fix-4.6.1.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-Description: Fixes case-sensitive bug in find dialog
-Status to upstream: Submitted - https://savannah.gnu.org/bugs/index.php?18977
-Source URL and bug desc.: http://www.freebsd.org/cgi/query-pr.cgi?pr=99428
-
-diff -Naur mc-4.6.1.orig/src/cmd.c mc-4.6.1/src/cmd.c
---- mc-4.6.1.orig/src/cmd.c 2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/cmd.c 2007-02-06 21:13:40.000000000 +0100
-@@ -510,7 +510,7 @@
- continue;
- }
- c = regexp_match (reg_exp_t, current_panel->dir.list[i].fname,
-- match_file);
-+ match_file, 0);
- if (c == -1) {
- message (1, MSG_ERROR, _(" Malformed regular expression "));
- g_free (reg_exp);
-diff -Naur mc-4.6.1.orig/src/dir.c mc-4.6.1/src/dir.c
---- mc-4.6.1.orig/src/dir.c 2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/dir.c 2007-02-06 21:13:40.000000000 +0100
-@@ -405,7 +405,7 @@
- *stale_link = 1;
- }
- if (!(S_ISDIR (buf1->st_mode) || *link_to_dir) && filter
-- && !regexp_match (filter, dp->d_name, match_file))
-+ && !regexp_match (filter, dp->d_name, match_file, 0))
- return 0;
-
- /* Need to grow the *list? */
-diff -Naur mc-4.6.1.orig/src/ext.c mc-4.6.1/src/ext.c
---- mc-4.6.1.orig/src/ext.c 2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/ext.c 2007-02-06 21:13:40.000000000 +0100
-@@ -394,7 +394,7 @@
- }
-
- if (content_string[0]
-- && regexp_match (ptr, content_string + content_shift, match_regex)) {
-+ && regexp_match (ptr, content_string + content_shift, match_regex, 0)) {
- found = 1;
- }
-
-@@ -534,11 +534,11 @@
- /* Do not transform shell patterns, you can use shell/ for
- * that
- */
-- if (regexp_match (p, filename, match_regex))
-+ if (regexp_match (p, filename, match_regex, 0))
- found = 1;
- } else if (!strncmp (p, "directory/", 10)) {
- if (S_ISDIR (mystat.st_mode)
-- && regexp_match (p + 10, filename, match_regex))
-+ && regexp_match (p + 10, filename, match_regex, 0))
- found = 1;
- } else if (!strncmp (p, "shell/", 6)) {
- p += 6;
-diff -Naur mc-4.6.1.orig/src/find.c mc-4.6.1/src/find.c
---- mc-4.6.1.orig/src/find.c 2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/find.c 2007-02-06 21:13:40.000000000 +0100
-@@ -575,6 +575,7 @@
- struct stat tmp_stat;
- static int pos;
- static int subdirs_left = 0;
-+ int cflags = 0;
-
- if (!h) { /* someone forces me to close dirp */
- if (dirp) {
-@@ -586,6 +587,9 @@
- dp = 0;
- return 1;
- }
-+
-+ if (case_sensitive == 0)
-+ cflags |= REG_ICASE;
- do_search_begin:
- while (!dp){
-
-@@ -662,7 +666,7 @@
- g_free (tmp_name);
- }
-
-- if (regexp_match (find_pattern, dp->d_name, match_file)){
-+ if (regexp_match (find_pattern, dp->d_name, match_file, cflags)){
- if (content_pattern) {
- if (search_content (h, directory, dp->d_name)) {
- return 1;
-diff -Naur mc-4.6.1.orig/src/subshell.c mc-4.6.1/src/subshell.c
---- mc-4.6.1.orig/src/subshell.c 2005-06-07 11:19:19.000000000 +0200
-+++ mc-4.6.1/src/subshell.c 2007-02-06 21:13:40.000000000 +0100
-@@ -371,6 +371,8 @@
- subshell_type = ZSH;
- else if (strstr (shell, "/tcsh"))
- subshell_type = TCSH;
-+ else if (strstr (shell, "/csh"))
-+ subshell_type = TCSH;
- else if (strstr (shell, "/bash") || getenv ("BASH"))
- subshell_type = BASH;
- else {
-diff -Naur mc-4.6.1.orig/src/user.c mc-4.6.1/src/user.c
---- mc-4.6.1.orig/src/user.c 2005-07-01 17:47:07.000000000 +0200
-+++ mc-4.6.1/src/user.c 2007-02-06 21:13:40.000000000 +0100
-@@ -412,18 +412,18 @@
- break;
- case 'f': /* file name pattern */
- p = extract_arg (p, arg, sizeof (arg));
-- *condition = panel && regexp_match (arg, panel->dir.list
[panel->selected].fname, match_file);
-+ *condition = panel && regexp_match (arg, panel->dir.list
[panel->selected].fname, match_file, 0);
- break;
- case 'y': /* syntax pattern */
- if (edit_widget && edit_widget->syntax_type) {
- p = extract_arg (p, arg, sizeof (arg));
- *condition = panel &&
-- regexp_match (arg, edit_widget->syntax_type,
match_normal);
-+ regexp_match (arg, edit_widget->syntax_type,
match_normal, 0);
- }
- break;
- case 'd':
- p = extract_arg (p, arg, sizeof (arg));
-- *condition = panel && regexp_match (arg, panel->cwd, match_file);
-+ *condition = panel && regexp_match (arg, panel->cwd, match_file, 0);
- break;
- case 't':
- p = extract_arg (p, arg, sizeof (arg));
-diff -Naur mc-4.6.1.orig/src/util.c mc-4.6.1/src/util.c
---- mc-4.6.1.orig/src/util.c 2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/util.c 2007-02-06 21:13:40.000000000 +0100
-@@ -563,25 +563,28 @@
- return g_strdup (pattern);
- }
-
--int regexp_match (const char *pattern, const char *string, int match_type)
-+int regexp_match (const char *pattern, const char *string, int match_type,
int cflags)
- {
- static regex_t r;
- static char *old_pattern = NULL;
- static int old_type;
-+ static int old_cflags;
- int rval;
- char *my_pattern;
-
-- if (!old_pattern || STRCOMP (old_pattern, pattern) || old_type !=
match_type){
-+ if (!old_pattern || STRCOMP (old_pattern, pattern) ||
-+ old_type != match_type || cflags != old_cflags){
- if (old_pattern){
- regfree (&r);
- g_free (old_pattern);
- old_pattern = NULL;
- }
- my_pattern = convert_pattern (pattern, match_type, 0);
-- if (regcomp (&r, my_pattern, REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS)) {
-+ if (regcomp (&r, my_pattern,
REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS|cflags)) {
- g_free (my_pattern);
- return -1;
- }
-+ old_cflags = cflags;
- old_pattern = my_pattern;
- old_type = match_type;
- }
-diff -Naur mc-4.6.1.orig/src/util.h mc-4.6.1/src/util.h
---- mc-4.6.1.orig/src/util.h 2005-01-13 20:20:47.000000000 +0100
-+++ mc-4.6.1/src/util.h 2007-02-06 21:13:40.000000000 +0100
-@@ -116,7 +116,7 @@
-
- extern int easy_patterns;
- char *convert_pattern (const char *pattern, int match_type, int do_group);
--int regexp_match (const char *pattern, const char *string, int match_type);
-+int regexp_match (const char *pattern, const char *string, int match_type,
int cflags);
-
- /* Error pipes */
- void open_error_pipe (void);
diff --git a/source/apps/mc/FrugalBuild b/source/apps/mc/FrugalBuild
index 4733b74..0614749 100644
--- a/source/apps/mc/FrugalBuild
+++ b/source/apps/mc/FrugalBuild
@@ -3,25 +3,33 @@
# Contributor: VMiklos <vmik...@frugalware.org>
pkgname=mc
-pkgver=4.6.1
-pkgrel=8
+pkgver=4.7.0
+pkgrel=1
pkgdesc="The GNU Midnight Commander is a CLI-based file manager"
-url="http://www.ibiblio.org/pub/Linux/utils/file/managers/mc";
-depends=('e2fsprogs' 'glib2' 'popt')
+url="http://www.midnight-commander.org/";
+depends=('glib2' 'slang')
makedepends=('cvs')
backup=(usr/share/mc/{cedit.menu,edit.indent.rc,edit.spell.rc,mc.ext,mc.lib})
groups=('apps')
archs=('i686' 'x86_64' 'ppc')
-up2date="lynx -dump $url/|grep mc-[0-9.\]*\.tar.gz$|tail -n 1|sed -n
's/.*-\(.*\)\.t.*/\1/;1 p'"
-source=($url/$pkgname-$pkgver.tar.gz \
- 00-mc-4.6.1-fpm.patch 01-mc-4.6.1-uglydir.patch.gz \
- 02-mc-4.6.1-sambaconfpath.patch 03-mc-4.6.1-xterm-title.patch \
- 04-mc-4.6.1-promptfix.patch.gz 05-mc-4.6.1-use-system-popt.patch.gz \
+up2date="lynx -dump $url/downloads|grep tar.gz|sed -n 's/.*-\(.*\)\.t.*/\1/;$
p'"
+source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2
\
+ 00-mc-4.6.1-fpm.patch \
+ 02-mc-4.6.1-sambaconfpath.patch \
06-mc-4.6.1-frugalbuild-syntax.patch 07-uhu-pkg-add.patch \
- 08-mc-64bit.patch 09-mc-assembly.patch 10-mc-delcheck.patch \
- 11-case-sensitive-find-fix-4.6.1.patch mc-4.6.1-nonblock.patch \
- mc-4.6.1-largefile.patch mc-workaround-for-bash32.patch \
- mc-wrapper.sh-rewrite)
+ 10-mc-delcheck.patch \
+ mc-4.6.1-nonblock.patch \
+ mc-wrapper.sh-rewrite \
+ alt-o.patch)
+sha1sums=('027aab31da46d3aee6f06e2896b6c37113201ec6' \
+ 'eac9466e50e90d5c3cdf8f24caf9640133bd0503' \
+ '87c4eaa1769c7ca1bebb76d97dbb7280dca3f10a' \
+ '5df4c80dcc64e66659bb1ed6f1ff4438c60a1b66' \
+ 'e1beaef46208e7fbf3779f2ba5ce16f876250722' \
+ 'f89fe79cff655ee48274a0a90d24663789c5775f' \
+ '34b3e6d4807c9e055dbafeede0ed3aa74efe7224' \
+ '4e914dd2c23f4b2a17d61b907956f0ef3717b9aa' \
+ 'b328adc83dee38a7f14223a7e762d535495a586d')
build() {
Fcd $pkgname-$pkgver
@@ -32,24 +40,7 @@ build() {
cat $Fsrcdir/$pkgname-wrapper.sh-rewrite >
$Fsrcdir/$pkgname-$pkgver/lib/mc-wrapper.sh
Fmakeinstall
# Need this to work ctrl+o and subshell propeply from user
- chmod u+s $Fdestdir/usr/lib/mc/cons.saver || Fdie
+ chmod u+s $Fdestdir/usr/libexec/mc/cons.saver || Fdie
}
-sha1sums=('92be0802143245e0fb7e3847d70da614cad7d5fb'\
- 'a461d7128a3063849f35713b3bbb30b0711c7ebb'\
- '12e2d26556c98110f519a8c28a71b4ef11456cef'\
- '87c4eaa1769c7ca1bebb76d97dbb7280dca3f10a'\
- '3ef69dd522b277462aa6027b4b4b63fdd662190c'\
- '9ad0d087f3a824616bd5d19f44a3ae9f301892e3'\
- '3789af0a891053ab17792a7b0f465a58ab833aa9'\
- '5df4c80dcc64e66659bb1ed6f1ff4438c60a1b66'\
- '59fd3c0551ca2bbb9c599ac05beded4114ed242a'\
- '34a049f4bc2cab7555b695b9b1a4f2fd2b121f50'\
- 'f5d703f0b9cba8597c06187e2c2d2ec89dac3325'\
- 'f89fe79cff655ee48274a0a90d24663789c5775f'\
- 'c0f242cc0dd179df8739f85a53c8a6aa79370d61'\
- '34b3e6d4807c9e055dbafeede0ed3aa74efe7224'\
- '1bbe8c7d614aae3ed8225237b0ac2fdc6bc4ca64'\
- '6c6256cad3fe32b92072453fd978444748fc8187'\
- '4e914dd2c23f4b2a17d61b907956f0ef3717b9aa')
# optimization OK
diff --git a/source/apps/mc/alt-o.patch b/source/apps/mc/alt-o.patch
new file mode 100644
index 0000000..16210b1
--- /dev/null
+++ b/source/apps/mc/alt-o.patch
@@ -0,0 +1,28 @@
+This is a quick hack for the following problem:
+
+What alt-o used to do is now done by alt-i. This may be problematic for
+upgraders, so just swap the two options. A better way to handle the
+problem would be to introduce an option for that.
+
+diff --git a/src/screen.c b/src/screen.c
+index 6cac7b0..1e93c85 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -2639,7 +2639,7 @@ panel_execute_cmd (WPanel *panel, unsigned long command)
+
+ switch (command) {
+ case CK_PanelChdirOtherPanel:
+- chdir_other_panel (panel);
++ sync_other_panel (panel);
+ break;
+ case CK_PanelChdirToReadlink:
+ chdir_to_readlink (panel);
+@@ -2729,7 +2729,7 @@ panel_execute_cmd (WPanel *panel, unsigned long command)
+ start_search (panel);
+ break;
+ case CK_PanelSyncOtherPanel:
+- sync_other_panel (panel);
++ chdir_other_panel (panel);
+ break;
+ case CK_PanelSelectSortOrder:
+ panel_select_sort_order(panel);
diff --git a/source/apps/mc/mc-4.6.1-largefile.patch
b/source/apps/mc/mc-4.6.1-largefile.patch
deleted file mode 100644
index de30715..0000000
--- a/source/apps/mc/mc-4.6.1-largefile.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -Naur mc-4.6.1.orig/intl/loadmsgcat.c mc-4.6.1/intl/loadmsgcat.c
---- mc-4.6.1.orig/intl/loadmsgcat.c 2005-07-23 18:52:57.000000000 +0200
-+++ mc-4.6.1/intl/loadmsgcat.c 2006-03-19 17:11:14.000000000 +0100
-@@ -1002,7 +1002,7 @@
- /* The magic number is wrong: not a message catalog file. */
- #ifdef HAVE_MMAP
- if (use_mmap)
-- munmap ((caddr_t) data, size);
-+ munmap ((void *) data, size);
- else
- #endif
- free (data);
-@@ -1271,7 +1271,7 @@
- free (domain->malloced);
- #ifdef HAVE_MMAP
- if (use_mmap)
-- munmap ((caddr_t) data, size);
-+ munmap ((void *) data, size);
- else
- #endif
- free (data);
-@@ -1306,7 +1306,7 @@
-
- # ifdef _POSIX_MAPPED_FILES
- if (domain->use_mmap)
-- munmap ((caddr_t) domain->data, domain->mmap_size);
-+ munmap ((void *) domain->data, domain->mmap_size);
- else
- # endif /* _POSIX_MAPPED_FILES */
- free ((void *) domain->data);
-diff -Naur mc-4.6.1.orig/src/view.c mc-4.6.1/src/view.c
---- mc-4.6.1.orig/src/view.c 2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/view.c 2006-03-19 17:10:34.000000000 +0100
-@@ -76,6 +76,12 @@
- #define vwidth (view->widget.cols - (view->have_frame ? 2 : 0))
- #define vheight (view->widget.lines - (view->have_frame ? 2 : 0))
-
-+#if GLIB_MAJOR_VERSION >= 2
-+# define my_g_malloc g_try_malloc
-+#else
-+# define my_g_malloc g_malloc
-+#endif
-+
- /* Offset in bytes into a file */
- typedef unsigned long offset_type;
- #define INVALID_OFFSET ((offset_type) -1)
-@@ -560,8 +566,8 @@
- view->data = mc_mmap (0, view->s.st_size, PROT_READ,
- MAP_FILE | MAP_SHARED, view->file, 0);
- else
-- view->data = (caddr_t) -1;
-- if ((caddr_t) view->data != (caddr_t) - 1) {
-+ view->data = (void *) -1;
-+ if (view->data != (void *)-1) {
- /* mmap worked */
- view->first = 0;
- view->bytes_read = view->s.st_size;
-@@ -573,6 +579,9 @@
- /* For the OSes that don't provide mmap call, try to load all the
- * file into memory (a...@bcs.zaporizhzhe.ua). Also, mmap can fail
- * for any reason, so we use this as fallback (pa...@ucw.cz) */
-+
-+ /* If large file support is enabled, st_size is a 64 bit value and
-+ * will thus on 32 bit platforms possibly be beyond the range of gulong */
-
- /* Make sure view->s.st_size is not truncated when passed to g_malloc */
- if ((gulong) view->s.st_size == view->s.st_size)
-diff -Naur mc-4.6.1.orig/vfs/local.c mc-4.6.1/vfs/local.c
---- mc-4.6.1.orig/vfs/local.c 2004-09-25 01:00:18.000000000 +0200
-+++ mc-4.6.1/vfs/local.c 2006-03-19 17:00:45.000000000 +0100
-@@ -243,8 +243,8 @@
- }
-
- #ifdef HAVE_MMAP
--caddr_t
--local_mmap (struct vfs_class *me, caddr_t addr, size_t len, int prot, int
flags, void *data, off_t offset)
-+void *
-+local_mmap (struct vfs_class *me, void *addr, size_t len, int prot, int
flags, void *data, off_t offset)
- {
- int fd = * (int *)data;
-
-@@ -252,7 +252,7 @@
- }
-
- int
--local_munmap (struct vfs_class *me, caddr_t addr, size_t len, void *data)
-+local_munmap (struct vfs_class *me, void *addr, size_t len, void *data)
- {
- return munmap (addr, len);
- }
-diff -Naur mc-4.6.1.orig/vfs/local.h mc-4.6.1/vfs/local.h
---- mc-4.6.1.orig/vfs/local.h 2004-08-17 11:17:43.000000000 +0200
-+++ mc-4.6.1/vfs/local.h 2006-03-19 17:01:35.000000000 +0100
-@@ -13,9 +13,9 @@
- extern int local_errno (struct vfs_class *me);
- extern int local_lseek (void *data, off_t offset, int whence);
- #ifdef HAVE_MMAP
--extern caddr_t local_mmap (struct vfs_class *me, caddr_t addr, size_t len,
-+extern void *local_mmap (struct vfs_class *me, void *addr, size_t len,
- int prot, int flags, void *data, off_t offset);
--extern int local_munmap (struct vfs_class *me, caddr_t addr, size_t len, void
*data);
-+extern int local_munmap (struct vfs_class *me, void *addr, size_t len, void
*data);
- #endif
-
- #endif
-diff -Naur mc-4.6.1.orig/vfs/samba/lib/util.c mc-4.6.1/vfs/samba/lib/util.c
---- mc-4.6.1.orig/vfs/samba/lib/util.c 2005-05-27 16:19:19.000000000 +0200
-+++ mc-4.6.1/vfs/samba/lib/util.c 2006-03-19 17:06:39.000000000 +0100
-@@ -1836,7 +1836,7 @@
-
- /* Look up the host address in the address list we just got. */
- for (i = 0; hp->h_addr_list[i]; i++) {
-- if (memcmp(hp->h_addr_list[i], (caddr_t) & addr, sizeof(addr)) == 0)
-+ if (memcmp(hp->h_addr_list[i], &addr, sizeof(addr)) == 0)
- return True;
- }
-
-diff -Naur mc-4.6.1.orig/vfs/vfs.c mc-4.6.1/vfs/vfs.c
---- mc-4.6.1.orig/vfs/vfs.c 2005-05-27 16:19:19.000000000 +0200
-+++ mc-4.6.1/vfs/vfs.c 2006-03-19 17:03:48.000000000 +0100
-@@ -740,27 +740,27 @@
-
- #ifdef HAVE_MMAP
- static struct mc_mmapping {
-- caddr_t addr;
-+ void *addr;
- void *vfs_info;
- struct vfs_class *vfs;
- struct mc_mmapping *next;
- } *mc_mmaparray = NULL;
-
--caddr_t
--mc_mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
-+void *
-+mc_mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
- {
- struct vfs_class *vfs;
-- caddr_t result;
-+ void *result;
- struct mc_mmapping *mcm;
-
- if (fd == -1)
-- return (caddr_t) -1;
-+ return (void *) -1;
-
- vfs = vfs_op (fd);
-- result = vfs->mmap ? (*vfs->mmap)(vfs, addr, len, prot, flags, vfs_info
(fd), offset) : (caddr_t)-1;
-- if (result == (caddr_t)-1){
-+ result = vfs->mmap ? (*vfs->mmap)(vfs, addr, len, prot, flags, vfs_info
(fd), offset) : (void *)-1;
-+ if (result == (void *)-1){
- errno = ferrno (vfs);
-- return (caddr_t)-1;
-+ return (void *)-1;
- }
- mcm =g_new (struct mc_mmapping, 1);
- mcm->addr = result;
-@@ -772,7 +772,7 @@
- }
-
- int
--mc_munmap (caddr_t addr, size_t len)
-+mc_munmap (void *addr, size_t len)
- {
- struct mc_mmapping *mcm, *mcm2 = NULL;
-
-diff -Naur mc-4.6.1.orig/vfs/vfs.h mc-4.6.1/vfs/vfs.h
---- mc-4.6.1.orig/vfs/vfs.h 2004-11-16 17:16:08.000000000 +0100
-+++ mc-4.6.1/vfs/vfs.h 2006-03-19 17:05:57.000000000 +0100
-@@ -49,8 +49,8 @@
- int mc_ctl (int fd, int ctlop, void *arg);
- int mc_setctl (const char *path, int ctlop, void *arg);
- #ifdef HAVE_MMAP
--caddr_t mc_mmap (caddr_t, size_t, int, int, int, off_t);
--int mc_munmap (caddr_t addr, size_t len);
-+void *mc_mmap (void *, size_t, int, int, int, off_t);
-+int mc_munmap (void *addr, size_t len);
- #endif /* HAVE_MMAP */
-
- /* Operations for mc_ctl - on open file */
-diff -Naur mc-4.6.1.orig/vfs/vfs-impl.h mc-4.6.1/vfs/vfs-impl.h
---- mc-4.6.1.orig/vfs/vfs-impl.h 2004-09-02 15:57:59.000000000 +0200
-+++ mc-4.6.1/vfs/vfs-impl.h 2006-03-19 17:12:01.000000000 +0100
-@@ -72,9 +72,9 @@
- int (*setctl) (struct vfs_class *me, const char *path, int ctlop,
- void *arg);
- #ifdef HAVE_MMAP
-- caddr_t (*mmap) (struct vfs_class *me, caddr_t addr, size_t len,
-+ void *(*mmap) (struct vfs_class *me, void *addr, size_t len,
- int prot, int flags, void *vfs_info, off_t offset);
-- int (*munmap) (struct vfs_class *me, caddr_t addr, size_t len,
-+ int (*munmap) (struct vfs_class *me, void *addr, size_t len,
- void *vfs_info);
- #endif
- };
diff --git a/source/apps/mc/mc-workaround-for-bash32.patch
b/source/apps/mc/mc-workaround-for-bash32.patch
deleted file mode 100644
index a73beb6..0000000
--- a/source/apps/mc/mc-workaround-for-bash32.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur mc-4.6.1.orig/src/subshell.c mc-4.6.1/src/subshell.c
---- mc-4.6.1.orig/src/subshell.c 2006-10-28 23:12:02.000000000 +0200
-+++ mc-4.6.1/src/subshell.c 2006-10-28 23:12:10.000000000 +0200
-@@ -718,29 +718,13 @@
- memcpy (d, cmd_start, len);
- d += len;
-
-- /*
-- * Print every character in octal format with the leading backslash.
-- * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like
them.
-- */
-- if (subshell_type == BASH) {
- for (; *s; s++) {
-- /* Must quote numbers, so that they are not glued to octals */
- if (isalpha ((unsigned char) *s)) {
- *d++ = (unsigned char) *s;
- } else {
-- sprintf (d, "\\%03o", (unsigned char) *s);
-- d += 4;
-- }
-- }
-- } else {
-- for (; *s; s++) {
-- if (isalnum ((unsigned char) *s)) {
-- *d++ = (unsigned char) *s;
-- } else {
- sprintf (d, "\\0%03o", (unsigned char) *s);
- d += 5;
- }
-- }
- }
-
- memcpy (d, common_end, sizeof (common_end));
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
