1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00

minicom: upgrade to 2.6.2

- all patches removed;
- fixes already integrated in source code;
- gcc4-scope.patch removed as was not enabled;

(From OE-Core rev: b0e41a317791aae943370f4e1affcfae32797c87)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Cristian Iorga
2013-02-25 18:24:45 +02:00
committed by Richard Purdie
parent 3497b2995e
commit e4b7b10372
4 changed files with 4 additions and 90 deletions
@@ -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;
@@ -1,21 +0,0 @@
Upstream-Status: Pending
This patch fixes following issue with automake 1.12
| configure.in:193: error: automatic de-ANSI-fication support has been removed
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
2012/05/03
Index: minicom-2.6.1/configure.in
===================================================================
--- minicom-2.6.1.orig/configure.in
+++ minicom-2.6.1/configure.in
@@ -190,7 +190,6 @@ AC_CHECK_HEADERS(stdarg.h varargs.h term
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
-AM_C_PROTOTYPES
AC_TYPE_UID_T
AC_TYPE_MODE_T
AC_TYPE_PID_T
@@ -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.
*/
@@ -6,16 +6,12 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \
file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81"
PR = "r1"
PR = "r0"
SRC_URI = "http://alioth.debian.org/frs/download.php/3700/minicom-${PV}.tar.gz \
file://rename-conflicting-functions.patch \
file://minicom_fix_for_automake-1.12.patch \
"
# file://gcc4-scope.patch
SRC_URI = "http://alioth.debian.org/frs/download.php/3869/minicom-${PV}.tar.gz"
SRC_URI[md5sum] = "435fb410a5bfa9bb20d4248b3ca53529"
SRC_URI[sha256sum] = "a6e7bf533c3796f3a67a7d109f328d46497c687ed13885bd1be4ce0548fc4f56"
SRC_URI[md5sum] = "203c56c4b447f45e2301b0cc4e83da3c"
SRC_URI[sha256sum] = "f3cf215f7914ffa5528e398962176102ad74df27ba38958142f56aa6d15c9168"
inherit autotools gettext