diff options
Diffstat (limited to 'meta/recipes-extended/parted')
-rw-r--r-- | meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch | 34 | ||||
-rw-r--r-- | meta/recipes-extended/parted/parted_3.1.bb | 1 |
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 | |||
2 | From: Gustavo Zacarias | ||
3 | Subject: bug#16929: [PATCH] ui: switch to new-style readline typedef | ||
4 | Date: Mon, 3 Mar 2014 10:40:08 -0300 | ||
5 | |||
6 | The CPPFunction typedef (among others) have been deprecated in favour of | ||
7 | specific prototyped typedefs since readline 4.2 (circa 2001). | ||
8 | It's been working since because compatibility typedefs have been in | ||
9 | place until they where removed in the recent readline 6.3 release. | ||
10 | Switch to the new style to avoid build breakage. | ||
11 | |||
12 | Signed-off-by: Gustavo Zacarias <address@hidden> | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | |||
16 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
17 | |||
18 | --- | ||
19 | parted/ui.c | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/parted/ui.c b/parted/ui.c | ||
23 | index 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 | " |