Add patch from upstream to fix MSN filetransfer bug.

(Portage version: 2.1_pre5-r4)

5 files changed, 129 insertions, 14 deletions

diff --git a/net-im/kopete/ChangeLog b/net-im/kopete/ChangeLog
index 6b8bb933815b..d1c6f557ef65 100644
--- a/net-im/kopete/ChangeLog
+++ b/net-im/kopete/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/kopete
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.52 2006/03/05 00:02:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.53 2006/03/05 22:00:38 flameeyes Exp $
+
+*kopete-0.12_alpha1-r1 (05 Mar 2006)
+
+  05 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-3.5.x-msn-filetransfer.patch, +kopete-0.12_alpha1-r1.ebuild:
+  Add patch from upstream to fix MSN filetransfer bug.
 
   05 Mar 2006; Hanno Boeck <hanno@gentoo.org> kopete-0.12_alpha1.ebuild:
   Add ~x86 keyword.
diff --git a/net-im/kopete/Manifest b/net-im/kopete/Manifest
index 1e40b0145148..51414df409f3 100644
--- a/net-im/kopete/Manifest
+++ b/net-im/kopete/Manifest
@@ -1,25 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ea157ba3607b482aa211b44a6f853c8f ChangeLog 790
 RMD160 61596c3c803e4242d079732a00cc02c8d0a3fb5b ChangeLog 790
 SHA256 7834d448a72fe7fb1cda3b0bc399a3c8114bc4f174b0685d6fdd90ce03455520 ChangeLog 790
 MD5 2bb6391984e53ddbe3c8c9de934bfd0d files/digest-kopete-0.12_alpha1 262
 RMD160 1c5fb4556e6ae2ed77df50e392b985a1861f4bb7 files/digest-kopete-0.12_alpha1 262
 SHA256 5358f4ff86350539ce50fceb27dbafdda7513fe3cef9b588b8b25877f24c08b6 files/digest-kopete-0.12_alpha1 262
+MD5 2bb6391984e53ddbe3c8c9de934bfd0d files/digest-kopete-0.12_alpha1-r1 262
+RMD160 1c5fb4556e6ae2ed77df50e392b985a1861f4bb7 files/digest-kopete-0.12_alpha1-r1 262
+SHA256 5358f4ff86350539ce50fceb27dbafdda7513fe3cef9b588b8b25877f24c08b6 files/digest-kopete-0.12_alpha1-r1 262
 MD5 638d3cc679fc614b53fbeff0c41aa05c files/kopete-0.12_alpha1-xscreensaver.patch 778
 RMD160 d188f074982191f6f961c7e32ec97a79746e73df files/kopete-0.12_alpha1-xscreensaver.patch 778
 SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d files/kopete-0.12_alpha1-xscreensaver.patch 778
-MD5 b2e6a93c552560c63babaf079e0cedca kopete-0.12_alpha1.ebuild 1733
-RMD160 56c468d84688b1466e3b4a527483fa343768f718 kopete-0.12_alpha1.ebuild 1733
-SHA256 85a9e51a3e9e798c50a81d8b0441966061c3e0de826f55eea2d7eeed43b57c99 kopete-0.12_alpha1.ebuild 1733
+MD5 63c23f60b015e54da99537a9f79870cc files/kopete-3.5.x-msn-filetransfer.patch 1169
+RMD160 a2149ccdc9a6a43d4fd6c0fe84d3b58e4a639983 files/kopete-3.5.x-msn-filetransfer.patch 1169
+SHA256 b57ce75581b92eaaab890cb8ee6d1897bc32675a7e20274d8568190fada961e5 files/kopete-3.5.x-msn-filetransfer.patch 1169
+MD5 26a1d49d27be3f537649121c77029846 kopete-0.12_alpha1-r1.ebuild 1790
+RMD160 34c3ad0428b062d69efae6fefacd341dff997c03 kopete-0.12_alpha1-r1.ebuild 1790
+SHA256 01b6db30e25c00ac80216d7bb36272f511886926d5413e1d32c800aa9e9476e9 kopete-0.12_alpha1-r1.ebuild 1790
 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
 SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 metadata.xml 254
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFECisSr2QksT29OyARAhklAJ4r37c6pjnB54nrcwVq+SVBmvpnUgCfV76j
-0LMBqqvuXCRgbRIOa74iFIs=
-=fk3/
------END PGP SIGNATURE-----
diff --git a/net-im/kopete/files/digest-kopete-0.12_alpha1-r1 b/net-im/kopete/files/digest-kopete-0.12_alpha1-r1
new file mode 100644
index 000000000000..703881c178c0
--- /dev/null
+++ b/net-im/kopete/files/digest-kopete-0.12_alpha1-r1
@@ -0,0 +1,3 @@
+MD5 d478259d8be070b1e2d7ce728dfa7269 kopete-0.12-alpha1.tar.bz2 5455358
+RMD160 fe6acf57f99adbdf0490c6cbef0f4c6261776d06 kopete-0.12-alpha1.tar.bz2 5455358
+SHA256 b134e68962f01d82044cc5367a4b4d8d816cabcefd4439ec57eaab4b8eeea272 kopete-0.12-alpha1.tar.bz2 5455358
diff --git a/net-im/kopete/files/kopete-3.5.x-msn-filetransfer.patch b/net-im/kopete/files/kopete-3.5.x-msn-filetransfer.patch
new file mode 100644
index 000000000000..9aee13aa697d
--- /dev/null
+++ b/net-im/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/net-im/kopete/kopete-0.12_alpha1-r1.ebuild b/net-im/kopete/kopete-0.12_alpha1-r1.ebuild
new file mode 100644
index 000000000000..acb3b1413f93
--- /dev/null
+++ b/net-im/kopete/kopete-0.12_alpha1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12_alpha1-r1.ebuild,v 1.1 2006/03/05 22:00:38 flameeyes Exp $
+
+inherit kde eutils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="http://kopete.kde.org/"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="sametime ssl xmms xscreensaver"
+
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${MY_P}"
+
+# The kernel_linux? ( ) conditional dependencies are for webcams, not supported
+# on other kernels AFAIK
+BOTH_DEPEND="dev-libs/libxslt
+	dev-libs/libxml2
+	net-dns/libidn
+	>=dev-libs/glib-2
+	app-crypt/qca
+	sametime? ( =net-libs/meanwhile-0.4* )
+	xmms? ( media-sound/xmms )
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrender
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		) virtual/x11 )
+	kernel_linux? ( virtual/opengl )"
+
+RDEPEND="${BOTH_DEPEND}
+	ssl? ( app-crypt/qca-tls )
+	!kde-base/kopete"
+
+DEPEND="${BOTH_DEPEND}
+	kernel_linux? ( virtual/os-headers )
+	|| ( (
+			x11-proto/videoproto
+			x11-proto/xextproto
+			x11-proto/xproto
+			kernel_linux? ( x11-libs/libXv )
+			xscreensaver? ( x11-proto/scrnsaverproto )
+		) virtual/x11 )"
+
+need-kde 3.4
+
+src_unpack() {
+	kde_src_unpack
+	epatch "${FILESDIR}/${P}-xscreensaver.patch"
+	epatch "${FILESDIR}/${PN}-3.5.x-msn-filetransfer.patch"
+	rm -f ${S}/configure
+}
+
+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
+	              $(use_with xscreensaver)"
+
+	kde_src_compile
+}