Add patch from upstream to fix MSN filetransfer bug.

Package-Manager: portage-2.1_pre5-r4

5 files changed, 101 insertions, 7 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index c9a5522e5fec..35d7d0f14149 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.49 2006/02/21 14:15:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.50 2006/03/05 22:02:00 flameeyes Exp $
+
+*kopete-3.5.1-r1 (05 Mar 2006)
+
+  05 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-3.5.x-msn-filetransfer.patch, +kopete-3.5.1-r1.ebuild:
+  Add patch from upstream to fix MSN filetransfer bug.
 
   21 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-3.4.1.ebuild,
   kopete-3.4.1-r1.ebuild, kopete-3.4.2.ebuild, kopete-3.4.3.ebuild,
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 749f22d842d6..6819ac930a46 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 da196b5a062ef0eabf8625b152376230 ChangeLog 6702
-RMD160 3eb2e4e8991053d02769ab277e1f0e9874ab09bc ChangeLog 6702
-SHA256 1249b414aeeb8ebcb4645f800c7ad082f1530a0824805913a8f99eb698491f41 ChangeLog 6702
+MD5 b11c92093ce42055af39b76ea86489bb ChangeLog 6914
+RMD160 efc218476073d588ea42a9d91e8a390e83d4a5ac ChangeLog 6914
+SHA256 2718d4df3e5cab6f800c5e5262537cd045f297a051b62f80f3893d1e78c2120a ChangeLog 6914
 MD5 100ba684bf2f7b3bd7061b488264a21d files/configure-fix-kdenetwork-gadu.patch 2626
 RMD160 e348401fcbe734b2e0d5ba767a3f64b31abf31dc files/configure-fix-kdenetwork-gadu.patch 2626
 SHA256 b71d184ff9c44bfeb2f8e90e75145ae5c77ff5a5f23165eca3c538374d40ef3b files/configure-fix-kdenetwork-gadu.patch 2626
@@ -28,9 +28,15 @@ SHA256 59915d646e813cd8177079862657255615e1a6a784f96bdd548ced17fc8fe325 files/di
 MD5 4747b54355e84108037b9fd2986a8f87 files/digest-kopete-3.5.1 70
 RMD160 487d1fa7aea4938a3300839f91ffb6c7f3ef36c7 files/digest-kopete-3.5.1 70
 SHA256 bafa5962d219caa3bff5e7d29a5370f04638bb698052ab29ece6ff03bea6e66c files/digest-kopete-3.5.1 70
+MD5 ffaca36bfbd76fcaf0bff81fc18abbb5 files/digest-kopete-3.5.1-r1 256
+RMD160 25ce9154ed2cd689026bea70bb3df69de5995986 files/digest-kopete-3.5.1-r1 256
+SHA256 637f95bb86f559d4234523dedd762f0e9292d34b2918240e331e4d47159d59a8 files/digest-kopete-3.5.1-r1 256
 MD5 2db2170b384350ce6c05cd23c0bb21c7 files/disable-meanwhile.diff 351
 RMD160 e97ecb2f463f98a14857352647800d6402629146 files/disable-meanwhile.diff 351
 SHA256 4331c4edfe1e81ad1372dee39940e2fb12bf35b12dc298ebe5b8fb435ad35434 files/disable-meanwhile.diff 351
+MD5 1f10505ab3a80110143c11dd7d8145c8 files/kopete-3.5.x-msn-filetransfer.patch 1190
+RMD160 6232a58697527d904b7bfe14be9bf4897456d421 files/kopete-3.5.x-msn-filetransfer.patch 1190
+SHA256 de83733dcc5c44fcdd5fa3e95ecf058fbd11d0e081aced71e3ba3e1d0354f5c2 files/kopete-3.5.x-msn-filetransfer.patch 1190
 MD5 adc2f97200eaf83093e04487a86a0491 kopete-3.4.1-r1.ebuild 776
 RMD160 f1efcbb5ca742c8c2e5ef1860852f0ae872b4ba8 kopete-3.4.1-r1.ebuild 776
 SHA256 c41ed55077b864a1a538c4547b49fb7d082fd50796c874e82cc04af516d4afc3 kopete-3.4.1-r1.ebuild 776
@@ -46,6 +52,9 @@ SHA256 de51d6f25b786d62a0faa9eb30d6a2cc0d044db0b813f1df793175d8e0601131 kopete-3
 MD5 9163a9daf7e63d1196ab4ad33d7285d8 kopete-3.5.0.ebuild 999
 RMD160 9beb32cc03704f88e29cd186f53129ff9951f8ab kopete-3.5.0.ebuild 999
 SHA256 5d8bb2987e1daa85778c2c70dde2bfe1f60cffa49c0bc81f2359edf3af78bf37 kopete-3.5.0.ebuild 999
+MD5 f6c26091ffc5d9ae8671b8528ca1e6a8 kopete-3.5.1-r1.ebuild 1060
+RMD160 944913100357aeb9ba48b78331e7f2c24bbf9e57 kopete-3.5.1-r1.ebuild 1060
+SHA256 039654d3416df7b86eeb340e85de9852fe5f8ffdbae022d6700c623b7fd31d21 kopete-3.5.1-r1.ebuild 1060
 MD5 1867e76514d764fcaa25db263d3dff65 kopete-3.5.1.ebuild 999
 RMD160 3392e00fd5c9b61167c200ce9c90ac2ca611fb26 kopete-3.5.1.ebuild 999
 SHA256 a288a6b2b6109a5e9ca196a44a0d748ee265bdf987a1f75ce0d3b9c27f2ecf77 kopete-3.5.1.ebuild 999
@@ -55,7 +64,7 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD+yCZAiZjviIA2XgRAm0kAKCUcYPC3RY2q9ceFmnz+FdVZiW4dgCfX0Hd
-SsdPfsdwH59BqO7zND5Mgec=
-=WOLR
+iD8DBQFEC1+7AiZjviIA2XgRAoqaAKC/5vhL8Qi1OlWkh7h7veRaVmrDSgCfR5lJ
+Jc+hlxMpCSDd0pFJ5Xt9KR0=
+=pwkp
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/digest-kopete-3.5.1-r1 b/kde-base/kopete/files/digest-kopete-3.5.1-r1
new file mode 100644
index 000000000000..7dd4b5329b8b
--- /dev/null
+++ b/kde-base/kopete/files/digest-kopete-3.5.1-r1
@@ -0,0 +1,3 @@
+MD5 02ced8c14c80f28635056488949d56d7 kdenetwork-3.5.1.tar.bz2 7464777
+RMD160 6f3271dd50f4bebf1784c3822cab91a6b41d6fb6 kdenetwork-3.5.1.tar.bz2 7464777
+SHA256 4067db7d60927c309cfd268609d5a638c67786da6c573bb32a5af18c3939c725 kdenetwork-3.5.1.tar.bz2 7464777
diff --git a/kde-base/kopete/files/kopete-3.5.x-msn-filetransfer.patch b/kde-base/kopete/files/kopete-3.5.x-msn-filetransfer.patch
new file mode 100644
index 000000000000..9aee13aa697d
--- /dev/null
+++ b/kde-base/kopete/files/kopete-3.5.x-msn-filetransfer.patch
@@ -0,0 +1,41 @@
+Index: kopete/protocols/msn/incomingtransfer.cpp
+===================================================================
+--- kopete/protocols/msn/incomingtransfer.cpp	(revision 516055)
++++ kopete/protocols/msn/incomingtransfer.cpp	(revision 516056)
+@@ -256,19 +256,26 @@
+ 			{
+ 				// NOTE The sending client can ask for a direct connections
+ 				// if one was established before.
+-				QFile *destionation = new QFile(m_transfer->destinationURL().path());
+-				if(!destionation->open(IO_WriteOnly))
++				if(!m_file)
+ 				{
+-					if(m_transfer){
+-						m_transfer->slotError(KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing"));
+-						m_transfer = 0l;
++					QFile *destionation = new QFile(m_transfer->destinationURL().path());
++					if(!destionation->open(IO_WriteOnly))
++					{
++						if(m_transfer){
++							m_transfer->slotError(KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing"));
++							m_transfer = 0l;
++						}
++						
++						error();
++						return;
+ 					}
+-					
+-					error();
+-					return;
++				
++					m_file = destionation;
+ 				}
+-			
+-				m_file = destionation;
++				else
++				{
++					// TODO
++				}
+ 			}
+ 			
+ 			m_state = DataTransfer;
diff --git a/kde-base/kopete/kopete-3.5.1-r1.ebuild b/kde-base/kopete/kopete-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..869d86c565ea
--- /dev/null
+++ b/kde-base/kopete/kopete-3.5.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.1-r1.ebuild,v 1.1 2006/03/05 22:02:00 flameeyes Exp $
+
+KMNAME=kdenetwork
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="http://kopete.kde.org/"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="sametime ssl xmms"
+
+DEPEND="dev-libs/libxslt
+	dev-libs/libxml2
+	>=dev-libs/glib-2
+	sametime? ( =net-libs/meanwhile-0.4* )
+	xmms? ( media-sound/xmms )"
+RDEPEND="$DEPEND
+	ssl? ( app-crypt/qca-tls )
+	!net-im/kopete"
+
+PATCHES="${FILESDIR}/${PN}-3.5.x-msn-filetransfer.patch"
+
+src_compile() {
+	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
+	# Maybe we can enable it in the future.
+	# The nowlistening plugin has xmms support.
+	local myconf="$(use_enable sametime sametime-plugin)
+	              $(use_with xmms) --without-external-libgadu"
+
+	kde-meta_src_compile
+}