summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-02-25 18:24:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-28 23:15:52 +0000
commite4b7b10372ce0b5613e1034abe3a73b4033ea1f8 (patch)
treeeb8bff782543edbd555ff2381c5ae5b887fc4677
parent3497b2995e0b026c2695d411ba817c60e011381a (diff)
downloadpoky-e4b7b10372ce0b5613e1034abe3a73b4033ea1f8.tar.gz
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>
-rw-r--r--meta/recipes-extended/minicom/minicom-2.6.1/gcc4-scope.patch46
-rw-r--r--meta/recipes-extended/minicom/minicom-2.6.1/minicom_fix_for_automake-1.12.patch21
-rw-r--r--meta/recipes-extended/minicom/minicom-2.6.1/rename-conflicting-functions.patch15
-rw-r--r--meta/recipes-extended/minicom/minicom_2.6.2.bb (renamed from meta/recipes-extended/minicom/minicom_2.6.1.bb)12
4 files changed, 4 insertions, 90 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
deleted file mode 100644
index 0660cb0c15..0000000000
--- a/meta/recipes-extended/minicom/minicom-2.6.1/gcc4-scope.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1Upstream-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/minicom_fix_for_automake-1.12.patch b/meta/recipes-extended/minicom/minicom-2.6.1/minicom_fix_for_automake-1.12.patch
deleted file mode 100644
index aba6298bba..0000000000
--- a/meta/recipes-extended/minicom/minicom-2.6.1/minicom_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Pending
2
3This patch fixes following issue with automake 1.12
4
5| configure.in:193: error: automatic de-ANSI-fication support has been removed
6
7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
82012/05/03
9
10Index: minicom-2.6.1/configure.in
11===================================================================
12--- minicom-2.6.1.orig/configure.in
13+++ minicom-2.6.1/configure.in
14@@ -190,7 +190,6 @@ AC_CHECK_HEADERS(stdarg.h varargs.h term
15
16 dnl Checks for typedefs, structures, and compiler characteristics.
17 AC_C_CONST
18-AM_C_PROTOTYPES
19 AC_TYPE_UID_T
20 AC_TYPE_MODE_T
21 AC_TYPE_PID_T
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
deleted file mode 100644
index 1a50f18856..0000000000
--- a/meta/recipes-extended/minicom/minicom-2.6.1/rename-conflicting-functions.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-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 */
diff --git a/meta/recipes-extended/minicom/minicom_2.6.1.bb b/meta/recipes-extended/minicom/minicom_2.6.2.bb
index b54853df46..0d65e80f51 100644
--- a/meta/recipes-extended/minicom/minicom_2.6.1.bb
+++ b/meta/recipes-extended/minicom/minicom_2.6.2.bb
@@ -6,16 +6,12 @@ LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \
7 file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81" 7 file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81"
8 8
9PR = "r1" 9PR = "r0"
10 10
11SRC_URI = "http://alioth.debian.org/frs/download.php/3700/minicom-${PV}.tar.gz \ 11SRC_URI = "http://alioth.debian.org/frs/download.php/3869/minicom-${PV}.tar.gz"
12 file://rename-conflicting-functions.patch \
13 file://minicom_fix_for_automake-1.12.patch \
14 "
15# file://gcc4-scope.patch
16 12
17SRC_URI[md5sum] = "435fb410a5bfa9bb20d4248b3ca53529" 13SRC_URI[md5sum] = "203c56c4b447f45e2301b0cc4e83da3c"
18SRC_URI[sha256sum] = "a6e7bf533c3796f3a67a7d109f328d46497c687ed13885bd1be4ce0548fc4f56" 14SRC_URI[sha256sum] = "f3cf215f7914ffa5528e398962176102ad74df27ba38958142f56aa6d15c9168"
19 15
20inherit autotools gettext 16inherit autotools gettext
21 17