diff options
author | Shane Wang <shane.wang@intel.com> | 2012-03-14 23:05:07 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-21 13:03:45 +0000 |
commit | fbf503aa9f1cfe5b706e3a778dbc1f08b8d9a0b7 (patch) | |
tree | c076b871a88960eb2311a40b1a62a951d73310c8 /meta/recipes-extended/minicom/minicom-2.6.1 | |
parent | 87f284f70dcb04f3cf3b8557d0b79976a4b59469 (diff) | |
download | poky-fbf503aa9f1cfe5b706e3a778dbc1f08b8d9a0b7.tar.gz |
minicom: upgrade to 2.6.1
(From OE-Core rev: 2ac64d0c351c63068a91fec5d73d848cfde8d173)
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/minicom/minicom-2.6.1')
-rw-r--r-- | meta/recipes-extended/minicom/minicom-2.6.1/gcc4-scope.patch | 46 | ||||
-rw-r--r-- | meta/recipes-extended/minicom/minicom-2.6.1/rename-conflicting-functions.patch | 15 |
2 files changed, 61 insertions, 0 deletions
diff --git a/meta/recipes-extended/minicom/minicom-2.6.1/gcc4-scope.patch b/meta/recipes-extended/minicom/minicom-2.6.1/gcc4-scope.patch new file mode 100644 index 0000000000..0660cb0c15 --- /dev/null +++ b/meta/recipes-extended/minicom/minicom-2.6.1/gcc4-scope.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | Upstream-Status: Inappropriate [others] | ||
2 | |||
3 | --- minicom-2.1/src/window.c.orig 2006-06-14 17:49:53.000000000 +0200 | ||
4 | +++ minicom-2.1/src/window.c 2006-06-14 17:50:14.000000000 +0200 | ||
5 | @@ -62,7 +62,7 @@ | ||
6 | static char *CS, *SF, *SR, *VB, *BL; | ||
7 | static char *VE, *VI, *KS, *KE; | ||
8 | static char *CD, *CL, *IC, *DC; | ||
9 | -static char *BC, *CR, *NL; | ||
10 | +static char *mcBC, *CR, *NL; | ||
11 | #if ST_LINE | ||
12 | static char *TS, *FS, *DS; | ||
13 | #endif | ||
14 | @@ -322,8 +322,8 @@ | ||
15 | else if (NL != CNULL && x == 0 && x == curx && y == cury + 1) | ||
16 | outstr(NL); | ||
17 | #endif | ||
18 | - else if (BC != CNULL && y == cury && x == curx - 1) | ||
19 | - outstr(BC); | ||
20 | + else if (mcBC != CNULL && y == cury && x == curx - 1) | ||
21 | + outstr(mcBC); | ||
22 | else | ||
23 | outstr(tgoto(CM, x, y)); | ||
24 | curx = x; | ||
25 | @@ -1918,7 +1918,7 @@ | ||
26 | CL = tgetstr("cl", &_tptr); | ||
27 | IC = tgetstr("ic", &_tptr); | ||
28 | DC = tgetstr("dc", &_tptr); | ||
29 | - BC = tgetstr("bc", &_tptr); | ||
30 | + mcBC = tgetstr("bc", &_tptr); | ||
31 | CR = tgetstr("cr", &_tptr); | ||
32 | NL = tgetstr("nl", &_tptr); | ||
33 | AC = tgetstr("ac", &_tptr); | ||
34 | @@ -1967,10 +1967,10 @@ | ||
35 | _has_am = tgetflag("am"); | ||
36 | _mv_standout = tgetflag("ms"); | ||
37 | if (tgetflag("bs")) { | ||
38 | - if (BC == CNULL) BC = "\b"; | ||
39 | + if (mcBC == CNULL) mcBC = "\b"; | ||
40 | } | ||
41 | else | ||
42 | - BC = CNULL; | ||
43 | + mcBC = CNULL; | ||
44 | |||
45 | /* Special IBM box-drawing characters */ | ||
46 | D_UL = 201; | ||
diff --git a/meta/recipes-extended/minicom/minicom-2.6.1/rename-conflicting-functions.patch b/meta/recipes-extended/minicom/minicom-2.6.1/rename-conflicting-functions.patch new file mode 100644 index 0000000000..1a50f18856 --- /dev/null +++ b/meta/recipes-extended/minicom/minicom-2.6.1/rename-conflicting-functions.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- minicom-2.3/src/minicom.c-orig 2009-06-08 14:49:07.000000000 +0200 | ||
4 | +++ minicom-2.3/src/minicom.c 2009-06-08 14:50:23.000000000 +0200 | ||
5 | @@ -63,6 +63,10 @@ | ||
6 | } | ||
7 | #endif /*DEBUG*/ | ||
8 | |||
9 | +#ifdef __USE_GNU | ||
10 | +#define getline minicom_getline | ||
11 | +#endif | ||
12 | + | ||
13 | /* | ||
14 | * Sub - menu's. | ||
15 | */ | ||