Add patch to fix compilation with gcc-4 by Robert Förster <ich AT kuja DOT in>; bug #114485

(Portage version: 2.1_pre4-r1)

5 files changed, 82 insertions, 6 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index 3942e8bda076..02f0952f26e5 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/kvirc
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.30 2005/12/31 05:34:48 kumba Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.31 2006/02/09 01:55:50 halcy0n Exp $
+
+  09 Feb 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/kvirc-3.2.0-gcc4.patch, kvirc-3.2.0.ebuild:
+  Add patch to fix compilation with gcc-4 by Robert Förster <ich AT kuja DOT
+  in>; bug #114485
 
   31 Dec 2005; Joshua Kinard <kumba@gentoo.org> kvirc-3.2.0.ebuild:
   Marked unstable on mips.
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index efcbddba35aa..1d2d14fe1f1d 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,5 +1,18 @@
 MD5 5155f0f2cd88e377007505e2c04d6619 ChangeLog 5310
-MD5 21928cc1baa6e34137617946b6b1fb77 files/digest-kvirc-3.2.0 141
+RMD160 fddb33069d8097d69ec302ef9d05c5a8e5ad565c ChangeLog 5310
+SHA256 80a7645518639178f1a7dafb53336b2b507b025dd0353c332a3680cb6af15bd8 ChangeLog 5310
+MD5 d25f8f6198d3dddb88d07435771dddc4 files/digest-kvirc-3.2.0 515
+RMD160 c3c5029f448d2cb44b2dd65faef73c7674d95925 files/digest-kvirc-3.2.0 515
+SHA256 a906d4658d405c05901975009ef26f5470fa0abde92d005e51ca1f66c8e8afd7 files/digest-kvirc-3.2.0 515
 MD5 3f438009c2c1f4441adb149e10e746df files/kvirc-3.0.1-kdedir-fix.patch 1953
-MD5 1f9bb908ca3406436975a52c1771c754 kvirc-3.2.0.ebuild 2033
+RMD160 89dff0122609262c9a8812345e83cae70b776c54 files/kvirc-3.0.1-kdedir-fix.patch 1953
+SHA256 ec5aabc2553425c8c22ac10894c3e3addaa6d83e5f0a8fd672562380c1506a37 files/kvirc-3.0.1-kdedir-fix.patch 1953
+MD5 817c8b7131bde0dc8d3928e2fbc16f7c files/kvirc-3.2.0-gcc4.patch 1887
+RMD160 9f39ed0b250d415e5c01d04c92d4520e8737f2a8 files/kvirc-3.2.0-gcc4.patch 1887
+SHA256 ba8a5bb2f1c99506920f302cb7dd26c2437894de2127389490a9b74b7bf3e36d files/kvirc-3.2.0-gcc4.patch 1887
+MD5 08a4f90d156adf80b0e9f9c63f6fa6f2 kvirc-3.2.0.ebuild 2071
+RMD160 2774b936fef38d3e0200bd770afe9fe396a9a7fa kvirc-3.2.0.ebuild 2071
+SHA256 342eeb4c7d4d8063643c50b76ce5b648413c02a21046a292af152e5a78646e08 kvirc-3.2.0.ebuild 2071
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
+SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
diff --git a/net-irc/kvirc/files/digest-kvirc-3.2.0 b/net-irc/kvirc/files/digest-kvirc-3.2.0
index de5e0ff931ea..3fba4defaacb 100644
--- a/net-irc/kvirc/files/digest-kvirc-3.2.0
+++ b/net-irc/kvirc/files/digest-kvirc-3.2.0
@@ -1,2 +1,6 @@
 MD5 be1db10f4eb16910ff1df4c4fcec5278 kvirc-3.2.0-linking-fix.patch.bz2 4266
+RMD160 89b10577cf219a4b5b9e5502a40561dda9593655 kvirc-3.2.0-linking-fix.patch.bz2 4266
+SHA256 d6aeb8f95c00bb1108e39236b3e59bda6eab6efe0ff16037c7f8cb8b018efaa8 kvirc-3.2.0-linking-fix.patch.bz2 4266
 MD5 e783827fda3832fc3fb50e7a41ed627d kvirc-3.2.0.tar.bz2 3704445
+RMD160 c23d5154eaaa9afc88b0c9f6afbda0939c327cf4 kvirc-3.2.0.tar.bz2 3704445
+SHA256 ef4ad991578230db6c0bb8e7335304eac23996fedae682761c8b08ba89552984 kvirc-3.2.0.tar.bz2 3704445
diff --git a/net-irc/kvirc/files/kvirc-3.2.0-gcc4.patch b/net-irc/kvirc/files/kvirc-3.2.0-gcc4.patch
new file mode 100644
index 000000000000..e801b77b4811
--- /dev/null
+++ b/net-irc/kvirc/files/kvirc-3.2.0-gcc4.patch
@@ -0,0 +1,53 @@
+--- src/kvirc/ui/kvi_console.h	2005-02-25 17:57:45.000000000 +0000
++++ src/kvirc/ui/kvi_console.h	2006-01-01 20:57:30.000000000 +0000
+@@ -77,7 +77,7 @@
+ 	friend class KviIrcSocket;
+ 	friend class KviChannel;
+ 	friend class KviQuery;
+-	friend class KviIrcSocketMonitor;
++	//friend class KviIrcSocketMonitor;
+ 	friend class KviIrcContext;
+ 	Q_OBJECT
+ protected:
+@@ -105,8 +105,8 @@
+ 	void fillStatusString();
+ 	//void socketError(int iError);
+ 	//void socketStateChange();
+-	void registerLinkMonitor(KviIrcSocketMonitor * m);
+-	void unregisterLinkMonitor(KviIrcSocketMonitor * m);
++	//void registerLinkMonitor(KviIrcSocketMonitor * m);
++	//void unregisterLinkMonitor(KviIrcSocketMonitor * m);
+ 	virtual void loadProperties(KviConfig * cfg);
+ 	virtual void saveProperties(KviConfig * cfg);
+ 	
+--- src/kvirc/ui/kvi_console.cpp	2005-02-25 17:57:45.000000000 +0000
++++ src/kvirc/ui/kvi_console.cpp	2006-01-01 21:11:53.000000000 +0000
+@@ -88,7 +88,7 @@
+ #define __KVI_DEBUG__
+ #include "kvi_debug.h"
+ 
+-
++class KviIrcServerDataBase;
+ extern KVIRC_API KviIrcServerDataBase           * g_pIrcServerDataBase;
+ extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
+ extern KVIRC_API KviRegisteredUserDataBase      * g_pRegisteredUserDataBase;
+--- src/kvirc/kernel/kvi_irccontext.h	2004-11-22 02:13:17.000000000 +0000
++++ src/kvirc/kernel/kvi_irccontext.h	2006-01-01 21:06:40.000000000 +0000
+@@ -37,6 +37,7 @@
+ class KviAsynchronousConnectionData;
+ class KviIrcDataStreamMonitor;
+ class KviWindow;
++class KviConsole;
+ class QTimer;
+ 
+ /*
+--- src/kvirc/module/kvi_moduleextension.h	2004-09-09 21:51:07.000000000 +0000
++++ src/kvirc/module/kvi_moduleextension.h	2006-01-01 21:03:38.000000000 +0000
+@@ -36,6 +36,7 @@
+ class KviModule;
+ class KviModuleExtension;
+ class KviModuleExtensionDescriptor;
++class KviModuleExtensionManager;
+ 
+ typedef struct _KviModuleExtensionAllocStructTag
+ {
diff --git a/net-irc/kvirc/kvirc-3.2.0.ebuild b/net-irc/kvirc/kvirc-3.2.0.ebuild
index 36d2f0c07d4c..9f10913060a8 100644
--- a/net-irc/kvirc/kvirc-3.2.0.ebuild
+++ b/net-irc/kvirc/kvirc-3.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.0.ebuild,v 1.8 2005/12/31 05:34:48 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.0.ebuild,v 1.9 2006/02/09 01:55:50 halcy0n Exp $
 
 inherit eutils kde-functions
 
@@ -35,6 +35,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/kvirc-3.0.1-kdedir-fix.patch
 	epatch ${WORKDIR}/${P}-linking-fix.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 }
 
 src_compile() {