From b6d0ca2a5a1c7f6c4ddcb5e0d911c24648f87bd8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 22 Aug 2021 14:50:19 +0200 Subject: mc: update 4.8.26 - > 4.8.27 (From OE-Core rev: edcbd5eb311ad7b718e730048231c0c89c3397f4) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/files/nomandate.patch | 24 ++++++++--- meta/recipes-extended/mc/mc_4.8.26.bb | 55 -------------------------- meta/recipes-extended/mc/mc_4.8.27.bb | 55 ++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-extended/mc/mc_4.8.26.bb create mode 100644 meta/recipes-extended/mc/mc_4.8.27.bb (limited to 'meta/recipes-extended/mc') 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 @@ +From f02010965af21db018c4e108b2193c872406a314 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Tue, 4 Feb 2020 18:12:15 +0000 +Subject: [PATCH] mc: Fix manpage date indeterminism +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + 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 +Rather than depend upon perl-native to fix this, just remove the date from the manpages. RP 2020/2/4 @@ -8,14 +16,18 @@ RP 2020/2/4 Upstream-Status: Inappropriate [OE specficic reproducibility workaround] Signed-off-by: Richard Purdie -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 +--- + doc/man/date-of-man-include.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am +index 3a4e599..f11e9b3 100644 +--- a/doc/man/date-of-man-include.am ++++ b/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/%MAN_VERSION%/@MAN_VERSION@/g" \ -e "s{%prefix%{@prefix@{g" \ -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.26.bb deleted file mode 100644 index d5619675ef..0000000000 --- a/meta/recipes-extended/mc/mc_4.8.26.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Midnight Commander is an ncurses based file manager" -HOMEPAGE = "http://www.midnight-commander.org/" -DESCRIPTION = "GNU Midnight Commander is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included." -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=270bbafe360e73f9840bd7981621f9c2" -SECTION = "console/utils" -DEPENDS = "ncurses glib-2.0 util-linux" -RDEPENDS:${PN} = "ncurses-terminfo-base" -RRECOMMENDS:${PN} = "ncurses-terminfo" - -SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ - file://0001-mc-replace-perl-w-with-use-warnings.patch \ - file://nomandate.patch \ - " -SRC_URI[sha256sum] = "9d6358d0a351a455a1410aab57f33b6b48b0fcf31344b9a10b0ff497595979d1" - -inherit autotools gettext pkgconfig - -# -# Both Samba (smb) and sftp require package delivered from meta-openembedded -# -PACKAGECONFIG ??= "" -PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba," -PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," - -CFLAGS:append:libc-musl = ' -DNCURSES_WIDECHAR=1 ' -EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable-configure-args" - -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" -CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" -CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" -CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" - -do_install:append () { - sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* - - rm ${D}${libexecdir}/mc/extfs.d/s3+ ${D}${libexecdir}/mc/extfs.d/uc1541 -} - -PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers ${BPN}-fish" - -SUMMARY:${BPN}-helpers-perl = "Midnight Commander Perl-based helper scripts" -FILES:${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \ - ${libexecdir}/mc/extfs.d/deb ${libexecdir}/mc/extfs.d/deba \ - ${libexecdir}/mc/extfs.d/debd ${libexecdir}/mc/extfs.d/dpkg+ \ - ${libexecdir}/mc/extfs.d/mailfs ${libexecdir}/mc/extfs.d/patchfs \ - ${libexecdir}/mc/extfs.d/rpms+ ${libexecdir}/mc/extfs.d/ulib \ - ${libexecdir}/mc/extfs.d/uzip" -RDEPENDS:${BPN}-helpers-perl = "perl" - -SUMMARY:${BPN}-helpers = "Midnight Commander shell helper scripts" -FILES:${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*" - -SUMMARY:${BPN}-fish = "Midnight Commander Fish scripts" -FILES:${BPN}-fish = "${libexecdir}/mc/fish" diff --git a/meta/recipes-extended/mc/mc_4.8.27.bb b/meta/recipes-extended/mc/mc_4.8.27.bb new file mode 100644 index 0000000000..bc2348432b --- /dev/null +++ b/meta/recipes-extended/mc/mc_4.8.27.bb @@ -0,0 +1,55 @@ +SUMMARY = "Midnight Commander is an ncurses based file manager" +HOMEPAGE = "http://www.midnight-commander.org/" +DESCRIPTION = "GNU Midnight Commander is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included." +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=270bbafe360e73f9840bd7981621f9c2" +SECTION = "console/utils" +DEPENDS = "ncurses glib-2.0 util-linux" +RDEPENDS:${PN} = "ncurses-terminfo-base" +RRECOMMENDS:${PN} = "ncurses-terminfo" + +SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ + file://0001-mc-replace-perl-w-with-use-warnings.patch \ + file://nomandate.patch \ + " +SRC_URI[sha256sum] = "2f52dd9c75c20d8eac7701bd3a8c6c125aaf8cdd9cf12b78ca50a0102b543407" + +inherit autotools gettext pkgconfig + +# +# Both Samba (smb) and sftp require package delivered from meta-openembedded +# +PACKAGECONFIG ??= "" +PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba," +PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," + +CFLAGS:append:libc-musl = ' -DNCURSES_WIDECHAR=1 ' +EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable-configure-args" + +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" +CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" +CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" + +do_install:append () { + sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* + + rm ${D}${libexecdir}/mc/extfs.d/s3+ ${D}${libexecdir}/mc/extfs.d/uc1541 +} + +PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers ${BPN}-fish" + +SUMMARY:${BPN}-helpers-perl = "Midnight Commander Perl-based helper scripts" +FILES:${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \ + ${libexecdir}/mc/extfs.d/deb ${libexecdir}/mc/extfs.d/deba \ + ${libexecdir}/mc/extfs.d/debd ${libexecdir}/mc/extfs.d/dpkg+ \ + ${libexecdir}/mc/extfs.d/mailfs ${libexecdir}/mc/extfs.d/patchfs \ + ${libexecdir}/mc/extfs.d/rpms+ ${libexecdir}/mc/extfs.d/ulib \ + ${libexecdir}/mc/extfs.d/uzip" +RDEPENDS:${BPN}-helpers-perl = "perl" + +SUMMARY:${BPN}-helpers = "Midnight Commander shell helper scripts" +FILES:${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*" + +SUMMARY:${BPN}-fish = "Midnight Commander Fish scripts" +FILES:${BPN}-fish = "${libexecdir}/mc/fish" -- cgit v1.2.3-54-g00ecf