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 12:40:09 +0000 |
| commit | 2ac64d0c351c63068a91fec5d73d848cfde8d173 (patch) | |
| tree | 4ce6c2c22f9ee1788678028ea7d0ad63496f6886 /meta/recipes-extended/minicom/minicom-2.6.1 | |
| parent | f79819fe3d78c1da74753174efbc2fb2b1239da0 (diff) | |
| download | openembedded-core-2ac64d0c351c63068a91fec5d73d848cfde8d173.tar.gz openembedded-core-2ac64d0c351c63068a91fec5d73d848cfde8d173.tar.bz2 openembedded-core-2ac64d0c351c63068a91fec5d73d848cfde8d173.zip | |
minicom: upgrade to 2.6.1
Signed-off-by: Shane Wang <shane.wang@intel.com>
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 @@ +Upstream-Status: Inappropriate [others] + +--- minicom-2.1/src/window.c.orig 2006-06-14 17:49:53.000000000 +0200 ++++ minicom-2.1/src/window.c 2006-06-14 17:50:14.000000000 +0200 +@@ -62,7 +62,7 @@ + static char *CS, *SF, *SR, *VB, *BL; + static char *VE, *VI, *KS, *KE; + static char *CD, *CL, *IC, *DC; +-static char *BC, *CR, *NL; ++static char *mcBC, *CR, *NL; + #if ST_LINE + static char *TS, *FS, *DS; + #endif +@@ -322,8 +322,8 @@ + else if (NL != CNULL && x == 0 && x == curx && y == cury + 1) + outstr(NL); + #endif +- else if (BC != CNULL && y == cury && x == curx - 1) +- outstr(BC); ++ else if (mcBC != CNULL && y == cury && x == curx - 1) ++ outstr(mcBC); + else + outstr(tgoto(CM, x, y)); + curx = x; +@@ -1918,7 +1918,7 @@ + CL = tgetstr("cl", &_tptr); + IC = tgetstr("ic", &_tptr); + DC = tgetstr("dc", &_tptr); +- BC = tgetstr("bc", &_tptr); ++ mcBC = tgetstr("bc", &_tptr); + CR = tgetstr("cr", &_tptr); + NL = tgetstr("nl", &_tptr); + AC = tgetstr("ac", &_tptr); +@@ -1967,10 +1967,10 @@ + _has_am = tgetflag("am"); + _mv_standout = tgetflag("ms"); + if (tgetflag("bs")) { +- if (BC == CNULL) BC = "\b"; ++ if (mcBC == CNULL) mcBC = "\b"; + } + else +- BC = CNULL; ++ mcBC = CNULL; + + /* Special IBM box-drawing characters */ + 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 @@ +Upstream-Status: Pending + +--- minicom-2.3/src/minicom.c-orig 2009-06-08 14:49:07.000000000 +0200 ++++ minicom-2.3/src/minicom.c 2009-06-08 14:50:23.000000000 +0200 +@@ -63,6 +63,10 @@ + } + #endif /*DEBUG*/ + ++#ifdef __USE_GNU ++#define getline minicom_getline ++#endif ++ + /* + * Sub - menu's. + */ |