Added the patches from bugs 151089 and 154421 which fix compile failures with the kdeenablefinal and sametime USE flags respectively. Minor whitespace fixes.

(Portage version: 2.1.3_rc6)

5 files changed, 143 insertions, 5 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 98846e90e08b..6c1c5f289965 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.264 2007/06/03 21:43:49 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.265 2007/07/08 10:27:19 philantrop Exp $
+
+  08 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kopete-3.5.5-enable-final-redefines.patch,
+  +files/kopete-3.5.5-status-visibility.patch, kdenetwork-3.5.5-r1.ebuild,
+  kdenetwork-3.5.5-r2.ebuild:
+  Added the patches from bugs 151089 and 154421 which fix compile failures
+  with the kdeenablefinal and sametime USE flags respectively. Minor
+  whitespace fixes.
 
   03 Jun 2007; Joshua Kinard <kumba@gentoo.org> kdenetwork-3.5.6-r2.ebuild:
   Marked unstable on mips.
diff --git a/kde-base/kdenetwork/files/kopete-3.5.5-enable-final-redefines.patch b/kde-base/kdenetwork/files/kopete-3.5.5-enable-final-redefines.patch
new file mode 100644
index 000000000000..0bac4228e9ca
--- /dev/null
+++ b/kde-base/kdenetwork/files/kopete-3.5.5-enable-final-redefines.patch
@@ -0,0 +1,107 @@
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc.orig	2006-12-22 21:43:20.000000000 -0800
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc	2006-12-22 21:46:00.000000000 -0800
+@@ -52,9 +52,9 @@
+ typedef uint16 PacketLength;
+ const size_t PKT_LEN_SIZE = sizeof(PacketLength);
+ 
+-const size_t BUF_SIZE = MAX_PACKET_SIZE + PKT_LEN_SIZE;
++const size_t TCP_BUF_SIZE = MAX_PACKET_SIZE + PKT_LEN_SIZE;
+ 
+-AsyncTCPSocket::AsyncTCPSocket(AsyncSocket* socket) : AsyncPacketSocket(socket), insize_(BUF_SIZE), inpos_(0), outsize_(BUF_SIZE), outpos_(0) {
++AsyncTCPSocket::AsyncTCPSocket(AsyncSocket* socket) : AsyncPacketSocket(socket), insize_(TCP_BUF_SIZE), inpos_(0), outsize_(TCP_BUF_SIZE), outpos_(0) {
+   inbuf_ = new char[insize_];
+   outbuf_ = new char[outsize_];
+ 
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncudpsocket.cc.orig	2006-10-01 10:26:45.000000000 -0700
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncudpsocket.cc	2006-12-22 21:44:03.000000000 -0800
+@@ -48,10 +48,10 @@
+ 
+ namespace cricket {
+ 
+-const int BUF_SIZE = 64 * 1024;
++const int UDP_BUF_SIZE = 64 * 1024;
+ 
+ AsyncUDPSocket::AsyncUDPSocket(AsyncSocket* socket) : AsyncPacketSocket(socket) {
+-  size_ = BUF_SIZE;
++  size_ = UDP_BUF_SIZE;
+   buf_ = new char[size_];
+ 
+   assert(socket_);
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/stl_decl.h.orig	2006-10-01 10:26:45.000000000 -0700
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/stl_decl.h	2006-12-22 21:49:33.000000000 -0800
+@@ -45,7 +45,7 @@
+   template <class T, class Alloc> class vector;
+   template <class T, class Alloc> class list;
+   template <class T, class Alloc> class slist;
+-  template <class T, class Alloc, size_t BufSiz> class deque;
++  template <class T, class Alloc> class deque;
+   template <class T, class Sequence> class stack;
+   template <class T, class Sequence> class queue;
+   template <class T, class Sequence, class Compare> class priority_queue;
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.h.orig	2006-10-01 10:26:44.000000000 -0700
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.h	2006-12-22 23:12:59.000000000 -0800
+@@ -46,6 +46,9 @@
+ class Connection;
+ class AsyncPacketSocket;
+ 
++extern const int RETRY_DELAY;
++extern const uint32 RETRY_TIMEOUT;
++
+ enum ProtocolType { PROTO_UDP, PROTO_TCP, PROTO_SSLTCP, PROTO_LAST = PROTO_SSLTCP };
+ const char * ProtoToString(ProtocolType proto);
+ bool StringToProto(const char * value, ProtocolType& proto);
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayport.cc.orig	2006-10-01 10:26:44.000000000 -0700
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayport.cc	2006-12-22 23:14:51.000000000 -0800
+@@ -52,9 +52,7 @@
+ 
+ namespace cricket {
+ 
+-const int KEEPALIVE_DELAY = 10 * 60 * 1000;
+-const int RETRY_DELAY = 50; // 50ms, from ICE spec
+-const uint32 RETRY_TIMEOUT = 50 * 1000; // ICE says 50 secs
++const int RELAY_KEEPALIVE_DELAY = 10 * 60 * 1000;
+ 
+ const uint32 MSG_DISPOSE_SOCKET = 100; // needs to be more than ID used by Port
+ typedef TypedMessageData<AsyncPacketSocket *> DisposeSocketData;
+@@ -460,7 +458,7 @@
+ }
+ 
+ void RelayEntry::ScheduleKeepAlive() {
+-  requests_.SendDelayed(new AllocateRequest(this), KEEPALIVE_DELAY);
++  requests_.SendDelayed(new AllocateRequest(this), RELAY_KEEPALIVE_DELAY);
+ }
+ 
+ void RelayEntry::HandleConnectFailure() {
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunport.cc.orig	2006-10-01 10:26:44.000000000 -0700
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunport.cc	2006-12-22 23:11:48.000000000 -0800
+@@ -48,10 +48,11 @@
+ 
+ namespace cricket {
+ 
+-const int KEEPALIVE_DELAY = 10 * 1000; // 10 seconds - sort timeouts
+ const int RETRY_DELAY = 50; // 50ms, from ICE spec
+ const uint32 RETRY_TIMEOUT = 50 * 1000; // ICE says 50 secs
+ 
++const int STUN_KEEPALIVE_DELAY = 10 * 1000; // 10 seconds - sort timeouts
++
+ // Handles a binding request sent to the STUN server.
+ class StunPortBindingRequest : public StunRequest {
+ public:
+@@ -81,7 +82,7 @@
+ 
+     // We will do a keep-alive regardless of whether this request suceeds.
+     // This should have almost no impact on network usage.
+-    port_->requests_.SendDelayed(new StunPortBindingRequest(port_), KEEPALIVE_DELAY);
++    port_->requests_.SendDelayed(new StunPortBindingRequest(port_), STUN_KEEPALIVE_DELAY);
+   }
+ 
+   virtual void OnErrorResponse(StunMessage* response) {
+@@ -96,7 +97,7 @@
+     }
+ 
+     if (GetMillisecondCount() - start_time_ <= RETRY_TIMEOUT)
+-      port_->requests_.SendDelayed(new StunPortBindingRequest(port_), KEEPALIVE_DELAY);
++      port_->requests_.SendDelayed(new StunPortBindingRequest(port_), STUN_KEEPALIVE_DELAY);
+   }
+ 
+   virtual void OnTimeout() {
diff --git a/kde-base/kdenetwork/files/kopete-3.5.5-status-visibility.patch b/kde-base/kdenetwork/files/kopete-3.5.5-status-visibility.patch
new file mode 100644
index 000000000000..e3c09008a8bd
--- /dev/null
+++ b/kde-base/kdenetwork/files/kopete-3.5.5-status-visibility.patch
@@ -0,0 +1,19 @@
+--- kopete-3.5.5/kopete/libkopete/kopeteonlinestatusmanager.h.orig	2006-12-15 23:33:46.000000000 -0800
++++ kopete-3.5.5/kopete/libkopete/kopeteonlinestatusmanager.h	2006-12-15 23:34:33.000000000 -0800
+@@ -21,6 +21,7 @@
+ #include <qobject.h>
+ #include "kopeteonlinestatus.h"
+ #include "kaction.h"
++#include "kopete_export.h"
+ 
+ class QString;
+ class QPixmap;
+@@ -38,7 +39,7 @@
+  *
+  * @author Olivier Goffart 
+  */
+-class OnlineStatusManager : public QObject
++class KOPETE_EXPORT OnlineStatusManager : public QObject
+ {
+ 	Q_OBJECT
+ public:
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
index 31bf813eb363..16278bf30d18 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.16 2007/04/21 23:03:46 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.17 2007/07/08 10:27:19 philantrop Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -46,7 +46,9 @@ DEPEND="${BOTH_DEPEND}
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
-	${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+		${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch
+		${FILESDIR}/kopete-3.5.5-status-visibility.patch
+		${FILESDIR}/kopete-3.5.5-enable-final-redefines.patch"
 
 pkg_setup() {
 	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
index 30b884fb1350..a3cb2fed49fa 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.12 2007/04/21 23:03:46 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.13 2007/07/08 10:27:19 philantrop Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -46,7 +46,9 @@ DEPEND="${BOTH_DEPEND}
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
-	${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+		${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch
+		${FILESDIR}/kopete-3.5.5-status-visibility.patch
+		${FILESDIR}/kopete-3.5.5-enable-final-redefines.patch"
 
 pkg_setup() {
 	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then