diff options
Diffstat (limited to 'recipes-extended')
-rw-r--r-- | recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch | 52 | ||||
-rw-r--r-- | recipes-extended/mc/mc_4.7.5.2.bb | 1 |
2 files changed, 53 insertions, 0 deletions
diff --git a/recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch b/recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch new file mode 100644 index 0000000..dbf18ca --- /dev/null +++ b/recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 56aef108be94019c7828c14f0c4849336f811847 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 17 Dec 2019 16:34:06 +0100 | ||
4 | Subject: [PATCH] Fix builds wit the gettext 0.20 | ||
5 | |||
6 | Upstream-Status: Inappropriate [fixing an old version] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | Makefile.am | 2 +- | ||
10 | configure.ac | 2 +- | ||
11 | src/Makefile.am | 2 +- | ||
12 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/Makefile.am b/Makefile.am | ||
15 | index ab4f9b7..b27ab4a 100644 | ||
16 | --- a/Makefile.am | ||
17 | +++ b/Makefile.am | ||
18 | @@ -1,7 +1,7 @@ | ||
19 | ## Process this file with automake to create Makefile.in. | ||
20 | AUTOMAKE_OPTIONS = 1.5 | ||
21 | |||
22 | -SUBDIRS = intl po lib src doc contrib misc | ||
23 | +SUBDIRS = po lib src doc contrib misc | ||
24 | |||
25 | EXTRA_DIST = | ||
26 | |||
27 | diff --git a/configure.ac b/configure.ac | ||
28 | index c05902d..0430714 100644 | ||
29 | --- a/configure.ac | ||
30 | +++ b/configure.ac | ||
31 | @@ -88,7 +88,7 @@ fi | ||
32 | dnl | ||
33 | dnl Internationalization | ||
34 | dnl | ||
35 | -AM_GNU_GETTEXT(no-libtool, need-ngettext) | ||
36 | +AM_GNU_GETTEXT([external],no-libtool, need-ngettext) | ||
37 | AM_GNU_GETTEXT_VERSION(0.14.3) | ||
38 | |||
39 | if test "x$USE_INCLUDED_LIBINTL" = xyes; then | ||
40 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
41 | index 2da86c3..1859f0d 100644 | ||
42 | --- a/src/Makefile.am | ||
43 | +++ b/src/Makefile.am | ||
44 | @@ -52,7 +52,7 @@ else | ||
45 | mc_LDADD += $(GLIB_LIBS) | ||
46 | endif | ||
47 | |||
48 | -mc_LDADD += $(PCRE_LIBS) $(LIBICONV) $(INTLLIBS) | ||
49 | +mc_LDADD += $(PCRE_LIBS) $(INTLLIBS) | ||
50 | |||
51 | SRC_mc_conssaver = \ | ||
52 | cons.handler.c consaver/cons.saver.h | ||
diff --git a/recipes-extended/mc/mc_4.7.5.2.bb b/recipes-extended/mc/mc_4.7.5.2.bb index ca84966..e26bfd9 100644 --- a/recipes-extended/mc/mc_4.7.5.2.bb +++ b/recipes-extended/mc/mc_4.7.5.2.bb | |||
@@ -11,6 +11,7 @@ PR = "r3" | |||
11 | SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ | 11 | SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ |
12 | file://mc-CTRL.patch \ | 12 | file://mc-CTRL.patch \ |
13 | file://0001-disable-Ctrl-g-key-and-Ctrl-key.patch \ | 13 | file://0001-disable-Ctrl-g-key-and-Ctrl-key.patch \ |
14 | file://0001-Fix-builds-wit-the-gettext-0.20.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | SRC_URI[md5sum] = "bdae966244496cd4f6d282d80c9cf3c6" | 17 | SRC_URI[md5sum] = "bdae966244496cd4f6d282d80c9cf3c6" |