From 41bf05ee1eda312ee9c5707d0aa15979fefb9dbc Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 14 Jun 2006 15:55:07 +0000
Subject: minicom-2.1: build fix for gcc, closes #1087

---
 packages/minicom/minicom-2.1/gcc4-scope.patch | 44 +++++++++++++++++++++++++++
 packages/minicom/minicom_2.1.bb               |  3 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 packages/minicom/minicom-2.1/gcc4-scope.patch

(limited to 'packages')

diff --git a/packages/minicom/minicom-2.1/gcc4-scope.patch b/packages/minicom/minicom-2.1/gcc4-scope.patch
new file mode 100644
index 0000000000..5bd47bd354
--- /dev/null
+++ b/packages/minicom/minicom-2.1/gcc4-scope.patch
@@ -0,0 +1,44 @@
+--- 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/packages/minicom/minicom_2.1.bb b/packages/minicom/minicom_2.1.bb
index b2e25d06f7..c4a1c3018a 100644
--- a/packages/minicom/minicom_2.1.bb
+++ b/packages/minicom/minicom_2.1.bb
@@ -2,7 +2,8 @@ SECTION = "console/network"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
 SRC_URI = "http://alioth.debian.org/download.php/123/minicom-${PV}.tar.gz \
-	file://configure.patch;patch=1"
+	file://configure.patch;patch=1 \
+	file://gcc4-scope.patch;patch=1"
 
 inherit autotools gettext
 
-- 
cgit v1.2.3