Fix building with newer versions of gcc.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 39 insertions, 12 deletions

diff --git a/app-misc/twin/ChangeLog b/app-misc/twin/ChangeLog
index f652912a8cb7..2c123e37b0a7 100644
--- a/app-misc/twin/ChangeLog
+++ b/app-misc/twin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/twin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/ChangeLog,v 1.16 2006/02/04 04:02:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/ChangeLog,v 1.17 2006/04/12 00:10:38 vapier Exp $
+
+  12 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/twin-0.4.6-gcc.patch, twin-0.4.6.ebuild:
+  Fix building with newer versions of gcc.
 
   04 Feb 2006; Mike Frysinger <vapier@gentoo.org> twin-0.4.6.ebuild:
   Add support for modular X #121095 by Moshe Kaminsky.
diff --git a/app-misc/twin/Manifest b/app-misc/twin/Manifest
index d467ea6efda0..9fe9be1f72c9 100644
--- a/app-misc/twin/Manifest
+++ b/app-misc/twin/Manifest
@@ -1,25 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 41d882abf6a1e38e3d075fc628de20d1 ChangeLog 2113
-RMD160 7fb11b44ce2d656b2e396b779815c788f1daa728 ChangeLog 2113
-SHA256 4977976a1f8523c9cc979a997022dad0260e125d6a9a6ac477919211abfa9edc ChangeLog 2113
+MD5 f6384d5105317f0d542bbe55080e4464 ChangeLog 2257
+RMD160 c5c1e4458e636ec6fd61236a392d50009bc759da ChangeLog 2257
+SHA256 b3c5eb7b880bcec44f324482451b0b575f769295de304c744b1ad5a6975932bb ChangeLog 2257
 MD5 ad8d26920fc765a6d1fb4a3e4fac3ca7 files/digest-twin-0.4.6 63
 RMD160 6aec4c59a83b2bcde9123f9de9b1de1ceee96687 files/digest-twin-0.4.6 63
 SHA256 37c1ae532a464c35d188e1baa6e52827bb5f8e9cca72980d4ce04b39fdc0b0f7 files/digest-twin-0.4.6 63
 MD5 f170881843dd34e43adcd5cbab719927 files/twin-0.4.6-autotools.patch 248
 RMD160 4818c4f64090cdcf26611db35c2f61921f0060dc files/twin-0.4.6-autotools.patch 248
 SHA256 8cd2a1a266b40d8f7ed09837c9fd66661205150da8411a24008ab5c80707e8a5 files/twin-0.4.6-autotools.patch 248
+MD5 767e120670b3324ae0958743e71a9fc3 files/twin-0.4.6-gcc.patch 396
+RMD160 9adaff3f6c8b878ee82c800cd8aa29ad088e16cf files/twin-0.4.6-gcc.patch 396
+SHA256 3d3d2919ba69e3ab1f4d6bb885aec98c99ea5d02974603c00df2a67d6f06332e files/twin-0.4.6-gcc.patch 396
 MD5 75659ae17937f732013a241bbc2b9529 metadata.xml 1396
 RMD160 e2c352ff46384d0aa587cb3c7d8be3fdc2b76a38 metadata.xml 1396
 SHA256 d1d4bda554db8668b585ee7bde3f9b6d6e8b132ca366098268a36d06cdfe1502 metadata.xml 1396
-MD5 00864ba5677123cded9ded384957ac42 twin-0.4.6.ebuild 2130
-RMD160 69d0b15d624bcdf18a0b4660c08a802a6b209bb8 twin-0.4.6.ebuild 2130
-SHA256 70469ef5b2b7b9c7fd288416844832afd799ea39b499c964f236f7643ddbe61c twin-0.4.6.ebuild 2130
+MD5 f795b67204bd0afd9efac6f164204755 twin-0.4.6.ebuild 2167
+RMD160 4b6667e46c6253fcb022c5da0759a9fbdee156d0 twin-0.4.6.ebuild 2167
+SHA256 28c5280cdaa61828000893765c02dcb7f1cd8f20504090bec34cf64477be3d70 twin-0.4.6.ebuild 2167
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD5CdL2+ySkm8kpY0RAjKhAJ4t7otJEemnxyQ+JXIKVoc4HogRyACgvVG+
-dnOZwb3WYISwWiyzIUw4mIE=
-=g4z1
+iD4DBQFEPEWV2+ySkm8kpY0RAlTKAKCq+BFy4q3KTEu+GYc56MXXN880yQCXR/n9
+Zs6Dbftiqiv3CNEcCsFsBA==
+=H2lS
 -----END PGP SIGNATURE-----
diff --git a/app-misc/twin/files/twin-0.4.6-gcc.patch b/app-misc/twin/files/twin-0.4.6-gcc.patch
new file mode 100644
index 000000000000..88fa69d70a73
--- /dev/null
+++ b/app-misc/twin/files/twin-0.4.6-gcc.patch
@@ -0,0 +1,19 @@
+--- libs/libTw/libTw.c
++++ libs/libTw/libTw.c
+@@ -81,6 +81,8 @@
+ 
+ #define Min2(a,b) ((a) < (b) ? (a) : (b))
+ 
++static void DeleteAllListeners(tlistener);
++
+ #ifdef CONF_SOCKET_PTHREADS
+ 
+ typedef struct s_tw_errno {
+@@ -1221,7 +1223,6 @@
+  * closes a server connection
+  */
+ void Tw_Close(tw_d TwD) {
+-    static void DeleteAllListeners(tlistener);
+     s_tw_errno *E;
+     byte *q;
+     int i;
diff --git a/app-misc/twin/twin-0.4.6.ebuild b/app-misc/twin/twin-0.4.6.ebuild
index c622f567d804..cd66e43934f8 100644
--- a/app-misc/twin/twin-0.4.6.ebuild
+++ b/app-misc/twin/twin-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.4.6.ebuild,v 1.8 2006/02/04 04:02:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.4.6.ebuild,v 1.9 2006/04/12 00:10:39 vapier Exp $
 
 inherit eutils fixheadtails
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch "${FILESDIR}"/${P}-gcc.patch
 	ht_fix_file configure
 }