From fbf503aa9f1cfe5b706e3a778dbc1f08b8d9a0b7 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Wed, 14 Mar 2012 23:05:07 +0800 Subject: minicom: upgrade to 2.6.1 (From OE-Core rev: 2ac64d0c351c63068a91fec5d73d848cfde8d173) Signed-off-by: Shane Wang Signed-off-by: Richard Purdie --- .../minicom/minicom-2.5/gcc4-scope.patch | 46 ---------------------- .../minicom-2.5/rename-conflicting-functions.patch | 15 ------- .../minicom/minicom-2.6.1/gcc4-scope.patch | 46 ++++++++++++++++++++++ .../rename-conflicting-functions.patch | 15 +++++++ meta/recipes-extended/minicom/minicom_2.5.bb | 22 ----------- meta/recipes-extended/minicom/minicom_2.6.1.bb | 22 +++++++++++ 6 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 meta/recipes-extended/minicom/minicom-2.5/gcc4-scope.patch delete mode 100644 meta/recipes-extended/minicom/minicom-2.5/rename-conflicting-functions.patch create mode 100644 meta/recipes-extended/minicom/minicom-2.6.1/gcc4-scope.patch create mode 100644 meta/recipes-extended/minicom/minicom-2.6.1/rename-conflicting-functions.patch delete mode 100644 meta/recipes-extended/minicom/minicom_2.5.bb create mode 100644 meta/recipes-extended/minicom/minicom_2.6.1.bb (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/minicom/minicom-2.5/gcc4-scope.patch b/meta/recipes-extended/minicom/minicom-2.5/gcc4-scope.patch deleted file mode 100644 index 0660cb0c15..0000000000 --- a/meta/recipes-extended/minicom/minicom-2.5/gcc4-scope.patch +++ /dev/null @@ -1,46 +0,0 @@ -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.5/rename-conflicting-functions.patch b/meta/recipes-extended/minicom/minicom-2.5/rename-conflicting-functions.patch deleted file mode 100644 index 1a50f18856..0000000000 --- a/meta/recipes-extended/minicom/minicom-2.5/rename-conflicting-functions.patch +++ /dev/null @@ -1,15 +0,0 @@ -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. - */ 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. + */ diff --git a/meta/recipes-extended/minicom/minicom_2.5.bb b/meta/recipes-extended/minicom/minicom_2.5.bb deleted file mode 100644 index 8e93d4d493..0000000000 --- a/meta/recipes-extended/minicom/minicom_2.5.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Text-based modem control and terminal emulation program" -DESCRIPTION = "Minicom is a text-based modem control and terminal emulation program for Unix-like operating systems" -SECTION = "console/network" -DEPENDS = "ncurses" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \ - file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81" - -SRC_URI = "http://alioth.debian.org/frs/download.php/3487/minicom-${PV}.tar.gz \ - file://rename-conflicting-functions.patch \ - " -# file://gcc4-scope.patch - -SRC_URI[md5sum] = "a5117d4d21e2c9e825edb586ee2fe8d2" -SRC_URI[sha256sum] = "2aa43f98580d3c9c59b12895f15783695cde85472f6bfc7974bcc0935af0a8fd" - -inherit autotools gettext - -do_install() { - for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done -} - diff --git a/meta/recipes-extended/minicom/minicom_2.6.1.bb b/meta/recipes-extended/minicom/minicom_2.6.1.bb new file mode 100644 index 0000000000..3a9f9340dd --- /dev/null +++ b/meta/recipes-extended/minicom/minicom_2.6.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "Text-based modem control and terminal emulation program" +DESCRIPTION = "Minicom is a text-based modem control and terminal emulation program for Unix-like operating systems" +SECTION = "console/network" +DEPENDS = "ncurses" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \ + file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81" + +SRC_URI = "http://alioth.debian.org/frs/download.php/3700/minicom-${PV}.tar.gz \ + file://rename-conflicting-functions.patch \ + " +# file://gcc4-scope.patch + +SRC_URI[md5sum] = "435fb410a5bfa9bb20d4248b3ca53529" +SRC_URI[sha256sum] = "a6e7bf533c3796f3a67a7d109f328d46497c687ed13885bd1be4ce0548fc4f56" + +inherit autotools gettext + +do_install() { + for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done +} + -- cgit v1.2.3-54-g00ecf