diff options
Diffstat (limited to 'poky/meta/recipes-extended/mc')
3 files changed, 136 insertions, 1 deletions
diff --git a/poky/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch b/poky/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch new file mode 100644 index 000000000..8f357378d --- /dev/null +++ b/poky/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch @@ -0,0 +1,110 @@ +From 0d677a014a87b968d79eea2353ac4e342b0fd4ca Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Wed, 11 Sep 2019 22:58:18 +0100 +Subject: [PATCH] Ticket #3629: configure.ac: drop bundled gettext + +Bundled libintl did not support linking to internal static +libraries (libmc in our case): directly specified static +libraries are not pulled by libtool and are not usable for +dynamic libraries as PIC-related flags are not passed for +compilation. + +This renders bundled libintl library unusable. + +The change drops libintl bundling support and always relies +on external libintl (or falls back to disabled NLS). + +On a related note gettext-0.20 drops support for bundling +or libintl and this change will ease migration to newer version. + +The change is tested on x86_64-gentoo-linux-musl: mc builds +and links all tests successfully. A few tests fail for lack +of NLS support. + +Upstream-Status: Backport [https://github.com/MidnightCommander/mc/commit/f30e6ff283f4bc86177e4360de94dad794678395] +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +Signed-off-by: Andrew Borodin <aborodin@vmail.ru> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.am | 2 +- + configure.ac | 5 +++-- + doc/doxygen.cfg | 2 +- + lib/Makefile.am | 2 +- + m4.include/mc-i18n.m4 | 5 ----- + 5 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ac05a83..f86f6ed 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to create Makefile.in. + AUTOMAKE_OPTIONS = 1.5 + +-SUBDIRS = intl po lib src doc contrib misc ++SUBDIRS = po lib src doc contrib misc + + if HAVE_TESTS + SUBDIRS += tests +diff --git a/configure.ac b/configure.ac +index a1948f6..bbc9e71 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -272,7 +272,9 @@ dnl ############################################################################ + dnl Internationalization + dnl ############################################################################ + +-AM_GNU_GETTEXT([no-libtool], [need-ngettext]) ++AC_CHECK_FUNCS([setlocale]) ++ ++AM_GNU_GETTEXT([external], [need-ngettext]) + AM_GNU_GETTEXT_VERSION([0.18.1]) + + mc_I18N +@@ -680,7 +682,6 @@ doc/hlp/pl/Makefile + doc/hlp/ru/Makefile + doc/hlp/sr/Makefile + +-intl/Makefile + po/Makefile.in + ]) + +diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg +index 07bc973..1118062 100644 +--- a/doc/doxygen.cfg ++++ b/doc/doxygen.cfg +@@ -91,7 +91,7 @@ FILE_PATTERNS = *.c \ + RECURSIVE = YES + EXCLUDE = + EXCLUDE_SYMLINKS = NO +-EXCLUDE_PATTERNS = */intl/* */tests/* */.git/* ++EXCLUDE_PATTERNS = */tests/* */.git/* + EXCLUDE_SYMBOLS = + EXAMPLE_PATH = $(SRCDIR) + EXAMPLE_PATTERNS = +diff --git a/lib/Makefile.am b/lib/Makefile.am +index c448e2d..455f9dd 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -74,4 +74,4 @@ else + libmc_la_LIBADD += $(GLIB_LIBS) + endif + +-libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(LIBINTL) ++libmc_la_LIBADD += $(PCRE_LIBS) +diff --git a/m4.include/mc-i18n.m4 b/m4.include/mc-i18n.m4 +index dd10d00..ec08324 100644 +--- a/m4.include/mc-i18n.m4 ++++ b/m4.include/mc-i18n.m4 +@@ -8,11 +8,6 @@ dnl @license GPL + dnl @copyright Free Software Foundation, Inc. + + AC_DEFUN([mc_I18N],[ +- +- if test "x$USE_INCLUDED_LIBINTL" = xyes; then +- CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl" +- fi +- + dnl User visible support for charset conversion. + AC_ARG_ENABLE([charset], + AS_HELP_STRING([--enable-charset], [Support for charset selection and conversion @<:@yes@:>@])) diff --git a/poky/meta/recipes-extended/mc/files/nomandate.patch b/poky/meta/recipes-extended/mc/files/nomandate.patch new file mode 100644 index 000000000..48bd73b11 --- /dev/null +++ b/poky/meta/recipes-extended/mc/files/nomandate.patch @@ -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" \ diff --git a/poky/meta/recipes-extended/mc/mc_4.8.23.bb b/poky/meta/recipes-extended/mc/mc_4.8.23.bb index 71f61b484..ead348b92 100644 --- a/poky/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/poky/meta/recipes-extended/mc/mc_4.8.23.bb @@ -4,11 +4,14 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=270bbafe360e73f9840bd7981621f9c2" SECTION = "console/utils" DEPENDS = "ncurses glib-2.0 util-linux" -RDEPENDS_${PN} = "ncurses-terminfo" +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://0001-Add-option-to-control-configure-args.patch \ + file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \ + file://nomandate.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" @@ -27,6 +30,7 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable- 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/* |