Added cjk patch. Thanks to Jackey Yang <043936y@acadiau.ca>; bug #53050.

8 files changed, 212 insertions, 23 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index e162fb103a08..ed05a9f9b724 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 741390c301c2..46f75896e20c 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,21 +1,32 @@
-MD5 239763a14ed3ac5f067392961917ed30 ChangeLog 15197
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4a0de5553157ad174de11737645752e7 ChangeLog 15462
 MD5 20ad9e465bdba8ac154491af0bfce253 kdepim-3.1.5.ebuild 788
 MD5 b94e9822234ab9cd1985465fc2c3cde0 kdepim-3.2.0-r2.ebuild 817
-MD5 9b804c502e4f3943f9321f8e1455675d kdepim-3.2.2.ebuild 763
-MD5 2bd08076067fdbc1cda3cddffb65faee kdepim-3.2.3.ebuild 753
-MD5 af4797efcd24d4dbf5383dd13ce77189 kdepim-3.3.0-r1.ebuild 708
-MD5 3768e165b5f1f1306ca85ef677a46aef kdepim-3.3.0.ebuild 665
-MD5 db23936e7582c1b5bf935bcab5d90545 kdepim-3.3.1.ebuild 562
+MD5 c0e755cc7ddaa820f8795c730bdb1090 kdepim-3.3.1.ebuild 660
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 bf481282b9583a3e4095dcdef1aee22c files/KMail-inboxEater-BRANCH.diff 1619
+MD5 6da394d6e796fad70c53db75e86a5ba6 kdepim-3.2.2.ebuild 835
+MD5 cd410f6f837aa51fd6049a4df0354905 kdepim-3.2.3.ebuild 817
+MD5 a20d13848a2e7fef73e45b805f17bee1 kdepim-3.3.0-r1.ebuild 764
+MD5 53dceab490eb5156d154968b3d7d1f6f kdepim-3.3.0.ebuild 724
 MD5 0658e29c8e0fa024884f165bf129e8e9 files/digest-kdepim-3.1.5 66
 MD5 bafdafa3d2488fa1168ccbb4a981dd87 files/digest-kdepim-3.2.0-r2 66
+MD5 2de4f94fe84a3a581cdcf16819fa8e30 files/digest-kdepim-3.3.1 67
+MD5 ee45bc53826f95bcf3a3367db4d3845e files/kmfilter.cpp.patch 1528
+MD5 6f3f2b21eacb5869a9cbb821ffcf48a6 files/kpilot-parallel-make-fix.patch 737
+MD5 bf481282b9583a3e4095dcdef1aee22c files/KMail-inboxEater-BRANCH.diff 1619
 MD5 037cd03c8e7281aec672e6e44c15e7e6 files/digest-kdepim-3.2.2 66
 MD5 318e6b50444a5837fed2a5ea9ecc57e9 files/digest-kdepim-3.2.3 66
-MD5 b23510fd22323447768b483104d208b0 files/digest-kdepim-3.3.0 66
+MD5 678530a6c8baabd5d9cbe817b5c571f2 files/kdepim-3.2.3-cjk.diff 6957
 MD5 b23510fd22323447768b483104d208b0 files/digest-kdepim-3.3.0-r1 66
-MD5 2de4f94fe84a3a581cdcf16819fa8e30 files/digest-kdepim-3.3.1 67
-MD5 a177687427f7274f5370733d2f4ff16a files/kdepim-3.3.0-korganizer.patch 469
 MD5 f4d1f0db7f8d8af2a3a67ca332fcdaef files/kdepim-3.3.0-spam-assistant.patch 29970
-MD5 ee45bc53826f95bcf3a3367db4d3845e files/kmfilter.cpp.patch 1528
-MD5 6f3f2b21eacb5869a9cbb821ffcf48a6 files/kpilot-parallel-make-fix.patch 737
+MD5 b23510fd22323447768b483104d208b0 files/digest-kdepim-3.3.0 66
+MD5 a177687427f7274f5370733d2f4ff16a files/kdepim-3.3.0-korganizer.patch 469
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBjjekVWNWqTUmv+0RAlfbAKCDDTLcEbGfS8SPdK+N9FIMq3OC8QCfUw9C
+Pqpbf68bqk/pCjzW+hbDoEs=
+=XI8G
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim/files/kdepim-3.2.3-cjk.diff b/kde-base/kdepim/files/kdepim-3.2.3-cjk.diff
new file mode 100644
index 000000000000..3f523611eff9
--- /dev/null
+++ b/kde-base/kdepim/files/kdepim-3.2.3-cjk.diff
@@ -0,0 +1,166 @@
+diff -ruN kdepim-3.2.2/knode/knarticlewidget.cpp kdepim-3.2.2.cjk/knode/knarticlewidget.cpp
+--- kdepim-3.2.2/knode/knarticlewidget.cpp	2004-04-04 06:14:03.000000000 -0300
++++ kdepim-3.2.2.cjk/knode/knarticlewidget.cpp	2004-06-04 19:33:25.754204504 -0300
+@@ -191,7 +191,7 @@
+   QStringList cs=KGlobal::charsets()->availableEncodingNames();
+   cs.prepend(i18n("Automatic"));
+   a_ctSetCharset->setItems(cs);
+-  a_ctSetCharset->setCurrentItem(0);
++  a_ctSetCharset->setCurrentItem(34);
+   connect(a_ctSetCharset, SIGNAL(activated(const QString&)),
+           this, SLOT(slotSetCharset(const QString&)));
+   a_ctSetCharsetKeyb = new KAction(i18n("Charset"), Key_C, this,
+diff -ruN kdepim-3.2.2/knode/knconfig.cpp kdepim-3.2.2.cjk/knode/knconfig.cpp
+--- kdepim-3.2.2/knode/knconfig.cpp	2003-10-26 06:57:45.000000000 -0400
++++ kdepim-3.2.2.cjk/knode/knconfig.cpp	2004-06-04 19:43:24.030252720 -0300
+@@ -979,7 +979,7 @@
+     c_omposerCharsets=QStringList::split(',',"us-ascii,utf-8,iso-8859-1,iso-8859-2,"
+     "iso-8859-3,iso-8859-4,iso-8859-5,iso-8859-6,iso-8859-7,iso-8859-8,"
+     "iso-8859-9,iso-8859-10,iso-8859-13,iso-8859-14,iso-8859-15,koi8-r,koi8-u,"
+-    "iso-2022-jp,iso-2022-jp-2,iso-2022-kr,euc-jp,euc-kr,Big5,gb2312");
++    "iso-2022-jp,iso-2022-jp-2,iso-2022-kr,euc-jp,euc-kr,Big5,gb2312,gb18030");
+ 
+   c_harset=conf->readEntry("Charset").latin1();
+   if (c_harset.isEmpty()) {
+diff -ruN kdepim-3.2.2/knode/kngroup.cpp kdepim-3.2.2.cjk/knode/kngroup.cpp
+--- kdepim-3.2.2/knode/kngroup.cpp	2003-08-08 06:09:07.000000000 -0300
++++ kdepim-3.2.2.cjk/knode/kngroup.cpp	2004-06-04 20:44:14.870240680 -0300
+@@ -38,7 +38,7 @@
+ KNGroup::KNGroup(KNCollection *p)
+   : KNArticleCollection(p), n_ewCount(0), l_astFetchCount(0), r_eadCount(0),
+     l_astNr(0), m_axFetch(0), d_ynDataFormat(1), f_irstNew(-1), l_ocked(false),
+-    u_seCharset(false), s_tatus(unknown), i_dentity(0)
++    u_seCharset(true), s_tatus(unknown), i_dentity(0)
+ {
+ }
+ 
+@@ -85,7 +85,7 @@
+   f_irstNr = info.readNumEntry("firstMsg",0);
+   l_astNr = info.readNumEntry("lastMsg",0);
+   d_ynDataFormat = info.readNumEntry("dynDataFormat",0);
+-  u_seCharset = info.readBoolEntry("useCharset", false);
++  u_seCharset = info.readBoolEntry("useCharset", true);
+   d_efaultChSet = info.readEntry("defaultChSet").latin1();
+   QString s = info.readEntry("status","unknown");
+   if (s=="readOnly")
+diff -ruN kdepim-3.2.2/knode/kngroupmanager.cpp kdepim-3.2.2.cjk/knode/kngroupmanager.cpp
+--- kdepim-3.2.2/knode/kngroupmanager.cpp	2003-08-08 06:09:07.000000000 -0300
++++ kdepim-3.2.2.cjk/knode/kngroupmanager.cpp	2004-06-04 20:47:44.375391056 -0300
+@@ -115,18 +115,18 @@
+       sepPos1 = line.find(' ');
+ 
+       if (sepPos1==-1) {        // no description
+-        name = QString::fromUtf8(line);
++        name = QString::fromLocal8Bit(line);
+         description = QString::null;
+         status = KNGroup::unknown;
+       } else {
+-        name = QString::fromUtf8(line.left(sepPos1));
++        name = QString::fromLocal8Bit(line.left(sepPos1));
+ 
+         sepPos2 = line.find(' ',sepPos1+1);
+         if (sepPos2==-1) {        // no status
+-          description = QString::fromUtf8(line.right(line.length()-sepPos1-1));
++          description = QString::fromLocal8Bit(line.right(line.length()-sepPos1-1));
+           status = KNGroup::unknown;
+         } else {
+-          description = QString::fromUtf8(line.right(line.length()-sepPos2-1));
++          description = QString::fromLocal8Bit(line.right(line.length()-sepPos2-1));
+           switch (line[sepPos1+1]) {
+             case 'u':   status = KNGroup::unknown;
+                         break;
+@@ -171,7 +171,7 @@
+ 
+   if(f.open(IO_WriteOnly)) {
+     for (KNGroupInfo *i=groups->first(); i; i=groups->next()) {
+-      temp = i->name.utf8();
++      temp = i->name.local8Bit();
+       switch (i->status) {
+         case KNGroup::unknown: temp += " u ";
+                                break;
+@@ -182,7 +182,7 @@
+         case KNGroup::moderated: temp += " m ";
+                                  break;
+       }
+-      temp += i->description.utf8() + "\n";
++      temp += i->description.local8Bit() + "\n";
+       f.writeBlock(temp.data(),temp.length());
+     }
+     f.close();
+diff -ruN kdepim-3.2.2/knode/knnntpclient.cpp kdepim-3.2.2.cjk/knode/knnntpclient.cpp
+--- kdepim-3.2.2/knode/knnntpclient.cpp	2004-01-17 08:55:17.000000000 -0400
++++ kdepim-3.2.2.cjk/knode/knnntpclient.cpp	2004-06-04 22:20:45.024553432 -0300
+@@ -113,7 +113,7 @@
+     } else {
+       s[0] = 0;    // cut string
+ 
+-      name = QString::fromUtf8(line);
++      name = QString::fromLocal8Bit(line);
+ 
+       if (target->subscribed.contains(name)) {
+         target->subscribed.remove(name);    // group names are unique, we wont find it again anyway...
+@@ -182,7 +182,7 @@
+           s++;
+           while (*s == ' ' || *s == '\t') s++;    // go on to the description
+ 
+-          name = QString::fromUtf8(line);
++          name = QString::fromLocal8Bit(line);
+           if (target->codecForDescriptions)          // some countries use local 8 bit characters in the tag line
+             description = target->codecForDescriptions->toUnicode(s);
+           else
+@@ -248,7 +248,7 @@
+ #endif
+     } else {
+       s[0] = 0;    // cut string
+-      name = QString::fromUtf8(line);
++      name = QString::fromLocal8Bit(line);
+ 
+       while (s[1]!=0) s++;   // the last character determines the moderation status
+       switch (s[0]) {
+@@ -284,7 +284,7 @@
+     int rep;
+ 
+     for (KNGroupInfo *group=tmpList.first(); group; group=tmpList.next()) {
+-      if (!sendCommand(cmd+group->name.utf8(),rep))
++      if (!sendCommand(cmd+group->name.local8Bit(),rep))
+         return;
+       if (rep != 215)        // 215 informations follows
+         break;
+@@ -339,7 +339,7 @@
+               .arg(account.server()).arg(target->groupname());
+ 
+   cmd="GROUP ";
+-  cmd+=target->groupname().utf8();
++  cmd+=target->groupname().local8Bit();
+   if (!sendCommandWCheck(cmd,211)) {       // 211 n f l s group selected
+     return;
+   }
+@@ -440,7 +440,7 @@
+     QString groupName = static_cast<KNGroup*>(target->collection())->groupname();
+     if (currentGroup != groupName) {
+       cmd="GROUP ";
+-      cmd+=groupName.utf8();
++      cmd+=groupName.local8Bit();
+       if (!sendCommandWCheck(cmd,211))       // 211 n f l s group selected
+         return;
+       currentGroup = groupName;
+diff -ruN kdepim-3.2.2/libkdenetwork/kmime_headers.cpp kdepim-3.2.2.cjk/libkdenetwork/kmime_headers.cpp
+--- kdepim-3.2.2/libkdenetwork/kmime_headers.cpp	2003-07-28 04:09:53.000000000 -0300
++++ kdepim-3.2.2.cjk/libkdenetwork/kmime_headers.cpp	2004-06-04 22:22:54.000946040 -0300
+@@ -946,14 +946,14 @@
+ 
+ void Newsgroups::fromUnicodeString(const QString &s, const QCString&)
+ {
+-  g_roups=s.utf8();
++  g_roups=s.local8Bit();
+   e_ncCS=cachedCharset("UTF-8");
+ }
+ 
+ 
+ QString Newsgroups::asUnicodeString()
+ {
+-  return QString::fromUtf8(g_roups);
++  return QString::fromLocal8Bit(g_roups);
+ }
+ 
+ 
diff --git a/kde-base/kdepim/kdepim-3.2.2.ebuild b/kde-base/kdepim/kdepim-3.2.2.ebuild
index e0c320627070..97b32ed870ed 100644
--- a/kde-base/kdepim/kdepim-3.2.2.ebuild
+++ b/kde-base/kdepim/kdepim-3.2.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.2.ebuild,v 1.8 2004/07/07 00:56:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.2.ebuild,v 1.9 2004/11/07 15:02:52 usata Exp $
 
-inherit kde-dist
+inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE="pda crypt ldap"
+IUSE="pda crypt ldap cjk"
 
 DEPEND="~kde-base/kdenetwork-${PV}
 	pda? ( app-pda/pilot-link dev-libs/libmal )
@@ -16,6 +16,8 @@ DEPEND="~kde-base/kdenetwork-${PV}
 
 src_unpack() {
 	kde_src_unpack
+	cd ${S}
+	use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
 }
 
 src_compile() {
diff --git a/kde-base/kdepim/kdepim-3.2.3.ebuild b/kde-base/kdepim/kdepim-3.2.3.ebuild
index 4586dd005f89..a59eaf69c031 100644
--- a/kde-base/kdepim/kdepim-3.2.3.ebuild
+++ b/kde-base/kdepim/kdepim-3.2.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.3.ebuild,v 1.9 2004/08/12 19:54:26 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.3.ebuild,v 1.10 2004/11/07 15:02:52 usata Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
 KEYWORDS="x86 ppc amd64 sparc hppa"
-IUSE="pda crypt ldap"
+IUSE="pda crypt ldap cjk"
 
 DEPEND="~kde-base/kdenetwork-${PV}
 	pda? ( app-pda/pilot-link dev-libs/libmal )
@@ -16,6 +16,8 @@ DEPEND="~kde-base/kdenetwork-${PV}
 
 src_unpack() {
 	kde_src_unpack
+	cd ${S}
+	use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
 }
 
 src_compile() {
diff --git a/kde-base/kdepim/kdepim-3.3.0-r1.ebuild b/kde-base/kdepim/kdepim-3.3.0-r1.ebuild
index 50837d913893..c13c5947d8af 100644
--- a/kde-base/kdepim/kdepim-3.3.0-r1.ebuild
+++ b/kde-base/kdepim/kdepim-3.3.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0-r1.ebuild,v 1.6 2004/10/04 14:48:10 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0-r1.ebuild,v 1.7 2004/11/07 15:02:52 usata Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
 KEYWORDS="~x86 ~amd64 ~ppc64 sparc ppc hppa"
-IUSE="crypt gnokii pda"
+IUSE="crypt gnokii pda cjk"
 
 DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal )
 	gnokii? ( x86? ( net-dialup/gnokii ) )
@@ -17,5 +17,6 @@ src_unpack() {
 	kde_src_unpack
 	epatch ${FILESDIR}/kdepim-3.3.0-korganizer.patch
 	epatch ${FILESDIR}/kdepim-3.3.0-spam-assistant.patch
+	use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
 	make -f admin/Makefile.common
 }
diff --git a/kde-base/kdepim/kdepim-3.3.0.ebuild b/kde-base/kdepim/kdepim-3.3.0.ebuild
index 1102034903f2..82c684355720 100644
--- a/kde-base/kdepim/kdepim-3.3.0.ebuild
+++ b/kde-base/kdepim/kdepim-3.3.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0.ebuild,v 1.9 2004/09/20 01:59:39 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0.ebuild,v 1.10 2004/11/07 15:02:52 usata Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
 KEYWORDS="x86 amd64 ppc64 sparc ppc"
-IUSE="pda crypt"
+IUSE="pda crypt cjk"
 
 DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal )
 	crypt? ( !ppc64? ( =app-crypt/gpgme-0.4* ) )"
@@ -15,6 +15,7 @@ DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal )
 src_unpack() {
 	kde_src_unpack
 	epatch ${FILESDIR}/kdepim-3.3.0-korganizer.patch
+	use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
 }
 
 src_compile() {
diff --git a/kde-base/kdepim/kdepim-3.3.1.ebuild b/kde-base/kdepim/kdepim-3.3.1.ebuild
index 8ae4687006a6..94374b07ad3f 100644
--- a/kde-base/kdepim/kdepim-3.3.1.ebuild
+++ b/kde-base/kdepim/kdepim-3.3.1.ebuild
@@ -1,15 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.1.ebuild,v 1.8 2004/11/06 18:29:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.1.ebuild,v 1.9 2004/11/07 15:02:52 usata Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
 KEYWORDS="~amd64 ~hppa sparc x86 ~ppc ~alpha ~ppc64"
-IUSE="crypt gnokii pda"
+IUSE="crypt gnokii pda cjk"
 
 DEPEND=">=kde-base/kdebase-3.3.0
 	pda? ( app-pda/pilot-link dev-libs/libmal )
 	gnokii? ( net-dialup/gnokii )
 	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
+
+src_unpack() {
+	kde_src_unpack
+	cd ${S}
+	use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
+}