summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-03-04 14:51:02 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-05 15:50:21 +0000
commit593aef7932d5cc204acc582758484314ba6ffbae (patch)
tree7665ca66063e83861a90c0df3270f9c7472d759a /meta/recipes-extended
parentda4c775412d8e3dbaa09842e75e9e8e7918f597a (diff)
downloadpoky-593aef7932d5cc204acc582758484314ba6ffbae.tar.gz
parted: add patch to handle deprecated readline function
(From OE-Core rev: ebaa5485abda86691b0eeadaf689d75072357178) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch34
-rw-r--r--meta/recipes-extended/parted/parted_3.1.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch b/meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch
new file mode 100644
index 0000000000..c4ca06d407
--- /dev/null
+++ b/meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch
@@ -0,0 +1,34 @@
1
2From: Gustavo Zacarias
3Subject: bug#16929: [PATCH] ui: switch to new-style readline typedef
4Date: Mon, 3 Mar 2014 10:40:08 -0300
5
6The CPPFunction typedef (among others) have been deprecated in favour of
7specific prototyped typedefs since readline 4.2 (circa 2001).
8It's been working since because compatibility typedefs have been in
9place until they where removed in the recent readline 6.3 release.
10Switch to the new style to avoid build breakage.
11
12Signed-off-by: Gustavo Zacarias <address@hidden>
13
14Upstream-Status: Backport
15
16Signed-off-by: Saul Wold <sgw@linux.intel.com>
17
18---
19 parted/ui.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/parted/ui.c b/parted/ui.c
23index 786deed..b33f6fc 100644
24--- a/parted/ui.c
25+++ b/parted/ui.c
26@@ -1470,7 +1470,7 @@ init_readline (void)
27 #ifdef HAVE_LIBREADLINE
28 if (!opt_script_mode) {
29 rl_initialize ();
30- rl_attempted_completion_function = (CPPFunction*) complete_function;
31+ rl_attempted_completion_function = (rl_completion_func_t *) complete_function;
32 readline_state.in_readline = 0;
33 }
34 #endif
diff --git a/meta/recipes-extended/parted/parted_3.1.bb b/meta/recipes-extended/parted/parted_3.1.bb
index 1e07da4d60..8344ea82ce 100644
--- a/meta/recipes-extended/parted/parted_3.1.bb
+++ b/meta/recipes-extended/parted/parted_3.1.bb
@@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
12 file://fix-git-version-gen.patch \ 12 file://fix-git-version-gen.patch \
13 file://fix-doc-mandir.patch \ 13 file://fix-doc-mandir.patch \
14 file://fix-dvh-overflows.patch \ 14 file://fix-dvh-overflows.patch \
15 file://fix-deprecated-readline.patch \
15 file://run-ptest \ 16 file://run-ptest \
16 file://Makefile \ 17 file://Makefile \
17" 18"