[kde-base/kdenetwork] Clean unneeded patches

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 9 insertions, 208 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 8469722161b2..0ab59216f283 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdenetwork
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.298 2008/06/07 16:14:04 keytoaster Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.299 2009/06/14 12:56:41 alexxy Exp $
+
+  14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  -files/kopete-3.5.5-enable-final-redefines.patch,
+  -files/kopete-3.5.5-status-visibility.patch,
+  -files/kopete-3.5.6-cryptobug.patch, -files/kopete-3.5.6-utf8-fix.diff,
+  -files/kopete-3.5.7-videodevice.patch:
+  Clean unneeded patches
 
   07 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org>
   -kdenetwork-3.5.8.ebuild:
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
deleted file mode 100644
index 0bac4228e9ca..000000000000
--- a/kde-base/kdenetwork/files/kopete-3.5.5-enable-final-redefines.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- 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
deleted file mode 100644
index e3c09008a8bd..000000000000
--- a/kde-base/kdenetwork/files/kopete-3.5.5-status-visibility.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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/files/kopete-3.5.6-cryptobug.patch b/kde-base/kdenetwork/files/kopete-3.5.6-cryptobug.patch
deleted file mode 100644
index 331e567ce44e..000000000000
--- a/kde-base/kdenetwork/files/kopete-3.5.6-cryptobug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nru kdenetwork-3.5.6.orig/kopete/plugins/cryptography/cryptographyplugin.cpp kdenetwork-3.5.6/kopete/plugins/cryptography/cryptographyplugin.cpp
---- kdenetwork-3.5.6.orig/kopete/plugins/cryptography/cryptographyplugin.cpp	2007-05-06 14:40:56.000000000 +0200
-+++ kdenetwork-3.5.6/kopete/plugins/cryptography/cryptographyplugin.cpp	2007-05-06 14:42:06.000000000 +0200
-@@ -58,9 +58,7 @@
- 	if( !pluginStatic_ )
- 		pluginStatic_=this;
- 
--	m_inboundHandler = 0;
--/*	m_inboundHandler = new Kopete::SimpleMessageHandlerFactory( Kopete::Message::Inbound,
--		Kopete::MessageHandlerFactory::InStageToSent, this, SLOT( slotIncomingMessage( Kopete::Message& ) ) );*/
-+	m_inboundHandler = new Kopete::SimpleMessageHandlerFactory( Kopete::Message::Inbound, Kopete::MessageHandlerFactory::InStageToSent, this, SLOT( slotIncomingMessage( Kopete::Message& ) ) );
- 	connect( Kopete::ChatSessionManager::self(),
- 		SIGNAL( aboutToSend( Kopete::Message & ) ),
- 		SLOT( slotOutgoingMessage( Kopete::Message & ) ) );
diff --git a/kde-base/kdenetwork/files/kopete-3.5.6-utf8-fix.diff b/kde-base/kdenetwork/files/kopete-3.5.6-utf8-fix.diff
deleted file mode 100644
index 07c6cc307ed4..000000000000
--- a/kde-base/kdenetwork/files/kopete-3.5.6-utf8-fix.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- branches/KDE/3.5/kdenetwork/kopete/libkopete/kopetepassword.cpp	2006/08/17 13:37:13	573903
-+++ branches/KDE/3.5/kdenetwork/kopete/libkopete/kopetepassword.cpp	2007/05/17 06:53:22	665563
-@@ -35,22 +35,7 @@
- #include <kmessagebox.h>
- #include <kiconloader.h>
- #include <kpassdlg.h>
--
--/**
-- * Function for symmetrically (en/de)crypting strings for config file,
-- * taken from KMail.
-- *
-- * @author Stefan Taferner <taferner@alpin.or.at>
-- */
--static QString cryptStr( const QString &aStr )
--{
--	//Once Kopete depends on 3.2 just remove this function and use KStringHandler::obscure
--	QString result;
--	for ( uint i = 0; i < aStr.length(); i++ )
--		result += ( aStr[ i ].unicode() < 0x20) ? aStr[ i ] : QChar( 0x1001F - aStr[ i ].unicode() );
--
--	return result;
--}
-+#include <kstringhandler.h>
- 
- class Kopete::Password::Private
- {
-@@ -402,7 +387,7 @@
- 	if ( passwordCrypted.isNull() )
- 		d->passwordFromKConfig = QString::null;
- 	else
--		d->passwordFromKConfig = cryptStr( passwordCrypted );
-+		d->passwordFromKConfig = KStringHandler::obscure( passwordCrypted );
- 
- 	d->remembered = config->readBoolEntry( "RememberPassword", false );
- 	d->isWrong = config->readBoolEntry( "PasswordIsWrong", false );
-@@ -425,7 +410,7 @@
- 	config->setGroup( d->configGroup );
- 
- 	if ( d->remembered && !d->passwordFromKConfig.isNull() )
--		config->writeEntry( "Password", cryptStr( d->passwordFromKConfig ) );
-+		config->writeEntry( "Password", KStringHandler::obscure( d->passwordFromKConfig ) );
- 	else
- 		config->deleteEntry( "Password" );
- 
diff --git a/kde-base/kdenetwork/files/kopete-3.5.7-videodevice.patch b/kde-base/kdenetwork/files/kopete-3.5.7-videodevice.patch
deleted file mode 100644
index 50cb8a0f2d7b..000000000000
--- a/kde-base/kdenetwork/files/kopete-3.5.7-videodevice.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- branches/KDE/3.5/kdenetwork/kopete/libkopete/avdevice/videodevice.cpp	2006/08/17 13:37:13	573903
-+++ branches/KDE/3.5/kdenetwork/kopete/libkopete/avdevice/videodevice.cpp	2007/06/09 01:27:58	673109
-@@ -1604,7 +1604,8 @@
- 				case VIDEO_PALETTE_RGB32	: return PIXELFORMAT_RGB32;	break;
- 				case VIDEO_PALETTE_YUYV		: return PIXELFORMAT_YUYV;	break;
- 				case VIDEO_PALETTE_UYVY		: return PIXELFORMAT_UYVY;	break;
--				case VIDEO_PALETTE_YUV420	: return PIXELFORMAT_YUV420P;	break;
-+				case VIDEO_PALETTE_YUV420	:
-+				case VIDEO_PALETTE_YUV420P	: return PIXELFORMAT_YUV420P;	break;
- 				case VIDEO_PALETTE_YUV422P	: return PIXELFORMAT_YUV422P;	break;
- 			}
- 			break;
-@@ -1758,7 +1759,8 @@
- 				case VIDEO_PALETTE_RGB32	: returnvalue = pixelFormatName(PIXELFORMAT_RGB32);	break;
- 				case VIDEO_PALETTE_YUYV		: returnvalue = pixelFormatName(PIXELFORMAT_YUYV);	break;
- 				case VIDEO_PALETTE_UYVY		: returnvalue = pixelFormatName(PIXELFORMAT_UYVY);	break;
--				case VIDEO_PALETTE_YUV420	: returnvalue = pixelFormatName(PIXELFORMAT_YUV420P);	break;
-+				case VIDEO_PALETTE_YUV420	:
-+				case VIDEO_PALETTE_YUV420P	: returnvalue = pixelFormatName(PIXELFORMAT_YUV420P);	break;
- 				case VIDEO_PALETTE_YUV422P	: returnvalue = pixelFormatName(PIXELFORMAT_YUV422P);	break;
- 			}
- 			break;