summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/mc/files/nomandate.patch24
-rw-r--r--meta/recipes-extended/mc/mc_4.8.27.bb (renamed from meta/recipes-extended/mc/mc_4.8.26.bb)2
2 files changed, 19 insertions, 7 deletions
diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch
index 48bd73b110..c01d065b0e 100644
--- a/meta/recipes-extended/mc/files/nomandate.patch
+++ b/meta/recipes-extended/mc/files/nomandate.patch
@@ -1,6 +1,14 @@
1From f02010965af21db018c4e108b2193c872406a314 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Tue, 4 Feb 2020 18:12:15 +0000
4Subject: [PATCH] mc: Fix manpage date indeterminism
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
1The man page date can vary depending upon the host perl, e.g. in Russian 9The man page date can vary depending upon the host perl, e.g. in Russian
2some versions print 'июня', others 'Июнь' or Polish 'czerwca' or 'czerwiec'. 10some versions print 'июня', others 'Июнь' or Polish 'czerwca' or 'czerwiec'.
3Rather than depend upon perl-native to fix this, just remove the date from 11Rather than depend upon perl-native to fix this, just remove the date from
4the manpages. 12the manpages.
5 13
6RP 2020/2/4 14RP 2020/2/4
@@ -8,14 +16,18 @@ RP 2020/2/4
8Upstream-Status: Inappropriate [OE specficic reproducibility workaround] 16Upstream-Status: Inappropriate [OE specficic reproducibility workaround]
9Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 17Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
10 18
11Index: mc-4.8.23/doc/man/date-of-man-include.am 19---
12=================================================================== 20 doc/man/date-of-man-include.am | 2 +-
13--- mc-4.8.23.orig/doc/man/date-of-man-include.am 21 1 file changed, 1 insertion(+), 1 deletion(-)
14+++ mc-4.8.23/doc/man/date-of-man-include.am 22
23diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am
24index 3a4e599..f11e9b3 100644
25--- a/doc/man/date-of-man-include.am
26+++ b/doc/man/date-of-man-include.am
15@@ -1,5 +1,5 @@ 27@@ -1,5 +1,5 @@
16 SED_PARAMETERS = \ 28 SED_PARAMETERS = \
17- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ 29- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \
18+ -e "s/%DATE_OF_MAN_PAGE%//g" \ 30+ -e "s/%DATE_OF_MAN_PAGE%//g" \
19 -e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ 31 -e "s/%MAN_VERSION%/@MAN_VERSION@/g" \
20 -e "s{%prefix%{@prefix@{g" \ 32 -e "s{%prefix%{@prefix@{g" \
21 -e "s{%sysconfdir%{@sysconfdir@{g" \ 33 -e "s{%sysconfdir%{@sysconfdir@{g" \
diff --git a/meta/recipes-extended/mc/mc_4.8.26.bb b/meta/recipes-extended/mc/mc_4.8.27.bb
index d5619675ef..bc2348432b 100644
--- a/meta/recipes-extended/mc/mc_4.8.26.bb
+++ b/meta/recipes-extended/mc/mc_4.8.27.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
12 file://0001-mc-replace-perl-w-with-use-warnings.patch \ 12 file://0001-mc-replace-perl-w-with-use-warnings.patch \
13 file://nomandate.patch \ 13 file://nomandate.patch \
14 " 14 "
15SRC_URI[sha256sum] = "9d6358d0a351a455a1410aab57f33b6b48b0fcf31344b9a10b0ff497595979d1" 15SRC_URI[sha256sum] = "2f52dd9c75c20d8eac7701bd3a8c6c125aaf8cdd9cf12b78ca50a0102b543407"
16 16
17inherit autotools gettext pkgconfig 17inherit autotools gettext pkgconfig
18 18