Fix GCC 4.3 build error w/ USE="jingle". Patch from devsk in bug #223535.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 128 insertions, 4 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index c901030cb8bf..e126cb355bb2 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.156 2008/09/13 23:59:21 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.157 2008/09/30 03:10:37 dirtyepic Exp $
+
+  30 Sep 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/kopete-3.5.10-gcc43.patch, kopete-3.5.10.ebuild:
+  Fix GCC 4.3 build error w/ USE="jingle". Patch from devsk in bug #223535.
 
 *kopete-3.5.10 (13 Sep 2008)
 
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 2779b2852c16..da5f230d81f5 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnomemeeting-ekiga.patch 2073 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 SHA1 13cdedb9087de6757a11f8bf03dd2a992ae37ffe SHA256 5f908d8491a286db761d4c7e0bc07da05ad0ec7cc5c94bc69533706bbd8d552c
 AUX kdenetwork-3.5.5-linux-headers-2.6.18.patch 799 RMD160 1e12373bef6f0a69d9b5d453c9a63b84f7b48645 SHA1 642a54568612c62543759eab4550b4db03a42bb0 SHA256 1e282677beb1bec1c32e12c2c289e498b487b9f0bd0fa9c7b38a4944d48d6e9a
 AUX kopete-0.12_alpha1-xscreensaver.patch 778 RMD160 d188f074982191f6f961c7e32ec97a79746e73df SHA1 85dea3f727af4393740bacb237c80ee666f1bdae SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d
+AUX kopete-3.5.10-gcc43.patch 5464 RMD160 d535c743e56e007883012cee6c2acc976e4be71a SHA1 f33768f7d434901c52ca8e3382422d4a2901641f SHA256 1987e03fc57ae56d70ca79efcebd23cf6b73da6a1b6548189315df580d9e6e76
 AUX kopete-3.5.5-enable-final-redefines.patch 4914 RMD160 2e1fd23e99077eca324d9de41280ab3566024a86 SHA1 43b4087efc901d941791e6bbe98526d4538b29c0 SHA256 27058d017ddd9ec96fe992cbd0cdc4a8734c1dc9b17ef7c9b8edb4af29245103
 AUX kopete-3.5.5-icqfix.patch 749 RMD160 129efdaa2bf0dbf88fe4714b4daab5f3606cbc91 SHA1 f3ef29b821ba5f0b62438a7b78a982625e42bd94 SHA256 e165e409343918ac49da0df867f7df34fffa5adfd550ca3079016d0b576a1987
 AUX kopete-3.5.5-status-visibility.patch 539 RMD160 669318d277a3be426dbd5f69f6343ca094617fe5 SHA1 39f950365c1cdfb913f2f638724169d0b8181b6d SHA256 3eefe7817999b69c1936c19a7b45bc08d5b181bc3eef71411004ac29e3cceee9
@@ -15,11 +19,18 @@ DIST kdenetwork-3.5.8.tar.bz2 9334188 RMD160 3941c56411ab4cdb89ae9de116a24d0906a
 DIST kdenetwork-3.5.9.tar.bz2 9339308 RMD160 3df73e0cd2b628cb49d12da3af663288aebdfd71 SHA1 a4901468e94d3433468ebf1f2213b93b37496cca SHA256 fc196f4e340255af1ab15d9346c40e77fcdd1d61114f6f999670c0a6cd23cc14
 DIST kdenetwork-4.0.4.tar.bz2 6373873 RMD160 f56c04d1bdaa45f58c3f293d7b694b51301df6a7 SHA1 262d4496c9248abf5fa5316a83c13f81e388047b SHA256 fef837d35659bf1537d33f7dd215f482d3edfd8db6001162c79d5a41e0bb3d48
 DIST kdenetwork-4.0.5.tar.bz2 6375997 RMD160 3a2b0a7227bbb99448a673a278c9d939f9af253a SHA1 a71cf3ca5b472282a3d23a5e7ca2dfd150a044d1 SHA256 e3a0866819d69987512b4d2da925ab4cd7fff66477398093df8d8be50aa6f977
-EBUILD kopete-3.5.10.ebuild 4007 RMD160 7d7d2d95a50fb52e39623a88b973f92307886534 SHA1 b24330677dfe6cd7a840e29a68e44016185a7e15 SHA256 f024cefd083c2e7dbd27640c1dfc16cba5106b67c0ec69e3d4c400b432be8d71
+EBUILD kopete-3.5.10.ebuild 4059 RMD160 351d646a33eab02cd9b7d6b6a589f5da0e3c0766 SHA1 c8d11f59fce543b3f9e96fde40b908be5dd08f66 SHA256 2f41468272f57ecc391354dfbcb7f16a3308923a0e6e3615038f3246859c7071
 EBUILD kopete-3.5.6-r2.ebuild 4284 RMD160 59fcf9c227ed0577855a1ee94fd74710ee44b277 SHA1 6421190d943d65dd543c446d4d5395bc5888673e SHA256 6c384500ed20e0985010153a9902990b0404f97f828e621a782df7a881b9462a
 EBUILD kopete-3.5.8.ebuild 4116 RMD160 4f7084e871214f1fc6a49139545f500819ccc984 SHA1 6c97ff98de2ec899fa60e1237dcc45cc719f69ed SHA256 d2845a1dee48569a3de92f2ed625d985a25275bbee799f6505c9d77cd65e7438
 EBUILD kopete-3.5.9.ebuild 4124 RMD160 088c7bba63356a2582cd6eb1d781f382ac847540 SHA1 06eccd24dfb80184d69f5a991e6f3d22e47cd082 SHA256 f9c4a07223413e7692f2600d22061d5f5ec942a8e0fa540796f4ccc95ee8c34d
 EBUILD kopete-4.0.4.ebuild 3458 RMD160 98ec46d61d3aaba829c55bcae3a608b48210dbf5 SHA1 d1ad252b08b77dd8b8b6c245a4855fcc181c8436 SHA256 c86a5c420463907ae9b3210f880dd224a5e02bdbebe60dc26b4eff8209875e4d
 EBUILD kopete-4.0.5.ebuild 3462 RMD160 8ca0a466d2e04b75401daa6d7c6ed2e1456ee389 SHA1 48179d0bfa35d525c0700060602894975c517559 SHA256 9daa2d5ca0946ea951d8dc0254c72d393a41da60788793946cce5932463666d3
-MISC ChangeLog 22675 RMD160 8c77da8e71a5857b53163655f1821db4b188249a SHA1 1d2e9380804fca04eecaed985375ab482d028a5b SHA256 6ece2d1e26ed481bba458e2fa75919ebbb52b34452531954cb080c2c9f63019e
+MISC ChangeLog 22862 RMD160 2a1660bdf23f6b077fc06ca47a6ff72d256187e6 SHA1 d0dcb6e3cee8035fe57d8b4148b715cf952b8f9c SHA256 de43c89c83c1b73c8891442e001a9de8cf630fa38cc6eef2c1c93fb0b3891441
 MISC metadata.xml 1710 RMD160 712d82ab83661b44b793960dbbfb84fdcff9bdbf SHA1 c5e663be87789279c5a452632308a4833d3bd882 SHA256 6b098cbfaf2bd13478ecf8f746539f4d7246e253eb161569e6102ec27bd619aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjhmJ0ACgkQiqiDRvmkBmKuPACguGdydN4Pn2SERP6CbYSSV8fE
+GFQAoNrvnPYU4KKluKBSa+b98kI7haIm
+=+syG
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/kopete-3.5.10-gcc43.patch b/kde-base/kopete/files/kopete-3.5.10-gcc43.patch
new file mode 100644
index 000000000000..814adf66863c
--- /dev/null
+++ b/kde-base/kopete/files/kopete-3.5.10-gcc43.patch
@@ -0,0 +1,108 @@
+diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc
+--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc	2006-10-01 11:26:45.000000000 -0600
++++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc	2008-09-29 20:52:46.000000000 -0600
+@@ -32,6 +32,7 @@
+ #include "talk/base/byteorder.h"
+ #include "talk/base/common.h"
+ #include "talk/base/logging.h"
++#include <cstring>
+ 
+ #if defined(_MSC_VER) && _MSC_VER < 1300
+ namespace std {
+diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc
+--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc	2006-10-01 11:26:45.000000000 -0600
++++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc	2008-09-29 20:52:46.000000000 -0600
+@@ -30,6 +30,7 @@
+ #include "talk/base/byteorder.h"
+ #include <algorithm>
+ #include <cassert>
++#include <cstring>
+ 
+ #if defined(_MSC_VER) && _MSC_VER < 1300
+ namespace std {
+diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc
+--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc	2006-10-01 11:26:45.000000000 -0600
++++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc	2008-09-29 20:52:46.000000000 -0600
+@@ -29,7 +29,8 @@
+ #include "talk/base/logging.h"
+ #include "talk/base/network.h"
+ #include "talk/base/socket.h"
+-#include <string>
++#include <cstring>
++#include <cstdlib>
+ #include <iostream>
+ #include <cassert>
+ #include <errno.h>
+diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h
+--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h	2006-10-01 11:26:45.000000000 -0600
++++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h	2008-09-29 20:52:46.000000000 -0600
+@@ -32,6 +32,7 @@
+ #include "talk/base/criticalsection.h"
+ #include "talk/base/socketserver.h"
+ #include "talk/base/jtime.h"
++#include <cstring>
+ #include <vector>
+ #include <queue>
+ #include <algorithm>
+diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc
+--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc	2006-10-01 11:26:45.000000000 -0600
++++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc	2008-09-29 20:52:46.000000000 -0600
+@@ -30,11 +30,13 @@
+ #endif
+ 
+ #include <cassert>
++#include <algorithm>
+ 
+ #ifdef POSIX
+ extern "C" {
+ #include <errno.h>
+ #include <fcntl.h>
++#include <string.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+ }
+diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc
+--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc	2006-10-01 11:26:45.000000000 -0600
++++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc	2008-09-29 20:52:46.000000000 -0600
+@@ -42,6 +42,7 @@
+ #endif
+ 
+ #include <cassert>
++#include <cstring>
+ 
+ #include "talk/base/base64.h"
+ #include "talk/base/basicdefs.h"
+diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc
+--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc	2006-10-01 11:26:44.000000000 -0600
++++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc	2008-09-29 20:52:46.000000000 -0600
+@@ -29,6 +29,7 @@
+ #include "talk/p2p/base/stun.h"
+ #include <iostream>
+ #include <cassert>
++#include <cstring>
+ 
+ #if defined(_MSC_VER) && _MSC_VER < 1300
+ namespace std {
+diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc
+--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc	2006-10-01 11:26:44.000000000 -0600
++++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc	2008-09-29 20:52:46.000000000 -0600
+@@ -28,6 +28,7 @@
+ #include "talk/base/bytebuffer.h"
+ #include "talk/p2p/base/stunserver.h"
+ #include <iostream>
++#include <cstring>
+ 
+ #ifdef POSIX
+ extern "C" {
+diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h
+--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h	2006-10-01 11:26:45.000000000 -0600
++++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h	2008-09-29 20:52:46.000000000 -0600
+@@ -31,6 +31,8 @@
+ #include "talk/base/linked_ptr.h"
+ #include "talk/base/scoped_ptr.h"
+ 
++#include <cstring>
++
+ namespace buzz {
+ 
+ class XmppPasswordImpl {
diff --git a/kde-base/kopete/kopete-3.5.10.ebuild b/kde-base/kopete/kopete-3.5.10.ebuild
index bd64e6d06f6a..b6dfe24f1dac 100644
--- a/kde-base/kopete/kopete-3.5.10.ebuild
+++ b/kde-base/kopete/kopete-3.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.10.ebuild,v 1.1 2008/09/13 23:59:21 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.10.ebuild,v 1.2 2008/09/30 03:10:37 dirtyepic Exp $
 
 KMNAME=kdenetwork
 EAPI="1"
@@ -74,6 +74,7 @@ src_unpack() {
 	epatch "${FILESDIR}/kopete-0.12_alpha1-xscreensaver.patch"
 	epatch "${FILESDIR}/kopete-3.5.5-icqfix.patch"
 	epatch "${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+	epatch "${FILESDIR}/kopete-3.5.10-gcc43.patch"
 
 	use latex || kopete_disable plugin latex
 	use crypt || kopete_disable plugin cryptography