[kde-base/kopete] Fix compiler error in groupwise plugin

4 files changed, 41 insertions, 2 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index cfad1090..88d4538d 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.218 2009/10/12 23:58:47 abcd Exp $
 
+  24 Feb 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+  kopete-3.5.10-r6.ebuild, +files/kopete-3.5.10-groupwise.patch:
+  Fix compiler error in groupwise plugin
+
 *kopete-3.5.10-r6 (23 Feb 2010)
 
   23 Feb 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 1a607277..7b769166 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -5,6 +5,7 @@ AUX kopete-0.12_alpha1-xscreensaver.patch 778 RMD160 d188f074982191f6f961c7e32ec
 AUX kopete-3.5-rolling_icon.patch 430 RMD160 1574dc336ea63febfb9505b46f89070aff0b7dd4 SHA1 b6ad2c16fa27c3cb987b339dfe9d0546df1e2948 SHA256 2b1c56526712db57a5fe5765ac8d6a404baf53f36bb7d36a457d51c58546a908
 AUX kopete-3.5.10-gcc43.patch 5464 RMD160 d535c743e56e007883012cee6c2acc976e4be71a SHA1 f33768f7d434901c52ca8e3382422d4a2901641f SHA256 1987e03fc57ae56d70ca79efcebd23cf6b73da6a1b6548189315df580d9e6e76
 AUX kopete-3.5.10-glibc210.patch 934 RMD160 770cb726066a025fe31b5365d44999b4c10e4ee1 SHA1 3bf55d0e97fc3f374a4d41bec6e0d07f25217ced SHA256 50bbc35bd60ddb612570e1520c42f8397a14985ec9d7c9c2d1243ff6c6146e73
+AUX kopete-3.5.10-groupwise.patch 1285 RMD160 78f733628e3965beba0575ab2e2ffd2e7d54c428 SHA1 9c85a916bf0cac0dcabd8d2cf0dd28f6bf7a71df SHA256 c063324f11f5a0b3befe5f110c58a7721a3937b4bf6d1a755b6df79de97d41ed
 AUX kopete-3.5.10-icq-protocol-change2.patch 1193 RMD160 3b64b3e73e676ba470224ae8c8862fb02f2a9778 SHA1 0e850940c96d8a4f28032eeee56e7d1c56896b0d SHA256 6241bf75b41606c081da0ca116e6f1f6d004b3e4adee110da4cabb8bd15626b2
 AUX kopete-3.5.10-jabber-protocol-gtalknickfix.patch 557 RMD160 b4555d2843dbdb8acf60ddd404ccbdb588b25022 SHA1 f871ed82fe6678d0456aab02b3110030d54dcc52 SHA256 a8ada8e5d3d44e3c8f7ef64e05bdec51edc7c9c130b988a53192232d73b33bdd
 AUX kopete-3.5.10-libgadu-CVE-2008-4776.patch 1122 RMD160 f0bee221b4e98731f6dfc2612fb636abb929854a SHA1 b8e3f021ddae685cafcca557ce1054f803e2a88a SHA256 58ce7f80403a6457e4803806b90be339820e4d654ba43a8323ea72b5ef0cd62a
@@ -14,7 +15,7 @@ DIST kdenetwork-3.5.10.tar.bz2 9336764 RMD160 f888f53746f1e734d3c15c09eac1c2b9c0
 EBUILD kopete-3.5.10-r2.ebuild 4119 RMD160 b024a6b17a68b96e0209d8ab66172017d4129538 SHA1 9fa9816c772ecb5c4349190afb6d6fb1f32c95e8 SHA256 4bb57afc0292fae18849b58aa5deefca3a0ee8cf661a747bd600e4847f0d9d68
 EBUILD kopete-3.5.10-r4.ebuild 4691 RMD160 b43d9529dcae25405ec82c7b2407f4e4953ca94c SHA1 7977199877ef1c2b3c46d2b6ca9366dab9da8cda SHA256 63e8ac0c8424b3347673e6384905c03bc6b6025788780499bbf704b29fef2739
 EBUILD kopete-3.5.10-r5.ebuild 4779 RMD160 8bd08c540b731b57ca3079a4b4f912362f173f7e SHA1 412ed59aeced92f3bcf3f29fc036b91020ae0472 SHA256 a348b80e84fa747b11a39cdf4245cb6d7cc278274c16393b7c86f9b01079b2c8
-EBUILD kopete-3.5.10-r6.ebuild 4835 RMD160 ff7dc9ffc28fee1552777faeb62f19f9974bba8a SHA1 df0b9ebf2183342fb687c67872866e9a39013631 SHA256 0f57a67f7f0ede2740d8d5467888e4f086fe49bc0f0335b6ae069f43b8b3df3f
+EBUILD kopete-3.5.10-r6.ebuild 4878 RMD160 a533fa3af34606f213c9777f3d2e16d2ea0c303d SHA1 75b764e0f1340f2c8790efdbcb01a340e54081cc SHA256 a53ddb0742ca27801de94e1588b08b111af6ec019e9406b84db6f1825e618e41
 EBUILD kopete-3.5.10.ebuild 4053 RMD160 41c7c906e627c637b33ae38d160ef06475a8a418 SHA1 1f65210a253621c4625839d2d63fb898342bde99 SHA256 7bbc78b00ced6af2ca532fd87a2230f2b03d717de6d198cb548882f5ee86b01b
-MISC ChangeLog 32035 RMD160 e45071d5f668fac206a321f2ded9cfded861b409 SHA1 49998fe1b99b840cbdca9f3578a8b0a999f73818 SHA256 6a277a8ed7c79a1852e08ff60a05a6af1a14fe41485e854f05ef2783acc1d51a
+MISC ChangeLog 32206 RMD160 04385ee29e75fd82e285553db2cc3ad70e0fbe55 SHA1 15d806c4c5fc0297ce5bd749fc4844e4a9636a42 SHA256 995b23ca92705b6fe4711b9df4f5911646585d063553597889b3f2d6ed6d7ef5
 MISC metadata.xml 2177 RMD160 7fb05332a5564014005aea91cd62d4efc7587156 SHA1 e0774e6f4f08eaa49c0861c653d8557cf0eda640 SHA256 e62fb464ae82d480d882a14f378965bf18651cbb80c51234088fe8c2e0cd000c
diff --git a/kde-base/kopete/files/kopete-3.5.10-groupwise.patch b/kde-base/kopete/files/kopete-3.5.10-groupwise.patch
new file mode 100644
index 00000000..03fbb931
--- /dev/null
+++ b/kde-base/kopete/files/kopete-3.5.10-groupwise.patch
@@ -0,0 +1,33 @@
+Fix compile issue for kopete 3.5.10 groupwise plugin with recent g++.
+
+Reported by Dale in
+http://archives.gentoo.org/gentoo-desktop/msg_fc55a82d728aa61f5034a374bd8489e4.xml
+
+2010-02-24 Martin von Gagern
+
+Index: kopete-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.cc
+===================================================================
+--- kopete-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.cc
++++ kopete-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.cc
+@@ -2235,7 +2235,7 @@ void Level::setText(const char *str)
+ 
+         FontDef& def = p->fonts[m_nFont-1];
+ 
+-        char *pp = strchr(str, ';');
++        const char *pp = strchr(str, ';');
+         unsigned size;
+         if (pp != NULL)
+            size = (pp - str);
+Index: kopete-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.ll
+===================================================================
+--- kopete-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.ll
++++ kopete-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.ll
+@@ -570,7 +570,7 @@ void Level::setText(const char *str)
+ 
+         FontDef& def = p->fonts[m_nFont-1];
+ 
+-        char *pp = strchr(str, ';');
++        const char *pp = strchr(str, ';');
+         unsigned size;
+         if (pp != NULL)
+            size = (pp - str);
diff --git a/kde-base/kopete/kopete-3.5.10-r6.ebuild b/kde-base/kopete/kopete-3.5.10-r6.ebuild
index e6909809..701b0453 100644
--- a/kde-base/kopete/kopete-3.5.10-r6.ebuild
+++ b/kde-base/kopete/kopete-3.5.10-r6.ebuild
@@ -102,6 +102,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-icq-protocol-change2.patch"
 	epatch "${FILESDIR}/${P}-jabber-protocol-gtalknickfix.patch"
 	epatch "${FILESDIR}/${P}-glibc210.patch"
+	epatch "${FILESDIR}/${P}-groupwise.patch"
 
 	if use emoticons-manager; then
 		epatch "${FILESDIR}/emoticon-manager.patch"