From dc67acc061530b4b993a6f0ddd9bb9e34479eae9 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Tue, 5 Dec 2017 13:51:44 +0200 Subject: mc: upgrade to 4.8.20 Remove backported patch: 0002-Ticket-3697-tty_init-unify-curses-initialization.patch Signed-off-by: Maxin B. John Signed-off-by: Ross Burton --- ...3697-tty_init-unify-curses-initialization.patch | 66 ---------------------- meta/recipes-extended/mc/mc_4.8.19.bb | 50 ---------------- meta/recipes-extended/mc/mc_4.8.20.bb | 49 ++++++++++++++++ 3 files changed, 49 insertions(+), 116 deletions(-) delete mode 100644 meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch delete mode 100644 meta/recipes-extended/mc/mc_4.8.19.bb create mode 100644 meta/recipes-extended/mc/mc_4.8.20.bb diff --git a/meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch b/meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch deleted file mode 100644 index c54d4d0eae..0000000000 --- a/meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4d46a108629beb66a293672db7b44f863b6598ba Mon Sep 17 00:00:00 2001 -From: Thomas Dickey -Date: Fri, 14 Apr 2017 14:06:13 +0300 -Subject: [PATCH] Ticket #3697: (tty_init): unify curses initialization - -...for various curses implementations. - -Signed-off-by: Andrew Borodin - -Upstream-Status: Backport [https://github.com/MidnightCommander/mc.git] - -Signed-off-by: Hongxu Jia - ---- - lib/tty/tty-ncurses.c | 26 +++++++++----------------- - 1 file changed, 9 insertions(+), 17 deletions(-) - -diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c -index a7a11f3..8e69b39 100644 ---- a/lib/tty/tty-ncurses.c -+++ b/lib/tty/tty-ncurses.c -@@ -179,6 +179,8 @@ mc_tty_normalize_lines_char (const char *ch) - void - tty_init (gboolean mouse_enable, gboolean is_xterm) - { -+ struct termios mode; -+ - initscr (); - - #ifdef HAVE_ESCDELAY -@@ -194,25 +196,15 @@ tty_init (gboolean mouse_enable, gboolean is_xterm) - ESCDELAY = 200; - #endif /* HAVE_ESCDELAY */ - --#ifdef NCURSES_VERSION -+ tcgetattr (STDIN_FILENO, &mode); - /* use Ctrl-g to generate SIGINT */ -- cur_term->Nttyb.c_cc[VINTR] = CTRL ('g'); /* ^g */ -+ mode.c_cc[VINTR] = CTRL ('g'); /* ^g */ - /* disable SIGQUIT to allow use Ctrl-\ key */ -- cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE; -- tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb); --#else -- /* other curses implementation (bsd curses, ...) */ -- { -- struct termios mode; -- -- tcgetattr (STDIN_FILENO, &mode); -- /* use Ctrl-g to generate SIGINT */ -- mode.c_cc[VINTR] = CTRL ('g'); /* ^g */ -- /* disable SIGQUIT to allow use Ctrl-\ key */ -- mode.c_cc[VQUIT] = NULL_VALUE; -- tcsetattr (STDIN_FILENO, TCSANOW, &mode); -- } --#endif /* NCURSES_VERSION */ -+ mode.c_cc[VQUIT] = NULL_VALUE; -+ tcsetattr (STDIN_FILENO, TCSANOW, &mode); -+ -+ /* curses remembers the "in-program" modes after this call */ -+ def_prog_mode (); - - tty_start_interrupt_key (); - --- -2.7.4 - diff --git a/meta/recipes-extended/mc/mc_4.8.19.bb b/meta/recipes-extended/mc/mc_4.8.19.bb deleted file mode 100644 index b3a156caee..0000000000 --- a/meta/recipes-extended/mc/mc_4.8.19.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Midnight Commander is an ncurses based file manager" -HOMEPAGE = "http://www.midnight-commander.org/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=270bbafe360e73f9840bd7981621f9c2" -SECTION = "console/utils" -DEPENDS = "ncurses glib-2.0 util-linux" -RDEPENDS_${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://0002-Ticket-3697-tty_init-unify-curses-initialization.patch \ - " -SRC_URI[md5sum] = "ef423f5b6f80a1a5a5fc53b8324cab70" -SRC_URI[sha256sum] = "d0dddfae7149fac903f74ef55cfcb2a198e0f7004346c7bded43669d61ba436f" - -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," - -EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x" - -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" - -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.20.bb b/meta/recipes-extended/mc/mc_4.8.20.bb new file mode 100644 index 0000000000..70d1b5e0a9 --- /dev/null +++ b/meta/recipes-extended/mc/mc_4.8.20.bb @@ -0,0 +1,49 @@ +SUMMARY = "Midnight Commander is an ncurses based file manager" +HOMEPAGE = "http://www.midnight-commander.org/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=270bbafe360e73f9840bd7981621f9c2" +SECTION = "console/utils" +DEPENDS = "ncurses glib-2.0 util-linux" +RDEPENDS_${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 \ + " +SRC_URI[md5sum] = "dcfc7aa613c62291a0f71f6b698d8267" +SRC_URI[sha256sum] = "2d85daaa6ab26e524946df4823ac2f69802bc16bc967781b5e28d5b86fc3b979" + +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," + +EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x" + +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + +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 1.2.3-korg