summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch99
-rw-r--r--meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch110
-rw-r--r--meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch59
-rw-r--r--meta/recipes-extended/mc/mc_4.8.24.bb (renamed from meta/recipes-extended/mc/mc_4.8.23.bb)7
4 files changed, 62 insertions, 213 deletions
diff --git a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch b/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch
deleted file mode 100644
index e76aac8161..0000000000
--- a/meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1From a54501d3c9541bc8600225aa2d42531f93c6def7 Mon Sep 17 00:00:00 2001
2From: Joshua Watt <JPEWhacker@gmail.com>
3Date: Sat, 9 Nov 2019 20:01:48 -0600
4Subject: [PATCH] Add option to control configure args
5
6Embedding the configure time options into the executable can lead to
7non-reproducible builds, since configure options often have embedded
8paths. Add a configure time option to control if the configure args are
9embedded so this can be disabled.
10
11Upstream-Status: Submitted [https://midnight-commander.org/ticket/4031]
12Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
13---
14 configure.ac | 6 ++++++
15 src/args.c | 6 ++++++
16 src/textconf.c | 2 ++
17 3 files changed, 14 insertions(+)
18
19diff --git a/configure.ac b/configure.ac
20index 19d1a76be..a1948f6b9 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -544,6 +544,12 @@ dnl Clarify do we really need GModule
24 AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \
25 test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"])
26
27+AC_ARG_ENABLE([configure-args],
28+ AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors]))
29+if test "x$enable_configure_args" != xno; then
30+ AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help])
31+fi
32+
33 AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments])
34
35 AC_CONFIG_FILES(
36diff --git a/src/args.c b/src/args.c
37index baef1a1c8..f8dc24020 100644
38--- a/src/args.c
39+++ b/src/args.c
40@@ -95,7 +95,9 @@ static gboolean mc_args__nouse_subshell = FALSE;
41 #endif /* ENABLE_SUBSHELL */
42 static gboolean mc_args__show_datadirs = FALSE;
43 static gboolean mc_args__show_datadirs_extended = FALSE;
44+#ifdef ENABLE_CONFIGURE_ARGS
45 static gboolean mc_args__show_configure_opts = FALSE;
46+#endif
47
48 static GOptionGroup *main_group;
49
50@@ -125,6 +127,7 @@ static const GOptionEntry argument_main_table[] = {
51 NULL
52 },
53
54+#ifdef ENABLE_CONFIGURE_ARGS
55 /* show configure options */
56 {
57 "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
58@@ -132,6 +135,7 @@ static const GOptionEntry argument_main_table[] = {
59 N_("Print configure options"),
60 NULL
61 },
62+#endif
63
64 {
65 "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING,
66@@ -758,11 +762,13 @@ mc_args_show_info (void)
67 return FALSE;
68 }
69
70+#ifdef ENABLE_CONFIGURE_ARGS
71 if (mc_args__show_configure_opts)
72 {
73 show_configure_options ();
74 return FALSE;
75 }
76+#endif
77
78 return TRUE;
79 }
80diff --git a/src/textconf.c b/src/textconf.c
81index 1e0613e58..f39b9e028 100644
82--- a/src/textconf.c
83+++ b/src/textconf.c
84@@ -232,10 +232,12 @@ show_datadirs_extended (void)
85
86 /* --------------------------------------------------------------------------------------------- */
87
88+#ifdef ENABLE_CONFIGURE_ARGS
89 void
90 show_configure_options (void)
91 {
92 (void) printf ("%s\n", MC_CONFIGURE_ARGS);
93 }
94+#endif
95
96 /* --------------------------------------------------------------------------------------------- */
97--
982.23.0
99
diff --git a/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch b/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch
deleted file mode 100644
index 8f357378d0..0000000000
--- a/meta/recipes-extended/mc/files/0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch
+++ /dev/null
@@ -1,110 +0,0 @@
1From 0d677a014a87b968d79eea2353ac4e342b0fd4ca Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyfox@gentoo.org>
3Date: Wed, 11 Sep 2019 22:58:18 +0100
4Subject: [PATCH] Ticket #3629: configure.ac: drop bundled gettext
5
6Bundled libintl did not support linking to internal static
7libraries (libmc in our case): directly specified static
8libraries are not pulled by libtool and are not usable for
9dynamic libraries as PIC-related flags are not passed for
10compilation.
11
12This renders bundled libintl library unusable.
13
14The change drops libintl bundling support and always relies
15on external libintl (or falls back to disabled NLS).
16
17On a related note gettext-0.20 drops support for bundling
18or libintl and this change will ease migration to newer version.
19
20The change is tested on x86_64-gentoo-linux-musl: mc builds
21and links all tests successfully. A few tests fail for lack
22of NLS support.
23
24Upstream-Status: Backport [https://github.com/MidnightCommander/mc/commit/f30e6ff283f4bc86177e4360de94dad794678395]
25Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
26Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
27Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
28---
29 Makefile.am | 2 +-
30 configure.ac | 5 +++--
31 doc/doxygen.cfg | 2 +-
32 lib/Makefile.am | 2 +-
33 m4.include/mc-i18n.m4 | 5 -----
34 5 files changed, 6 insertions(+), 10 deletions(-)
35
36diff --git a/Makefile.am b/Makefile.am
37index ac05a83..f86f6ed 100644
38--- a/Makefile.am
39+++ b/Makefile.am
40@@ -1,7 +1,7 @@
41 ## Process this file with automake to create Makefile.in.
42 AUTOMAKE_OPTIONS = 1.5
43
44-SUBDIRS = intl po lib src doc contrib misc
45+SUBDIRS = po lib src doc contrib misc
46
47 if HAVE_TESTS
48 SUBDIRS += tests
49diff --git a/configure.ac b/configure.ac
50index a1948f6..bbc9e71 100644
51--- a/configure.ac
52+++ b/configure.ac
53@@ -272,7 +272,9 @@ dnl ############################################################################
54 dnl Internationalization
55 dnl ############################################################################
56
57-AM_GNU_GETTEXT([no-libtool], [need-ngettext])
58+AC_CHECK_FUNCS([setlocale])
59+
60+AM_GNU_GETTEXT([external], [need-ngettext])
61 AM_GNU_GETTEXT_VERSION([0.18.1])
62
63 mc_I18N
64@@ -680,7 +682,6 @@ doc/hlp/pl/Makefile
65 doc/hlp/ru/Makefile
66 doc/hlp/sr/Makefile
67
68-intl/Makefile
69 po/Makefile.in
70 ])
71
72diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg
73index 07bc973..1118062 100644
74--- a/doc/doxygen.cfg
75+++ b/doc/doxygen.cfg
76@@ -91,7 +91,7 @@ FILE_PATTERNS = *.c \
77 RECURSIVE = YES
78 EXCLUDE =
79 EXCLUDE_SYMLINKS = NO
80-EXCLUDE_PATTERNS = */intl/* */tests/* */.git/*
81+EXCLUDE_PATTERNS = */tests/* */.git/*
82 EXCLUDE_SYMBOLS =
83 EXAMPLE_PATH = $(SRCDIR)
84 EXAMPLE_PATTERNS =
85diff --git a/lib/Makefile.am b/lib/Makefile.am
86index c448e2d..455f9dd 100644
87--- a/lib/Makefile.am
88+++ b/lib/Makefile.am
89@@ -74,4 +74,4 @@ else
90 libmc_la_LIBADD += $(GLIB_LIBS)
91 endif
92
93-libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(LIBINTL)
94+libmc_la_LIBADD += $(PCRE_LIBS)
95diff --git a/m4.include/mc-i18n.m4 b/m4.include/mc-i18n.m4
96index dd10d00..ec08324 100644
97--- a/m4.include/mc-i18n.m4
98+++ b/m4.include/mc-i18n.m4
99@@ -8,11 +8,6 @@ dnl @license GPL
100 dnl @copyright Free Software Foundation, Inc.
101
102 AC_DEFUN([mc_I18N],[
103-
104- if test "x$USE_INCLUDED_LIBINTL" = xyes; then
105- CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl"
106- fi
107-
108 dnl User visible support for charset conversion.
109 AC_ARG_ENABLE([charset],
110 AS_HELP_STRING([--enable-charset], [Support for charset selection and conversion @<:@yes@:>@]))
diff --git a/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch b/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch
new file mode 100644
index 0000000000..824c12f8d2
--- /dev/null
+++ b/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch
@@ -0,0 +1,59 @@
1From 58dd59637ac5c6340ddfe96ad8b76883e4da20ef Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyfox@gentoo.org>
3Date: Tue, 3 Mar 2020 09:26:12 +0000
4Subject: [PATCH] Ticket #4070: misc/Makefile.am: install mc.lib only once.
5
6Before the change mc.lib was installed twice due to being
7in two _DATA variables:
8
9dist_pkgdata_DATA = \
10 mc.lib
11
12pkgdata_DATA = \
13 $(dist_pkgdata_DATA) \
14 $(PKGDATA_OUT)
15
16This causes occasional install failures when two parallel
17`/usr/bin/install` calls race in installing the file:
18
19$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install
20...
21 /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
22 -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
23 /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
24 -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
25...
26 /usr/bin/install: cannot create regular file
27 '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists
28
29After the change mc.lib is present only in dist_pkgdata_DATA.
30
31Upstream-Status: Backport [https://github.com/MidnightCommander/mc/commit/afb09f7cd7024484845ade25e15b8b93d6cf2d2c]
32
33Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
34Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
35Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
36---
37 misc/Makefile.am | 2 --
38 1 file changed, 2 deletions(-)
39
40diff --git a/misc/Makefile.am b/misc/Makefile.am
41index 8ed1826..24f4a0e 100644
42--- a/misc/Makefile.am
43+++ b/misc/Makefile.am
44@@ -17,7 +17,6 @@ dist_pkgdata_DATA = \
45 mc.lib
46
47 pkgdata_DATA = \
48- $(dist_pkgdata_DATA) \
49 $(PKGDATA_OUT)
50
51 SCRIPTS_IN = \
52@@ -54,7 +53,6 @@ EXTRA_DIST = \
53 $(LIBFILES_SCRIPT) \
54 $(SCRIPTS_IN) \
55 $(noinst_DATA) \
56- $(dist_pkgdata_DATA) \
57 $(PKGDATA_IN)
58
59 install-data-hook:
diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.24.bb
index ead348b92e..034df2a422 100644
--- a/meta/recipes-extended/mc/mc_4.8.23.bb
+++ b/meta/recipes-extended/mc/mc_4.8.24.bb
@@ -9,12 +9,11 @@ RRECOMMENDS_${PN} = "ncurses-terminfo"
9 9
10SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ 10SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
11 file://0001-mc-replace-perl-w-with-use-warnings.patch \ 11 file://0001-mc-replace-perl-w-with-use-warnings.patch \
12 file://0001-Add-option-to-control-configure-args.patch \
13 file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \
14 file://nomandate.patch \ 12 file://nomandate.patch \
13 file://0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch \
15 " 14 "
16SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" 15SRC_URI[md5sum] = "2621de1fa9058a9c41a4248becc969f9"
17SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" 16SRC_URI[sha256sum] = "cfcc4d0546d0c3a88645a8bf71612ed36647ea3264d973b1f28183a0c84bae34"
18 17
19inherit autotools gettext pkgconfig 18inherit autotools gettext pkgconfig
20 19
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 06:35:06 +0000