summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2005-05-29 11:40:57 +0000
committerAlin Năstac <mrness@gentoo.org>2005-05-29 11:40:57 +0000
commit42491ba22de19181f9585cce80d573e7bdd0b1d9 (patch)
tree1f2779b6257a0b3252554af5b6f8d10fc790abfd /net-dialup/minicom
parentcorrected gphoto2 dependency (diff)
downloadgentoo-2-42491ba22de19181f9585cce80d573e7bdd0b1d9.tar.gz
gentoo-2-42491ba22de19181f9585cce80d573e7bdd0b1d9.tar.bz2
gentoo-2-42491ba22de19181f9585cce80d573e7bdd0b1d9.zip
gcc-4.0 fix (#93120)
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-dialup/minicom')
-rw-r--r--net-dialup/minicom/ChangeLog6
-rw-r--r--net-dialup/minicom/Manifest7
-rw-r--r--net-dialup/minicom/files/minicom-2.1-gcc4.patch12
-rw-r--r--net-dialup/minicom/minicom-2.1-r1.ebuild6
4 files changed, 25 insertions, 6 deletions
diff --git a/net-dialup/minicom/ChangeLog b/net-dialup/minicom/ChangeLog
index b80c8cb19436..ee7ea416378b 100644
--- a/net-dialup/minicom/ChangeLog
+++ b/net-dialup/minicom/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dialup/minicom
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.28 2005/05/21 12:36:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.29 2005/05/29 11:40:57 mrness Exp $
+
+ 29 May 2005; Alin Nastac <mrness@gentoo.org>
+ +files/minicom-2.1-gcc4.patch, minicom-2.1-r1.ebuild:
+ Apply patch from upstream CVS to allow compiling with gcc-4.0 (#93120).
21 May 2005; Markus Rothe <corsair@gentoo.org> minicom-2.1-r1.ebuild:
Added ~ppc64 to KEYWORDS
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index aef20106bfee..066926d8b304 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -1,6 +1,7 @@
+MD5 05bb9a503d2f3af7805f7988a4d4ccb6 minicom-2.1-r1.ebuild 1070
MD5 ade372f0072fc4fba485a5a9d096a09c ChangeLog 3454
MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 23a78a422ace3a54c31091ba17883aeb minicom-2.1-r1.ebuild 1038
-MD5 67f667abec40aca4b4418ae3937105ff files/digest-minicom-2.1-r1 63
-MD5 a31777cb2fefdf6dde761b58a8076333 files/minicom-2.1-memcpy-bounds.diff 487
MD5 6362e781f7e7a1300d8a3c7b602ddd6f files/minirc.dfl 66
+MD5 e1a7644e6acfcf2a67f65c032167bcf6 files/minicom-2.1-gcc4.patch 421
+MD5 a31777cb2fefdf6dde761b58a8076333 files/minicom-2.1-memcpy-bounds.diff 487
+MD5 67f667abec40aca4b4418ae3937105ff files/digest-minicom-2.1-r1 63
diff --git a/net-dialup/minicom/files/minicom-2.1-gcc4.patch b/net-dialup/minicom/files/minicom-2.1-gcc4.patch
new file mode 100644
index 000000000000..b85238859edb
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.1-gcc4.patch
@@ -0,0 +1,12 @@
+diff -ur minicom-2.1-orig/src/window.c minicom-2.1/src/window.c
+--- minicom-2.1-orig/src/window.c 2005-05-28 19:59:42.000000000 -0400
++++ minicom-2.1/src/window.c 2005-05-28 20:00:22.000000000 -0400
+@@ -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 *CR, *NL;
+ #if ST_LINE
+ static char *TS, *FS, *DS;
+ #endif
diff --git a/net-dialup/minicom/minicom-2.1-r1.ebuild b/net-dialup/minicom/minicom-2.1-r1.ebuild
index 8b2d1c482f9d..35a1e7cbd2b8 100644
--- a/net-dialup/minicom/minicom-2.1-r1.ebuild
+++ b/net-dialup/minicom/minicom-2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.1-r1.ebuild,v 1.13 2005/05/21 12:36:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.1-r1.ebuild,v 1.14 2005/05/29 11:40:57 mrness Exp $
inherit eutils
@@ -22,7 +22,9 @@ src_unpack() {
cd ${S}
# solar@gentoo.org (Mar 24 2004)
# propolice/ssp caught minicom going out of bounds here.
- epatch ${FILESDIR}/${PN}-2.1-memcpy-bounds.diff
+ epatch ${FILESDIR}/${P}-memcpy-bounds.diff
+
+ epatch ${FILESDIR}/${P}-gcc4.patch
}
src_compile() {