vanhofen
5 years ago
6 changed files with 174 additions and 64 deletions
@ -1,60 +0,0 @@ |
|||
From afb09f7cd7024484845ade25e15b8b93d6cf2d2c Mon Sep 17 00:00:00 2001 |
|||
From: Sergei Trofimovich <slyfox@gentoo.org> |
|||
Date: Tue, 3 Mar 2020 09:26:12 +0000 |
|||
Subject: [PATCH] Ticket #4070: misc/Makefile.am: install mc.lib only once. |
|||
|
|||
Before the change mc.lib was installed twice due to being |
|||
in two _DATA variables: |
|||
|
|||
dist_pkgdata_DATA = \ |
|||
mc.lib |
|||
|
|||
pkgdata_DATA = \ |
|||
$(dist_pkgdata_DATA) \ |
|||
$(PKGDATA_OUT) |
|||
|
|||
This causes occasional install failures when two parallel |
|||
`/usr/bin/install` calls race in installing the file: |
|||
|
|||
$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install |
|||
... |
|||
/usr/lib/portage/python3.6/ebuild-helpers/xattr/install \ |
|||
-c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc' |
|||
/usr/lib/portage/python3.6/ebuild-helpers/xattr/install \ |
|||
-c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc' |
|||
... |
|||
/usr/bin/install: cannot create regular file |
|||
'/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists |
|||
|
|||
After the change mc.lib is present only in dist_pkgdata_DATA. |
|||
|
|||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> |
|||
Signed-off-by: Andrew Borodin <aborodin@vmail.ru> |
|||
|
|||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
|||
[Retrieved from: |
|||
https://github.com/MidnightCommander/mc/commit/afb09f7cd7024484845ade25e15b8b93d6cf2d2c] |
|||
---
|
|||
misc/Makefile.am | 2 -- |
|||
1 file changed, 2 deletions(-) |
|||
|
|||
diff --git a/misc/Makefile.am b/misc/Makefile.am
|
|||
index 8ed1826136..24f4a0e1ad 100644
|
|||
--- a/misc/Makefile.am
|
|||
+++ b/misc/Makefile.am
|
|||
@@ -17,7 +17,6 @@ dist_pkgdata_DATA = \
|
|||
mc.lib |
|||
|
|||
pkgdata_DATA = \ |
|||
- $(dist_pkgdata_DATA) \
|
|||
$(PKGDATA_OUT) |
|||
|
|||
SCRIPTS_IN = \ |
|||
@@ -54,7 +53,6 @@ EXTRA_DIST = \
|
|||
$(LIBFILES_SCRIPT) \ |
|||
$(SCRIPTS_IN) \ |
|||
$(noinst_DATA) \ |
|||
- $(dist_pkgdata_DATA) \
|
|||
$(PKGDATA_IN) |
|||
|
|||
install-data-hook: |
|||
@ -0,0 +1,129 @@ |
|||
From cdc7c278212ae836eecb4cc9d42c29443cc128a0 Mon Sep 17 00:00:00 2001 |
|||
From: Robert Yang <liezhi.yang@windriver.com> |
|||
Date: Thu, 6 Apr 2017 02:24:28 -0700 |
|||
Subject: [PATCH] mc: replace "perl -w" with "use warnings" |
|||
|
|||
The shebang's max length is usually 128 as defined in |
|||
/usr/include/linux/binfmts.h: |
|||
#define BINPRM_BUF_SIZE 128 |
|||
|
|||
There would be errors when @PERL@ is longer than 128, use |
|||
'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' |
|||
doesn't work: |
|||
|
|||
/usr/bin/env: perl -w: No such file or directory |
|||
|
|||
So replace "perl -w" with "use warnings" to make it work. |
|||
|
|||
The man2hlp.in already has "use warnings;", so just remove '-w' is OK. |
|||
|
|||
Upstream-Status: Pending |
|||
|
|||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
|||
---
|
|||
src/man2hlp/man2hlp.in | 2 +- |
|||
src/vfs/extfs/helpers/a+.in | 4 +++- |
|||
src/vfs/extfs/helpers/mailfs.in | 3 ++- |
|||
src/vfs/extfs/helpers/patchfs.in | 3 ++- |
|||
src/vfs/extfs/helpers/ulib.in | 4 +++- |
|||
src/vfs/extfs/helpers/uzip.in | 3 ++- |
|||
6 files changed, 13 insertions(+), 6 deletions(-) |
|||
|
|||
diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in
|
|||
index f095830..558a674 100644
|
|||
--- a/src/man2hlp/man2hlp.in
|
|||
+++ b/src/man2hlp/man2hlp.in
|
|||
@@ -1,4 +1,4 @@
|
|||
-#! @PERL@ -w
|
|||
+#! @PERL@
|
|||
# |
|||
# Man page to help file converter |
|||
# Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, |
|||
diff --git a/src/vfs/extfs/helpers/a+.in b/src/vfs/extfs/helpers/a+.in
|
|||
index 579441c..fe446f4 100644
|
|||
--- a/src/vfs/extfs/helpers/a+.in
|
|||
+++ b/src/vfs/extfs/helpers/a+.in
|
|||
@@ -1,4 +1,4 @@
|
|||
-#! @PERL@ -w
|
|||
+#! @PERL@
|
|||
# |
|||
# External filesystem for mc, using mtools |
|||
# Written Ludek Brukner <lubr@barco.cz>, 1997 |
|||
@@ -9,6 +9,8 @@
|
|||
|
|||
# These mtools components must be in PATH for this to work |
|||
|
|||
+use warnings;
|
|||
+
|
|||
sub quote { |
|||
$_ = shift(@_); |
|||
s/([^\w\/.+-])/\\$1/g; |
|||
diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in
|
|||
index e9455be..059f41f 100644
|
|||
--- a/src/vfs/extfs/helpers/mailfs.in
|
|||
+++ b/src/vfs/extfs/helpers/mailfs.in
|
|||
@@ -1,6 +1,7 @@
|
|||
-#! @PERL@ -w
|
|||
+#! @PERL@
|
|||
|
|||
use bytes; |
|||
+use warnings;
|
|||
|
|||
# MC extfs for (possibly compressed) Berkeley style mailbox files |
|||
# Peter Daum <gator@cs.tu-berlin.de> (Jan 1998, mc-4.1.24) |
|||
diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in
|
|||
index ef407de..3ad4b53 100644
|
|||
--- a/src/vfs/extfs/helpers/patchfs.in
|
|||
+++ b/src/vfs/extfs/helpers/patchfs.in
|
|||
@@ -1,4 +1,4 @@
|
|||
-#! @PERL@ -w
|
|||
+#! @PERL@
|
|||
# |
|||
# Written by Adam Byrtek <alpha@debian.org>, 2002 |
|||
# Rewritten by David Sterba <dave@jikos.cz>, 2009 |
|||
@@ -9,6 +9,7 @@
|
|||
|
|||
use bytes; |
|||
use strict; |
|||
+use warnings;
|
|||
use POSIX; |
|||
use File::Temp 'tempfile'; |
|||
|
|||
diff --git a/src/vfs/extfs/helpers/ulib.in b/src/vfs/extfs/helpers/ulib.in
|
|||
index 418611f..82c7ccf 100644
|
|||
--- a/src/vfs/extfs/helpers/ulib.in
|
|||
+++ b/src/vfs/extfs/helpers/ulib.in
|
|||
@@ -1,9 +1,11 @@
|
|||
-#! @PERL@ -w
|
|||
+#! @PERL@
|
|||
# |
|||
# VFS to manage the gputils archives. |
|||
# Written by Molnár Károly (proton7@freemail.hu) 2012 |
|||
# |
|||
|
|||
+use warnings;
|
|||
+
|
|||
my %month = ('jan' => '01', 'feb' => '02', 'mar' => '03', |
|||
'apr' => '04', 'may' => '05', 'jun' => '06', |
|||
'jul' => '07', 'aug' => '08', 'sep' => '09', |
|||
diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in
|
|||
index b1c4f90..c8eb335 100644
|
|||
--- a/src/vfs/extfs/helpers/uzip.in
|
|||
+++ b/src/vfs/extfs/helpers/uzip.in
|
|||
@@ -1,4 +1,4 @@
|
|||
-#! @PERL@ -w
|
|||
+#! @PERL@
|
|||
# |
|||
# zip file archive Virtual File System for Midnight Commander |
|||
# Version 1.4.0 (2001-08-07). |
|||
@@ -9,6 +9,7 @@
|
|||
use POSIX; |
|||
use File::Basename; |
|||
use strict; |
|||
+use warnings;
|
|||
|
|||
# |
|||
# Configuration options |
|||
--
|
|||
2.10.2 |
|||
|
|||
@ -0,0 +1,21 @@ |
|||
The man page date can vary depending upon the host perl, e.g. in Russian |
|||
some versions print 'июня', others 'Июнь' or Polish 'czerwca' or 'czerwiec'. |
|||
Rather than depend upon perl-native to fix this, just remove the date from |
|||
the manpages. |
|||
|
|||
RP 2020/2/4 |
|||
|
|||
Upstream-Status: Inappropriate [OE specficic reproducibility workaround] |
|||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
|||
|
|||
Index: mc-4.8.23/doc/man/date-of-man-include.am
|
|||
===================================================================
|
|||
--- mc-4.8.23.orig/doc/man/date-of-man-include.am
|
|||
+++ mc-4.8.23/doc/man/date-of-man-include.am
|
|||
@@ -1,5 +1,5 @@
|
|||
SED_PARAMETERS = \ |
|||
- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \
|
|||
+ -e "s/%DATE_OF_MAN_PAGE%//g" \
|
|||
-e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ |
|||
-e "s{%prefix%{@prefix@{g" \ |
|||
-e "s{%sysconfdir%{@sysconfdir@{g" \ |
|||
@ -0,0 +1,11 @@ |
|||
-- a/src/subshell/common.c
|
|||
+++ b/src/subshell/common.c
|
|||
@@ -836,7 +836,7 @@ init_subshell_precmd (char *precmd, size
|
|||
"else " |
|||
"[ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; " |
|||
"fi; " |
|||
- "echo \"$USER@$(hostname -s):$MC_PWD\"; "
|
|||
+ "echo \"$USER@$HOSTNAME:$MC_PWD\"; "
|
|||
"pwd>&%d; " |
|||
"kill -STOP $$; " |
|||
"}; " "PRECMD=precmd; " "PS1='$($PRECMD)$ '\n", subshell_pipe[WRITE]); |
|||
@ -0,0 +1,11 @@ |
|||
--- a/lib/tty/tty.c
|
|||
+++ b/lib/tty/tty.c
|
|||
@@ -370,7 +370,7 @@ tty_init_xterm_support (gboolean is_xter
|
|||
if (xmouse_seq != NULL) |
|||
{ |
|||
if (strcmp (xmouse_seq, ESC_STR "[<") == 0) |
|||
- xmouse_seq = ESC_STR "[M";
|
|||
+ xmouse_seq = NULL;
|
|||
|
|||
xmouse_extended_seq = ESC_STR "[<"; |
|||
} |
|||
Loading…
Reference in new issue