Patch added to fix compilation issue, closes bug 112354.

Package-Manager: portage-2.0.53_rc7

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 0e5da267fc1d5df896351ff1fac96d5b8afed6f8..a67c8459e579956a6ad5e65e50bc0d3a8cdd5539 100644 (file)
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.33 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.34 2005/11/15 13:24:49 cryos Exp $
+
+  15 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/kopete-3.5.0_rc1-fix.patch, kopete-3.5.0_rc1.ebuild:
+  Patch added to fix compilation issue, closes bug 112354.
 
 *kopete-3.5.0_rc1 (12 Nov 2005)
 

diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 2bf3d8131ac4d607c6f46968ec52a9f96384cba9..513952e187374646df2532ae1320944c2b4a6185 100644 (file)
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,4 +1,7 @@
-MD5 14133c3393aa578da224e9b5ae369944 ChangeLog 4837
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 737db1208f41c34ad938bf595473301d ChangeLog 5008
 MD5 100ba684bf2f7b3bd7061b488264a21d files/configure-fix-kdenetwork-gadu.patch 2626
 MD5 3a5877277804af9bdafd5fd0e80c9f61 files/configure-fix-kdenetwork-xmms.patch 1183
 MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kopete-3.4.1 218
@@ -9,11 +12,19 @@ MD5 e48a9939e32d172601a814622502aa3b files/digest-kopete-3.5.0_beta2 222
 MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-kopete-3.5.0_rc1 308
 MD5 16b903e400a8cf2d73f3c237799238db files/digest-kopete-3.5_beta1 71
 MD5 2db2170b384350ce6c05cd23c0bb21c7 files/disable-meanwhile.diff 351
+MD5 db3c7f3cc040e55e195767191491acaa files/kopete-3.5.0_rc1-fix.patch 709
 MD5 04a2f0cd98df7d21f30ef36d4c4f20d4 kopete-3.4.1-r1.ebuild 757
 MD5 ec7b8d63a646262499635474f93ffd3b kopete-3.4.1.ebuild 551
 MD5 3d71eb4f7bb9c12d729d0a4792976142 kopete-3.4.2.ebuild 1044
 MD5 e095c97e8d4fb931d8514a4c9f43c33e kopete-3.4.3.ebuild 1044
 MD5 78512e3622661d63f595d83e3c20f461 kopete-3.5.0_beta2.ebuild 966
-MD5 7172c8a34f31b954ecbe00cc007cdf01 kopete-3.5.0_rc1.ebuild 967
+MD5 d5ec8966884bed2087a1fe9119b442e0 kopete-3.5.0_rc1.ebuild 1002
 MD5 873857041cd1f0d400a0ae252d367b43 kopete-3.5_beta1.ebuild 961
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDeeGsntT9W3vfTuoRAkDnAJ0UyyTjQMfI/9c5pg2vg36/LB9KJQCfZfSc
+CXNnPPAq8j6RMrW66vt4QQo=
+=ScBT
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kopete/files/kopete-3.5.0_rc1-fix.patch b/kde-base/kopete/files/kopete-3.5.0_rc1-fix.patch
new file mode 100644 (file)
index 0000000..1f2afd8
--- /dev/null
+++ b/kde-base/kopete/files/kopete-3.5.0_rc1-fix.patch
@@ -0,0 +1,20 @@
+Index: kircmessage.cpp
+===================================================================
+--- kopete/protocols/irc/libkirc/kircmessage.cpp       (revision 479956)
++++ kopete/protocols/irc/libkirc/kircmessage.cpp       (working copy)
+@@ -168,11 +168,11 @@
+                       //
+                       // Some servers send '\n' instead of '\r\n' that the RFCs say they should be sending.
+ 
+-                      if (length > 1 && raw[length-2] == '\n') {
+-                              raw[length-2] = '\0';
++                      if (length > 1 && raw.at(length-2) == '\n') {
++                              raw.at(length-2) = '\0';
+                       }
+-                      if (length > 2 && raw[length-3] == '\r') {
+-                              raw[length-3] = '\0';
++                      if (length > 2 && raw.at(length-3) == '\r') {
++                              raw.at(length-3) = '\0';
+                       }
+ 
+                       kdDebug(14121) << "<< " << raw << endl;

diff --git a/kde-base/kopete/kopete-3.5.0_rc1.ebuild b/kde-base/kopete/kopete-3.5.0_rc1.ebuild
index b43718512a245512d90b43bcfe6aad01d8161681..a21f0d4324ae78a9f4134c2feb0a9d25460877f7 100644 (file)
--- a/kde-base/kopete/kopete-3.5.0_rc1.ebuild
+++ b/kde-base/kopete/kopete-3.5.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.0_rc1.ebuild,v 1.2 2005/11/15 13:24:49 cryos Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -21,6 +21,8 @@ DEPEND="dev-libs/libxslt
 RDEPEND="$DEPEND
        ssl? ( app-crypt/qca-tls )"
 
+PATCHES="${FILESDIR}/${P}-fix.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.