summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-08-31 10:36:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-02 18:23:05 +0100
commitbf0b19cf8d686d563f99e0096e39121f4100bb58 (patch)
treedfc457adc2fc759994c4e9e83c468c302eae0c52 /meta
parentc80bd5be88b2934d29d37f21a6100cb18faa9127 (diff)
downloadpoky-bf0b19cf8d686d563f99e0096e39121f4100bb58.tar.gz
mc: upgrade 4.8.29 -> 4.8.30
0001-mc-replace-perl-w-with-use-warnings.patch removed since it's included in 4.8.30 Changelog: ========== - Core -------- * Support PCRE2 as search engine (via ----with-search-engine=pcre2) (#4450) * Implement panelization buffers for both file panels (#4370) - VFS ------- * tar: support extended headers (including long file names and sparse files) (#1952, #2201) * extfs helpers: replace "perl -w" with "use warnings" (MidnightCommander/mc#174) * extfs/patchfs: be more specific in error message (#4485) - Editor --------- * Add syntax highlighting: - Jenkinsfiles (#4469) - B language (#4470) * Improve syntax highlighting: - ECMAScript (MidnightCommander/mc#172) - ECMAScript in TypeScript (MidnightCommander/mc#172) - use diff syntax highlighting for git commit messages (COMMIT_EDITMSG) (MidnightCommander/mc#85) - Misc -------- * Code cleanup (#4426, #4438) * Filehighlight: - recognize vsix files as zip files (MidnightCommander/mc#171) * Skin updates: - julia256 (#4441, #4445) - Fixes ---------- * Usage of 'sed' in build system/makefiles is not portable (#4459, #4466) * Unportable '$<' in Makefiles (#4460) * FTBFS if ncurses used without --with-ncurses-includes= configure parameter (#4462) * Ncurses library is duplicated in MCLIBS (#4463, #4465) * FTBFS without ext2fs attributes support (#4464) * Wrong sort order after swapping panels (#4432) * Incorrect time delimiter in the copy/move progress window (#4437) * Incorrect redraw of overlapped file panels (#4408) * Subshell/Command line prompt is empty/missing (#3121) * Find file: relative ignore directory is applied to the start search directory (#4235) * Diff viewer: options are not applied on second run (#4486) * mc.ext.ini: 'Edit' command from 'Default' section is ignored (#4434) * mc.ext.ini: .md files are not recognized as Markdown ones by extension (#4444) * mcedit: off-by-one error in paragraph formatting (#4446) * ftp: incomplete file listing: block and character devices, pipes, sockets are missed (#4472) * Various typos in the source code (MidnightCommander/mc#177, MidnightCommander/mc#178) (From OE-Core rev: 9ba1f7042de6e430c687970657173740eec9ea7b) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch127
-rw-r--r--meta/recipes-extended/mc/mc_4.8.30.bb (renamed from meta/recipes-extended/mc/mc_4.8.29.bb)3
2 files changed, 1 insertions, 129 deletions
diff --git a/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
deleted file mode 100644
index 5ede82d342..0000000000
--- a/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
+++ /dev/null
@@ -1,127 +0,0 @@
1From 62c86b69106d0d702167ba1b963ea1c201cce5af Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 6 Apr 2017 02:24:28 -0700
4Subject: [PATCH] mc: replace "perl -w" with "use warnings"
5
6The shebang's max length is usually 128 as defined in
7/usr/include/linux/binfmts.h:
8 #define BINPRM_BUF_SIZE 128
9
10There would be errors when @PERL@ is longer than 128, use
11'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w'
12doesn't work:
13
14/usr/bin/env: perl -w: No such file or directory
15
16So replace "perl -w" with "use warnings" to make it work.
17
18The man2hlp.in already has "use warnings;", so just remove '-w' is OK.
19
20Upstream-Status: Submitted [https://github.com/MidnightCommander/mc/pull/174]
21
22Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
23
24---
25 src/man2hlp/man2hlp.in | 2 +-
26 src/vfs/extfs/helpers/a+.in | 4 +++-
27 src/vfs/extfs/helpers/mailfs.in | 3 ++-
28 src/vfs/extfs/helpers/patchfs.in | 3 ++-
29 src/vfs/extfs/helpers/ulib.in | 4 +++-
30 src/vfs/extfs/helpers/uzip.in | 3 ++-
31 6 files changed, 13 insertions(+), 6 deletions(-)
32
33diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in
34index 08765d8..8aa7131 100644
35--- a/src/man2hlp/man2hlp.in
36+++ b/src/man2hlp/man2hlp.in
37@@ -1,4 +1,4 @@
38-#! @PERL_FOR_BUILD@ -w
39+#! @PERL_FOR_BUILD@
40 #
41 # Man page to help file converter
42 # Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
43diff --git a/src/vfs/extfs/helpers/a+.in b/src/vfs/extfs/helpers/a+.in
44index 579441c..fe446f4 100644
45--- a/src/vfs/extfs/helpers/a+.in
46+++ b/src/vfs/extfs/helpers/a+.in
47@@ -1,4 +1,4 @@
48-#! @PERL@ -w
49+#! @PERL@
50 #
51 # External filesystem for mc, using mtools
52 # Written Ludek Brukner <lubr@barco.cz>, 1997
53@@ -9,6 +9,8 @@
54
55 # These mtools components must be in PATH for this to work
56
57+use warnings;
58+
59 sub quote {
60 $_ = shift(@_);
61 s/([^\w\/.+-])/\\$1/g;
62diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in
63index 4bdd68b..5bb373b 100644
64--- a/src/vfs/extfs/helpers/mailfs.in
65+++ b/src/vfs/extfs/helpers/mailfs.in
66@@ -1,6 +1,7 @@
67-#! @PERL@ -w
68+#! @PERL@
69
70 use bytes;
71+use warnings;
72
73 # MC extfs for (possibly compressed) Berkeley style mailbox files
74 # Peter Daum <gator@cs.tu-berlin.de> (Jan 1998, mc-4.1.24)
75diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in
76index c20cd54..1f1e75b 100644
77--- a/src/vfs/extfs/helpers/patchfs.in
78+++ b/src/vfs/extfs/helpers/patchfs.in
79@@ -1,4 +1,4 @@
80-#! @PERL@ -w
81+#! @PERL@
82 #
83 # Written by Adam Byrtek <alpha@debian.org>, 2002
84 # Rewritten by David Sterba <dave@jikos.cz>, 2009
85@@ -9,6 +9,7 @@
86
87 use bytes;
88 use strict;
89+use warnings;
90 use POSIX;
91 use File::Temp 'tempfile';
92
93diff --git a/src/vfs/extfs/helpers/ulib.in b/src/vfs/extfs/helpers/ulib.in
94index 418611f..82c7ccf 100644
95--- a/src/vfs/extfs/helpers/ulib.in
96+++ b/src/vfs/extfs/helpers/ulib.in
97@@ -1,9 +1,11 @@
98-#! @PERL@ -w
99+#! @PERL@
100 #
101 # VFS to manage the gputils archives.
102 # Written by Molnár Károly (proton7@freemail.hu) 2012
103 #
104
105+use warnings;
106+
107 my %month = ('jan' => '01', 'feb' => '02', 'mar' => '03',
108 'apr' => '04', 'may' => '05', 'jun' => '06',
109 'jul' => '07', 'aug' => '08', 'sep' => '09',
110diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in
111index c468f3a..ceffb53 100644
112--- a/src/vfs/extfs/helpers/uzip.in
113+++ b/src/vfs/extfs/helpers/uzip.in
114@@ -1,4 +1,4 @@
115-#! @PERL@ -w
116+#! @PERL@
117 #
118 # zip file archive Virtual File System for Midnight Commander
119 # Version 1.4.0 (2001-08-07).
120@@ -9,6 +9,7 @@
121 use POSIX;
122 use File::Basename;
123 use strict;
124+use warnings;
125
126 #
127 # Configuration options
diff --git a/meta/recipes-extended/mc/mc_4.8.29.bb b/meta/recipes-extended/mc/mc_4.8.30.bb
index e7f4aacc2e..258ac38e15 100644
--- a/meta/recipes-extended/mc/mc_4.8.29.bb
+++ b/meta/recipes-extended/mc/mc_4.8.30.bb
@@ -9,10 +9,9 @@ RDEPENDS:${PN} = "ncurses-terminfo-base"
9RRECOMMENDS:${PN} = "ncurses-terminfo" 9RRECOMMENDS:${PN} = "ncurses-terminfo"
10 10
11SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ 11SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
12 file://0001-mc-replace-perl-w-with-use-warnings.patch \
13 file://nomandate.patch \ 12 file://nomandate.patch \
14 " 13 "
15SRC_URI[sha256sum] = "ba6b2d8752806ac23fe045c1b081eb66dcefa6159205c79f86c005dcaf9941c1" 14SRC_URI[sha256sum] = "38171f22f889e3030ec9055463d3ecd7843984ab24e6497d8294d1c441a7ddb4"
16 15
17inherit autotools gettext pkgconfig 16inherit autotools gettext pkgconfig
18 17