summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2005-07-23 21:49:41 +0000
committerAlin Năstac <mrness@gentoo.org>2005-07-23 21:49:41 +0000
commitfbcf590586c7a9071691a9563fa8b255a813fab6 (patch)
treeb69e74146081553e935655bede13e639083e7a5b /net-dialup/speedtouch
parentMasking forthcoming gnustep updates until upgrade path is established (diff)
downloadgentoo-2-fbcf590586c7a9071691a9563fa8b255a813fab6.tar.gz
gentoo-2-fbcf590586c7a9071691a9563fa8b255a813fab6.tar.bz2
gentoo-2-fbcf590586c7a9071691a9563fa8b255a813fab6.zip
fix broken compilation on gcc-4 (#99759)
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-dialup/speedtouch')
-rw-r--r--net-dialup/speedtouch/ChangeLog7
-rw-r--r--net-dialup/speedtouch/Manifest23
-rw-r--r--net-dialup/speedtouch/files/speedtouch-1.3.1-gcc4.patch11
-rw-r--r--net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild5
4 files changed, 28 insertions, 18 deletions
diff --git a/net-dialup/speedtouch/ChangeLog b/net-dialup/speedtouch/ChangeLog
index 55491878415b..dd8adedd8214 100644
--- a/net-dialup/speedtouch/ChangeLog
+++ b/net-dialup/speedtouch/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-dialup/speedtouch
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.27 2005/05/06 04:54:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.28 2005/07/23 21:49:41 mrness Exp $
+
+ 23 Jul 2005; Alin Nastac <mrness@gentoo.org>
+ +files/speedtouch-1.3.1-gcc4.patch, speedtouch-1.3.1-r2.ebuild:
+ Fix broken compilation on gcc-4, thanks to Kerin Millar
+ <kerframil@gmail.com> (#99759).
06 May 2005; Alin Nastac <mrness@gentoo.org> speedtouch-1.3.1-r2.ebuild:
Correct post-install info message (#91543).
diff --git a/net-dialup/speedtouch/Manifest b/net-dialup/speedtouch/Manifest
index 7868afa5dde7..e87c68172077 100644
--- a/net-dialup/speedtouch/Manifest
+++ b/net-dialup/speedtouch/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c94ca13838fd541512a5e65461722e5d ChangeLog 4059
-MD5 d6eb26607fa211c61609dd783ecfdac9 files/adsl.sample 599
-MD5 be6c41b714f7e55195d93fd478dc5e7e files/digest-speedtouch-1.3.1-r2 69
+MD5 8a5aeb46200ffb4e4402b4b3e8a49ef8 speedtouch-1.3.1-r2.ebuild 3036
+MD5 0e33d0a3cb1de26760afd05de5ab5dd2 ChangeLog 4265
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
MD5 3c7d210090e2fed135170292f62e279b files/speedtch-hotplug 396
-MD5 e1433d87a19203883aeaa0d4f791f91f files/speedtouch.confd 699
+MD5 4191035925db745944c75e26937c42a3 files/speedtouch-1.3.1-gcc4.patch 279
+MD5 be6c41b714f7e55195d93fd478dc5e7e files/digest-speedtouch-1.3.1-r2 69
MD5 aa0803fb7b3133521df4ee07d7ff141a files/speedtouch.rc7 1655
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 9401611fdc8b082e6facbcc591424221 speedtouch-1.3.1-r2.ebuild 2948
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0BwDI1lqEGTUzyQRAlcDAKDME2QtUg1p1ifSA/4pL9tTxjSqlgCgyeic
-UHI1kGemG0ydxqRywpVY/lg=
-=jEUC
------END PGP SIGNATURE-----
+MD5 e1433d87a19203883aeaa0d4f791f91f files/speedtouch.confd 699
+MD5 d6eb26607fa211c61609dd783ecfdac9 files/adsl.sample 599
diff --git a/net-dialup/speedtouch/files/speedtouch-1.3.1-gcc4.patch b/net-dialup/speedtouch/files/speedtouch-1.3.1-gcc4.patch
new file mode 100644
index 000000000000..bdd323c50e97
--- /dev/null
+++ b/net-dialup/speedtouch/files/speedtouch-1.3.1-gcc4.patch
@@ -0,0 +1,11 @@
+--- speedtouch-1.3.1/src/modem.h 2004-09-29 21:56:31.000000000 +0100
++++ speedtouch-1.3.1-gcc4/src/modem.h 2005-07-21 07:15:03.000000000 +0100
+@@ -38,7 +38,4 @@
+ #define EP_CODE_IN 0x85
+ #define EP_CODE_OUT 0x05
+
+-/* Global Variables */
+-extern int verbose;
+-
+ #endif
+ \ No newline at end of file
diff --git a/net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild b/net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild
index 68f37d17ecca..dc44878c0434 100644
--- a/net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild
+++ b/net-dialup/speedtouch/speedtouch-1.3.1-r2.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/speedtouch/speedtouch-1.3.1-r2.ebuild,v 1.3 2005/07/09 18:48:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild,v 1.4 2005/07/23 21:49:41 mrness Exp $
inherit flag-o-matic
@@ -22,6 +22,9 @@ RDEPEND=">=net-dialup/ppp-2.4.1"
src_unpack() {
unpack ${A}
+ # Patch to fix gcc-4.* compile error (bug #99759)
+ epatch ${FILESDIR}/${P}-gcc4.patch
+
#Increase minlevel of reports in atm.c
#At least one of the reports could affect performance due to call frequency
sed -i -e 's/report(0/report(1/' ${S}/src/atm.c