From 961969f9399a99e85394bb3a556a2647a5ada7f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sat, 27 Jan 2007 18:51:23 +0000 Subject: [PATCH] Add two patches to fix serious issues coming from upstream. Remove stale patches. Package-Manager: portage-2.1.2-r4 --- kde-base/kdepim/ChangeLog | 15 +- kde-base/kdepim/Manifest | 57 +++--- kde-base/kdepim/files/digest-kdepim-3.5.6-r1 | 6 + kde-base/kdepim/files/kdepim-3.2.3-cjk.diff | 166 ------------------ .../kdepim/files/kdepim-3.4-configure.patch | 110 ------------ .../files/kdepim-3.4.1-akregator-unread.patch | 13 -- .../files/kdepim-3.4.1-kpilot-fix.patch | 136 -------------- .../kdepim/files/kdepim-3.4.2-gcc32.patch | 162 ----------------- .../kdepim/files/kdepim-3.4.2-partnode.patch | 20 --- .../files/kmail-3.4.1-shift+click-crash.diff | 10 -- .../files/kmail-3.5.6-kde-bug-140660.patch | 19 ++ .../kdepim/files/kmail-3.5.6-templates.patch | 20 +++ kde-base/kdepim/kdepim-3.5.6-r1.ebuild | 48 +++++ 13 files changed, 129 insertions(+), 653 deletions(-) create mode 100644 kde-base/kdepim/files/digest-kdepim-3.5.6-r1 delete mode 100644 kde-base/kdepim/files/kdepim-3.2.3-cjk.diff delete mode 100644 kde-base/kdepim/files/kdepim-3.4-configure.patch delete mode 100644 kde-base/kdepim/files/kdepim-3.4.1-akregator-unread.patch delete mode 100644 kde-base/kdepim/files/kdepim-3.4.1-kpilot-fix.patch delete mode 100644 kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch delete mode 100644 kde-base/kdepim/files/kdepim-3.4.2-partnode.patch delete mode 100644 kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff create mode 100644 kde-base/kdepim/files/kmail-3.5.6-kde-bug-140660.patch create mode 100644 kde-base/kdepim/files/kmail-3.5.6-templates.patch create mode 100644 kde-base/kdepim/kdepim-3.5.6-r1.ebuild diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog index dc82e8a2231c..7448d867c3ef 100644 --- a/kde-base/kdepim/ChangeLog +++ b/kde-base/kdepim/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for kde-base/kdepim # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.245 2007/01/27 15:13:04 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.246 2007/01/27 18:51:23 flameeyes Exp $ + +*kdepim-3.5.6-r1 (27 Jan 2007) + + 27 Jan 2007; Diego Pettenò + -files/kdepim-3.2.3-cjk.diff, -files/kdepim-3.4.1-akregator-unread.patch, + -files/kdepim-3.4.1-kpilot-fix.patch, + -files/kmail-3.4.1-shift+click-crash.diff, + -files/kdepim-3.4.2-gcc32.patch, -files/kdepim-3.4.2-partnode.patch, + -files/kdepim-3.4-configure.patch, + +files/kmail-3.5.6-kde-bug-140660.patch, + +files/kmail-3.5.6-templates.patch, +kdepim-3.5.6-r1.ebuild: + Add two patches to fix serious issues coming from upstream. Remove stale + patches. 27 Jan 2007; Diego Pettenò kdepim-3.5.5-r2.ebuild, kdepim-3.5.6.ebuild: diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest index b1f588e96011..dcff3e934af1 100644 --- a/kde-base/kdepim/Manifest +++ b/kde-base/kdepim/Manifest @@ -9,34 +9,6 @@ AUX imap-dos.diff 588 RMD160 1386a3f440a0f6ca6b2131e75ddeff14ab939231 SHA1 3a4b8 MD5 d35a0d3aa0ceb7fabae33d323ae281dd files/imap-dos.diff 588 RMD160 1386a3f440a0f6ca6b2131e75ddeff14ab939231 files/imap-dos.diff 588 SHA256 ff0d36381d76ecd05fc7b159d1d552fc402d76c94981122b08d0cd37d52c2dd3 files/imap-dos.diff 588 -AUX kdepim-3.2.3-cjk.diff 6957 RMD160 ddea2eee76ff5cd5df92e8406e408da644846d58 SHA1 80b06d21b6aa877dc751c4449f77f73bfe50300e SHA256 e3f467537b1a0291ac28d522c4f2c4b7b7d2d3d0ec4178bed85d53e92ce326fe -MD5 678530a6c8baabd5d9cbe817b5c571f2 files/kdepim-3.2.3-cjk.diff 6957 -RMD160 ddea2eee76ff5cd5df92e8406e408da644846d58 files/kdepim-3.2.3-cjk.diff 6957 -SHA256 e3f467537b1a0291ac28d522c4f2c4b7b7d2d3d0ec4178bed85d53e92ce326fe files/kdepim-3.2.3-cjk.diff 6957 -AUX kdepim-3.4-configure.patch 4618 RMD160 e8bc213ae2fc9febf40e46180fa87722e6cd85e9 SHA1 92e5c476b16ac9edbe57bfa3217908ec44d10e0f SHA256 09beb38f09e92785be4521cd6fdea7731a159da0ff35a69570188fa5d2946042 -MD5 cdef4c59d15d12f305392988443237bd files/kdepim-3.4-configure.patch 4618 -RMD160 e8bc213ae2fc9febf40e46180fa87722e6cd85e9 files/kdepim-3.4-configure.patch 4618 -SHA256 09beb38f09e92785be4521cd6fdea7731a159da0ff35a69570188fa5d2946042 files/kdepim-3.4-configure.patch 4618 -AUX kdepim-3.4.1-akregator-unread.patch 673 RMD160 0603379e15da9363bd7e809c81d952d833a26398 SHA1 11f2cdae61289e16680225cfe98b0a4aa27cd0be SHA256 ac14e5a4cafe8a408b6b176eac0ea8621f6874caab106dafa7a3c5b33ecf2a99 -MD5 b6a29865e7aefe8e3858bd65de651d3d files/kdepim-3.4.1-akregator-unread.patch 673 -RMD160 0603379e15da9363bd7e809c81d952d833a26398 files/kdepim-3.4.1-akregator-unread.patch 673 -SHA256 ac14e5a4cafe8a408b6b176eac0ea8621f6874caab106dafa7a3c5b33ecf2a99 files/kdepim-3.4.1-akregator-unread.patch 673 -AUX kdepim-3.4.1-kpilot-fix.patch 4635 RMD160 9409b6afe134f8836fbff481dd184f0bb382ea05 SHA1 857335a8c2867cff21f28485da46e2a2e6fe4837 SHA256 ff990fa6e1c86edd6bb144ec0059bab3b6aaa37905ed743c4299ced92cf4dde6 -MD5 0324965cf9c67cc4750d7a14cec3ef1f files/kdepim-3.4.1-kpilot-fix.patch 4635 -RMD160 9409b6afe134f8836fbff481dd184f0bb382ea05 files/kdepim-3.4.1-kpilot-fix.patch 4635 -SHA256 ff990fa6e1c86edd6bb144ec0059bab3b6aaa37905ed743c4299ced92cf4dde6 files/kdepim-3.4.1-kpilot-fix.patch 4635 -AUX kdepim-3.4.2-gcc32.patch 5997 RMD160 6213f4f966f1a280431d561e76dc30102ffb5543 SHA1 e8cf8b89b08e7fb624f58376b705e4d53686e379 SHA256 6a3ca9cb2ce864bf811a39ba5fe06d6024d8af8472e30df72d5d9c77896cb334 -MD5 dbcc0fbc697ad83e081e07c4f7a3c58f files/kdepim-3.4.2-gcc32.patch 5997 -RMD160 6213f4f966f1a280431d561e76dc30102ffb5543 files/kdepim-3.4.2-gcc32.patch 5997 -SHA256 6a3ca9cb2ce864bf811a39ba5fe06d6024d8af8472e30df72d5d9c77896cb334 files/kdepim-3.4.2-gcc32.patch 5997 -AUX kdepim-3.4.2-partnode.patch 756 RMD160 c935bb7e350b7e52287c069724b84969a15a1af1 SHA1 ff7cdbc224b215061934477b1da00e39b2532fb6 SHA256 e3681f4ff94ae2b0f82e953c73f82ed09de684a35a49a622bc1848e3e979c888 -MD5 0dc20eebce2c8cb4475f065683ae24ff files/kdepim-3.4.2-partnode.patch 756 -RMD160 c935bb7e350b7e52287c069724b84969a15a1af1 files/kdepim-3.4.2-partnode.patch 756 -SHA256 e3681f4ff94ae2b0f82e953c73f82ed09de684a35a49a622bc1848e3e979c888 files/kdepim-3.4.2-partnode.patch 756 -AUX kmail-3.4.1-shift+click-crash.diff 516 RMD160 408c39b32458061c0634ea577538e708d5db6282 SHA1 0328b0727ff71c2814d410dc3c477290990470d1 SHA256 a3edde6599f93c2f018ffec1747d43f2a096edb11ad67702e3cdf69c9d32cac7 -MD5 465fb4ad98b38e7c5328429eaabb1000 files/kmail-3.4.1-shift+click-crash.diff 516 -RMD160 408c39b32458061c0634ea577538e708d5db6282 files/kmail-3.4.1-shift+click-crash.diff 516 -SHA256 a3edde6599f93c2f018ffec1747d43f2a096edb11ad67702e3cdf69c9d32cac7 files/kmail-3.4.1-shift+click-crash.diff 516 AUX kmail-3.5.2-imap-fixes-2.diff 16328 RMD160 566fc5fe60ac2bb2214a648537a01f496c2f8e5a SHA1 b522c138bc4dd152f04328616c9e16658d4497ee SHA256 bfdf27d9aae396a4d2fc5b73964cc322e6c7f0a851f132902929d0faf925041b MD5 58c96168ba8c9698166ff2e425ab41b2 files/kmail-3.5.2-imap-fixes-2.diff 16328 RMD160 566fc5fe60ac2bb2214a648537a01f496c2f8e5a files/kmail-3.5.2-imap-fixes-2.diff 16328 @@ -49,6 +21,14 @@ AUX kmail-3.5.5-dimap-mail-loss.patch 9870 RMD160 8abfe56734cc94917e4ffc94029414 MD5 970d8db800a3bb39be0c7f4a41c35e06 files/kmail-3.5.5-dimap-mail-loss.patch 9870 RMD160 8abfe56734cc94917e4ffc94029414789692e8da files/kmail-3.5.5-dimap-mail-loss.patch 9870 SHA256 30992bb319dff9ef45c3b44873284346e7727f5982835d97af44030511e3a636 files/kmail-3.5.5-dimap-mail-loss.patch 9870 +AUX kmail-3.5.6-kde-bug-140660.patch 577 RMD160 ffc625a1561d5e2134cc4130887cbb7455e9d076 SHA1 e97ad7fdd1f521de3c59f722bdb2496ed533cc89 SHA256 f0c57fe9ab07ed0cbeffa1a83ede5f2defa99c8299265eb43f66c97a6daa7311 +MD5 3219e7c98742a8c7a36f1194d501b022 files/kmail-3.5.6-kde-bug-140660.patch 577 +RMD160 ffc625a1561d5e2134cc4130887cbb7455e9d076 files/kmail-3.5.6-kde-bug-140660.patch 577 +SHA256 f0c57fe9ab07ed0cbeffa1a83ede5f2defa99c8299265eb43f66c97a6daa7311 files/kmail-3.5.6-kde-bug-140660.patch 577 +AUX kmail-3.5.6-templates.patch 875 RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a24f9 SHA1 596bfe6028db4d0f54d7f88d31f461a28c64a778 SHA256 096382a01c2e80db89b6b08a7f1959bf53b3e08f0c74b7d310b6672b630e8cbe +MD5 2921dd25ca635bd565a8e2e9ae8745d4 files/kmail-3.5.6-templates.patch 875 +RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a24f9 files/kmail-3.5.6-templates.patch 875 +SHA256 096382a01c2e80db89b6b08a7f1959bf53b3e08f0c74b7d310b6672b630e8cbe files/kmail-3.5.6-templates.patch 875 AUX korganizer-3.5.5-desktop.patch 7617 RMD160 7c9df08009a11bb1d4886c175754dbe99651b4ca SHA1 e2e57cae2a642adb495d4b7ab3102e34e99d6549 SHA256 e0cf3744a797f568bcbc4ae2fb9003a27fc13cf235cbd36be9212513354da82e MD5 167b5ec68f258ca3d8c2aab1f083ea81 files/korganizer-3.5.5-desktop.patch 7617 RMD160 7c9df08009a11bb1d4886c175754dbe99651b4ca files/korganizer-3.5.5-desktop.patch 7617 @@ -82,14 +62,18 @@ EBUILD kdepim-3.5.5-r2.ebuild 1399 RMD160 e513a3b0c03de45188cabb433b9e01d0859c01 MD5 5edfb99e9d4d0b41a87789ff81948571 kdepim-3.5.5-r2.ebuild 1399 RMD160 e513a3b0c03de45188cabb433b9e01d0859c019c kdepim-3.5.5-r2.ebuild 1399 SHA256 7e92d1d59cece9ab563c20084fbaf04c9bb3c3d08e144ee1557868bc60a8e653 kdepim-3.5.5-r2.ebuild 1399 +EBUILD kdepim-3.5.6-r1.ebuild 1470 RMD160 da9aa14658bdd4f88a360d8c88fb68dc1faeae50 SHA1 b53cf86b0d7d90ed4bec0d1a81175b04239434c2 SHA256 84069ddbbc11efa2d0e76960a81fcf8068ae84a25bc02a844ba95ce07900514b +MD5 b5ebab5b98e2562c16dae42e7bf9b0f7 kdepim-3.5.6-r1.ebuild 1470 +RMD160 da9aa14658bdd4f88a360d8c88fb68dc1faeae50 kdepim-3.5.6-r1.ebuild 1470 +SHA256 84069ddbbc11efa2d0e76960a81fcf8068ae84a25bc02a844ba95ce07900514b kdepim-3.5.6-r1.ebuild 1470 EBUILD kdepim-3.5.6.ebuild 1370 RMD160 b670b71f6553fb073a1def44c9d5c920e5e8f531 SHA1 f6697a49b6bbee20368e904e017e9be9323b69c9 SHA256 50097a6b89a356fd4ceb6a3930f786e3f3ca3a39240ea9722adf124ef5be3309 MD5 f2029009c1eba219a151f8bc0c789504 kdepim-3.5.6.ebuild 1370 RMD160 b670b71f6553fb073a1def44c9d5c920e5e8f531 kdepim-3.5.6.ebuild 1370 SHA256 50097a6b89a356fd4ceb6a3930f786e3f3ca3a39240ea9722adf124ef5be3309 kdepim-3.5.6.ebuild 1370 -MISC ChangeLog 32929 RMD160 2f652d0ba79e79dc6df00895f152898333332f79 SHA1 b61f4d9b4770c394f7c9434095fb48fe0a9ac152 SHA256 7d81ecbb9b9ac4339a699d5ad419f7ea8d7d7d860db5aab3781e895a05c0ae54 -MD5 37a8dc5a069d398afdd1b7467f239719 ChangeLog 32929 -RMD160 2f652d0ba79e79dc6df00895f152898333332f79 ChangeLog 32929 -SHA256 7d81ecbb9b9ac4339a699d5ad419f7ea8d7d7d860db5aab3781e895a05c0ae54 ChangeLog 32929 +MISC ChangeLog 33476 RMD160 c7285480fd4dcd64a3b50226068b8322d93fc146 SHA1 8cfdf3195f11d4ab846aa760ca15dc218a869821 SHA256 c24538d51bab5746c61f69a0af323d4051c48ab38d6c7a84aca999981c6bb298 +MD5 c07d11ba38f89e088eb72650ecbe016e ChangeLog 33476 +RMD160 c7285480fd4dcd64a3b50226068b8322d93fc146 ChangeLog 33476 +SHA256 c24538d51bab5746c61f69a0af323d4051c48ab38d6c7a84aca999981c6bb298 ChangeLog 33476 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -106,10 +90,13 @@ SHA256 ebffdd3be2555ec32588c07decab3d399ca0fcf3434b64d83ae8051e3f59eda1 files/di MD5 694e2129c1e464bcf0badea11d1112f5 files/digest-kdepim-3.5.6 512 RMD160 ed8995a24cee7a13bdb6d24bcd2d9e15fe476e0c files/digest-kdepim-3.5.6 512 SHA256 3e201f5c33c8c0db49abffc1cc77b21375548b371d9205d58cd372bc611cb3c5 files/digest-kdepim-3.5.6 512 +MD5 694e2129c1e464bcf0badea11d1112f5 files/digest-kdepim-3.5.6-r1 512 +RMD160 ed8995a24cee7a13bdb6d24bcd2d9e15fe476e0c files/digest-kdepim-3.5.6-r1 512 +SHA256 3e201f5c33c8c0db49abffc1cc77b21375548b371d9205d58cd372bc611cb3c5 files/digest-kdepim-3.5.6-r1 512 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFu2wJAiZjviIA2XgRAomUAJ4v5/UtxBwjZfucQjInOW7hKL/6oQCgmCtd -Tzt3PZXk8+uQGssFLqCOyW4= -=6jrs +iD8DBQFFu580AiZjviIA2XgRAnBqAKDkg71qieqyHfF8cWj9P7cSZdt2HQCglYyj +fMLX6yfozpMsVucSfFl+gxo= +=O2Jp -----END PGP SIGNATURE----- diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.6-r1 b/kde-base/kdepim/files/digest-kdepim-3.5.6-r1 new file mode 100644 index 000000000000..7ae1b4cdfda6 --- /dev/null +++ b/kde-base/kdepim/files/digest-kdepim-3.5.6-r1 @@ -0,0 +1,6 @@ +MD5 7c13008b1ca98351b461cac5dd183d9a kdepim-3.5-patchset-02.tar.bz2 4208 +RMD160 93e1e0c760278b233ff3d7096154168f6fbcf65a kdepim-3.5-patchset-02.tar.bz2 4208 +SHA256 8c91e5359e58710b5bc8e51b30058f41870a93bbda8b1a5fffc1af91a82128dd kdepim-3.5-patchset-02.tar.bz2 4208 +MD5 e37e6173fe9fd7f242c9502a4ae1d7de kdepim-3.5.6.tar.bz2 13643798 +RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb kdepim-3.5.6.tar.bz2 13643798 +SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 kdepim-3.5.6.tar.bz2 13643798 diff --git a/kde-base/kdepim/files/kdepim-3.2.3-cjk.diff b/kde-base/kdepim/files/kdepim-3.2.3-cjk.diff deleted file mode 100644 index 3f523611eff9..000000000000 --- a/kde-base/kdepim/files/kdepim-3.2.3-cjk.diff +++ /dev/null @@ -1,166 +0,0 @@ -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(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/files/kdepim-3.4-configure.patch b/kde-base/kdepim/files/kdepim-3.4-configure.patch deleted file mode 100644 index d7024288d3e7..000000000000 --- a/kde-base/kdepim/files/kdepim-3.4-configure.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -Nur kdepim-3.4.2.orig/configure.in.in kdepim-3.4.2/configure.in.in ---- kdepim-3.4.2.orig/configure.in.in 2005-07-20 12:03:13.000000000 +0200 -+++ kdepim-3.4.2/configure.in.in 2005-07-26 14:12:19.000000000 +0200 -@@ -46,7 +46,6 @@ - [ - KDE_CHECK_HEADERS(gnokii.h) - AC_REQUIRE([AC_HAVE_XPM]) -- LIB_GNOKII= - AC_CHECK_LIB(gnokii, gn_cfg_read, - [ LIB_GNOKII="-lgnokii $LIB_BLUETOOTH" ], - [ -@@ -58,6 +57,21 @@ - AC_SUBST(LIB_GNOKII) - ]) - -+AC_ARG_WITH(gnokii, -+ [AC_HELP_STRING(--with-gnokii, -+ [enable support for mobile phones through gnokii @<:@default=check@:>@])], -+ [], with_gnokii=check) -+ -+LIB_GNOKII= -+if test "x$with_gnokii" != xno; then -+ # for kaddressbook/xxport/ and kmobile/devices/gnokii/ -+ KDE_CHECK_BLUETOOTH -+ KDE_CHECK_GNOKII -+ -+ if test "x$with_gnokii" != xcheck && test -z "$LIB_GNOKII"; then -+ AC_MSG_ERROR([--with-gnokii was given, but test for gnokii failed]) -+ fi -+fi - - dnl the below is copied from kdenetwork's configure as too many apps moved - dnl and noone can say which tests are needed and which are obsolete for kdepim ;( -diff -Nur kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.bot kdepim-3.4.2/kaddressbook/xxport/configure.in.bot ---- kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.bot 2005-05-23 14:12:19.000000000 +0200 -+++ kdepim-3.4.2/kaddressbook/xxport/configure.in.bot 2005-07-26 14:11:23.000000000 +0200 -@@ -1,4 +1,4 @@ --if test -z "$LIB_GNOKII"; then -+if test "x$with_gnokii" = xcheck && test -z "$LIB_GNOKII"; then - echo "" - echo "libgnokii (http://www.gnokii.org) is missing. The KDE Addressbook mobile phone import/export filter will not be available." - echo "" -diff -Nur kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.in kdepim-3.4.2/kaddressbook/xxport/configure.in.in ---- kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.in 2005-05-23 14:12:19.000000000 +0200 -+++ kdepim-3.4.2/kaddressbook/xxport/configure.in.in 2005-07-26 14:11:23.000000000 +0200 -@@ -1,6 +1,2 @@ - # $Id: kdepim-3.4-configure.patch,v 1.1 2005/07/28 12:58:14 greg_g Exp $ -- --KDE_CHECK_BLUETOOTH --KDE_CHECK_GNOKII -- - AM_CONDITIONAL(compile_GNOKIIXXPORT, test -n "$LIB_GNOKII") -diff -Nur kdepim-3.4.2.orig/kioslaves/configure.in.bot kdepim-3.4.2/kioslaves/configure.in.bot ---- kdepim-3.4.2.orig/kioslaves/configure.in.bot 2005-05-23 14:12:02.000000000 +0200 -+++ kdepim-3.4.2/kioslaves/configure.in.bot 2005-07-26 14:11:34.000000000 +0200 -@@ -1,4 +1,4 @@ --if test -z "$SASL2_LIBS"; then -+if test "x$with_sasl" = xcheck && test -z "$SASL2_LIBS"; then - echo "" - echo "cyrus-sasl 2 library is missing. The sieve ioslave will not be built, and imap4 will lack of a lot of authentication methods." - echo "" -diff -Nur kdepim-3.4.2.orig/kioslaves/configure.in.in kdepim-3.4.2/kioslaves/configure.in.in ---- kdepim-3.4.2.orig/kioslaves/configure.in.in 2005-05-23 14:12:02.000000000 +0200 -+++ kdepim-3.4.2/kioslaves/configure.in.in 2005-07-26 14:12:33.000000000 +0200 -@@ -1,16 +1,27 @@ - KDE_CHECK_SSL - -+AC_ARG_WITH(sasl, -+ [AC_HELP_STRING(--with-sasl, -+ [enable support for authentication through cyrus-sasl @<:@default=check@:>@])], -+ [], with_sasl=check) -+ - sasl2_header="no" - SASL2_LIBS="" -+if test "x$with_sasl" != xno; then -+ KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes") -+ if test "$sasl2_header" = "yes" ; then -+ KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") -+ fi - --KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes") --if test "$sasl2_header" = "yes" ; then -- KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") --fi -+ if test "x$SASL2_LIBS" != "x" ; then -+ AC_DEFINE_UNQUOTED(HAVE_LIBSASL2, 1, [Define if you have cyrus-sasl2 libraries]) -+ fi - --if test "x$SASL2_LIBS" != "x" ; then -- AC_DEFINE_UNQUOTED(HAVE_LIBSASL2, 1, [Define if you have cyrus-sasl2 libraries]) -+ if test "x$with_sasl" != xcheck && test -z "$SASL2_LIBS"; then -+ AC_MSG_ERROR([--with-sasl was given, but test for cyrus-sasl failed]) -+ fi - fi -+ - AC_SUBST(SASL2_LIBS) - - AM_CONDITIONAL(compile_kio_sieve, test -n "$SASL2_LIBS") -diff -Nur kdepim-3.4.2.orig/kmobile/devices/gnokii/configure.in.in kdepim-3.4.2/kmobile/devices/gnokii/configure.in.in ---- kdepim-3.4.2.orig/kmobile/devices/gnokii/configure.in.in 2005-05-23 14:11:26.000000000 +0200 -+++ kdepim-3.4.2/kmobile/devices/gnokii/configure.in.in 2005-07-26 14:11:23.000000000 +0200 -@@ -1,7 +1,2 @@ - # $Id: kdepim-3.4-configure.patch,v 1.1 2005/07/28 12:58:14 greg_g Exp $ -- --# check for libgnokii (Nokia mobile phone library) --KDE_CHECK_GNOKII -- --AM_CONDITIONAL(include_gnokii_device, [test -n "$LIB_GNOKII"]) -- -+AM_CONDITIONAL(include_gnokii_device, test -n "$LIB_GNOKII") diff --git a/kde-base/kdepim/files/kdepim-3.4.1-akregator-unread.patch b/kde-base/kdepim/files/kdepim-3.4.1-akregator-unread.patch deleted file mode 100644 index 52bb1026b9a6..000000000000 --- a/kde-base/kdepim/files/kdepim-3.4.1-akregator-unread.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur kdepim-3.4.1.orig/akregator/src/myarticle.cpp kdepim-3.4.1/akregator/src/myarticle.cpp ---- kdepim-3.4.1.orig/akregator/src/myarticle.cpp 2005-05-23 14:11:26.000000000 +0200 -+++ kdepim-3.4.1/akregator/src/myarticle.cpp 2005-06-08 16:54:10.000000000 +0200 -@@ -100,8 +100,7 @@ - uint parsed = hashStr.toUInt(&parsedOk, 16); - if (!parsedOk) - { -- d->hash = calcHash(title() + description() + link().url() + commentsLink().url() -- + QString::number(comments()) ); -+ d->hash = calcHash(title() + description() + link().url() + commentsLink().url()); - } - else - d->hash = parsed; diff --git a/kde-base/kdepim/files/kdepim-3.4.1-kpilot-fix.patch b/kde-base/kdepim/files/kdepim-3.4.1-kpilot-fix.patch deleted file mode 100644 index a6dcc7702e35..000000000000 --- a/kde-base/kdepim/files/kdepim-3.4.1-kpilot-fix.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -Nur kdepim-3.4.1.orig/kpilot/conduits/memofileconduit/memofile-conduit.cc kdepim-3.4.1/kpilot/conduits/memofileconduit/memofile-conduit.cc ---- kdepim-3.4.1.orig/kpilot/conduits/memofileconduit/memofile-conduit.cc 2005-05-23 14:12:37.000000000 +0200 -+++ kdepim-3.4.1/kpilot/conduits/memofileconduit/memofile-conduit.cc 2005-05-27 17:27:52.000000000 +0200 -@@ -114,7 +114,7 @@ - setFirstSync( _memofiles->isFirstSync() ); - addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory)); - -- if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || isFirstSync() ) { -+ if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) { - addSyncLogEntry(i18n(" Copying Pilot to PC...")); - #ifdef DEBUG - DEBUGCONDUIT << fname << ": copying Pilot to PC." << endl; -@@ -474,17 +474,11 @@ - // Note: This will reset both fCategories and fMemoAppInfo, so - // after this, we need to reinitialize our memofiles object... - setAppInfo(); -- cleanup(); - - // re-create our memofiles helper... - delete _memofiles; - _memofiles = new Memofiles(fCategories, *fMemoAppInfo, _memo_directory); - -- // make sure we are starting with a clean database on both ends... -- fDatabase->deleteRecord(0, true); -- fLocalDatabase->deleteRecord(0, true); -- cleanup(); -- - _memofiles->load(true); - - QPtrList memofiles = _memofiles->getAll(); -@@ -496,11 +490,39 @@ - } - - _memofiles->save(); -- -+ -+ // now that we've copied from the PC to our handheld, remove anything extra from the -+ // handheld... -+ deleteUnsyncedHHRecords(); -+ - return true; - - } - -+void MemofileConduit::deleteUnsyncedHHRecords() -+{ -+ FUNCTIONSETUP; -+ if ( syncMode()==SyncMode::eCopyPCToHH ) -+ { -+ RecordIDList ids=fDatabase->idList(); -+ RecordIDList::iterator it; -+ for ( it = ids.begin(); it != ids.end(); ++it ) -+ { -+ if (!_memofiles->find(*it)) -+ { -+#ifdef DEBUG -+ DEBUGCONDUIT << fname -+ << "Deleting record with ID "<<*it <<" from handheld " -+ << "(is not on PC, and syncing with PC->HH direction)" -+ << endl; -+#endif -+ fDatabase->deleteRecord(*it); -+ fLocalDatabase->deleteRecord(*it); -+ } -+ } -+ } -+} -+ - int MemofileConduit::writeToPilot(Memofile * memofile) - { - FUNCTIONSETUP; -diff -Nur kdepim-3.4.1.orig/kpilot/conduits/memofileconduit/memofile-conduit.h kdepim-3.4.1/kpilot/conduits/memofileconduit/memofile-conduit.h ---- kdepim-3.4.1.orig/kpilot/conduits/memofileconduit/memofile-conduit.h 2005-05-23 14:12:37.000000000 +0200 -+++ kdepim-3.4.1/kpilot/conduits/memofileconduit/memofile-conduit.h 2005-05-27 17:27:52.000000000 +0200 -@@ -88,6 +88,7 @@ - - bool copyHHToPC(); - bool copyPCToHH(); -+ void deleteUnsyncedHHRecords(); - bool sync(); - - int writeToPilot(Memofile * memofile); -diff -Nur kdepim-3.4.1.orig/kpilot/lib/pilotDatabase.cc kdepim-3.4.1/kpilot/lib/pilotDatabase.cc ---- kdepim-3.4.1.orig/kpilot/lib/pilotDatabase.cc 2005-05-23 14:12:43.000000000 +0200 -+++ kdepim-3.4.1/kpilot/lib/pilotDatabase.cc 2005-05-27 17:27:52.000000000 +0200 -@@ -185,7 +185,7 @@ - int len = CATEGORY_NAME_SIZE - 1; - QCString t = PilotAppCategory::codec()->fromUnicode(s,len); - memset(categoryInfo()->name[i],0,CATEGORY_NAME_SIZE); -- qstrncpy(categoryInfo()->name[i],t,kMin(len,(int)CATEGORY_NAME_SIZE)); -+ qstrncpy(categoryInfo()->name[i],t,CATEGORY_NAME_SIZE); - return true; - } - -diff -Nur kdepim-3.4.1.orig/kpilot/lib/pilotDatabase.h kdepim-3.4.1/kpilot/lib/pilotDatabase.h ---- kdepim-3.4.1.orig/kpilot/lib/pilotDatabase.h 2005-05-23 14:12:43.000000000 +0200 -+++ kdepim-3.4.1/kpilot/lib/pilotDatabase.h 2005-05-27 17:27:52.000000000 +0200 -@@ -279,9 +279,12 @@ - int appLen = MAX_APPINFO_SIZE; - unsigned char buffer[MAX_APPINFO_SIZE]; - -- appLen = d->readAppBlock(buffer,appLen); -- -- (*unpack)(&fInfo, buffer, appLen); -+ if (d && d->isDBOpen()) -+ { -+ appLen = d->readAppBlock(buffer,appLen); -+ (*unpack)(&fInfo, buffer, appLen); -+ } -+ // fInfo is just a struct, so we can point to it anyway. - init(&fInfo.category,appLen); - } ; - -@@ -289,6 +292,10 @@ - { - FUNCTIONSETUP; - unsigned char buffer[MAX_APPINFO_SIZE]; -+ if (!d || !d->isDBOpen()) -+ { -+ return -1; -+ } - int appLen = (*pack)(&fInfo, buffer, length()); - if (appLen > 0) - { -diff -Nur kdepim-3.4.1.orig/kpilot/lib/pilotLocalDatabase.cc kdepim-3.4.1/kpilot/lib/pilotLocalDatabase.cc ---- kdepim-3.4.1.orig/kpilot/lib/pilotLocalDatabase.cc 2005-05-23 14:12:43.000000000 +0200 -+++ kdepim-3.4.1/kpilot/lib/pilotLocalDatabase.cc 2005-05-27 17:27:52.000000000 +0200 -@@ -618,7 +618,7 @@ - - int count; - pi_file_get_entries(dbFile, &count); -- if (count > 0) -+ if (count >= 0) - { - KPILOT_DELETE(d); - d = new Private(count); diff --git a/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch b/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch deleted file mode 100644 index e81200a10c50..000000000000 --- a/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_oe.cxx kdepim-3.4.2/kmailcvt/filter_oe.cxx ---- kdepim-3.4.2.orig/kmailcvt/filter_oe.cxx 2005-05-23 14:12:15.000000000 +0200 -+++ kdepim-3.4.2/kmailcvt/filter_oe.cxx 2005-07-26 16:33:01.000000000 +0200 -@@ -389,15 +389,15 @@ - { - bool found = false; - bool foundFilename = false; -- QString folder = ""; -+ QString folder; - // we must do this because folder with more than one upper letter - // at start have maybe not a file named like the folder !!! - QString search = filename.lower(); - - while (!found) - { -- for ( QValueList::Iterator it = folderStructure.begin(); it != folderStructure.end(); it++) { -- QString tmp[4] = *it; -+ for ( FolderStructureIterator it = folderStructure.begin(); it != folderStructure.end(); it++) { -+ FolderStructure tmp = *it; - if(foundFilename == false) { - QString _tmpFileName = tmp[1]; - _tmpFileName = _tmpFileName.lower(); -@@ -410,7 +410,7 @@ - QString _currentID = tmp[2]; - QString _parentID = tmp[3]; - if(_currentID == search) { -- if(_parentID == "") { // this is the root of the folder -+ if(_parentID.isEmpty()) { // this is the root of the folder - found = true; - break; - } else { -@@ -421,7 +421,7 @@ - } - } - // need to break the while loop maybe in some cases -- if((foundFilename == false) && (folder == "")) return folder; -+ if((foundFilename == false) && (folder.isEmpty())) return folder; - } - return folder; - } -diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_oe.hxx kdepim-3.4.2/kmailcvt/filter_oe.hxx ---- kdepim-3.4.2.orig/kmailcvt/filter_oe.hxx 2005-05-23 14:12:15.000000000 +0200 -+++ kdepim-3.4.2/kmailcvt/filter_oe.hxx 2005-07-26 16:33:01.000000000 +0200 -@@ -61,8 +61,17 @@ - bool parsedFolder; - /** true if the current parsing file is the folder file */ - bool currentIsFolderFile; -+ -+ /** Folder structure with following 4 entries: -+ 1. descriptive folder name -+ 2. filename -+ 3. ID of current folder -+ 4. ID of parent folder -+ */ -+ typedef FolderStructureBase<4> FolderStructure; - /** matrix with information about the folder structure*/ -- QValueList folderStructure; -+ QValueList folderStructure; -+ typedef QValueList::Iterator FolderStructureIterator; - - /** name of the current folder */ - QString folderName; -diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_pmail.cxx kdepim-3.4.2/kmailcvt/filter_pmail.cxx ---- kdepim-3.4.2.orig/kmailcvt/filter_pmail.cxx 2005-05-23 14:12:15.000000000 +0200 -+++ kdepim-3.4.2/kmailcvt/filter_pmail.cxx 2005-07-26 16:33:01.000000000 +0200 -@@ -325,8 +325,8 @@ - - while (!found) - { -- for ( QValueList::Iterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) { -- QString tmp[5] = *it; -+ for ( FolderStructureIterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) { -+ FolderStructure tmp = *it; - - QString _ID = tmp[2]; - if(_ID == search) { -diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_pmail.hxx kdepim-3.4.2/kmailcvt/filter_pmail.hxx ---- kdepim-3.4.2.orig/kmailcvt/filter_pmail.hxx 2005-05-23 14:12:15.000000000 +0200 -+++ kdepim-3.4.2/kmailcvt/filter_pmail.hxx 2005-07-26 16:33:01.000000000 +0200 -@@ -50,8 +50,18 @@ - QDir dir; - /** pointer to the info */ - FilterInfo * inf; -- /** QStringList with the foldernames, First String contains the ID, the second the folder */ -- QValueList folderMatrix; -+ -+ /** Folder structure here has 5 entries. */ -+ typedef FolderStructureBase<5> FolderStructure; -+ /** List with the folder matrix, which contains following strings: -+ 1. type (2 for root-folder, 1 for folder, 0 for mailarchiv) -+ 2. type (1 for root-folder, 3 for folder, 0 for mailarchiv) -+ 3. "ID:flag:filename" of folder/archiv -+ 4. "ID:name" of parent folder -+ 5. name of folder/archiv -+ */ -+ QValueList folderMatrix; -+ typedef QValueList::Iterator FolderStructureIterator; - - /** true, if the folderfile is parsed **/ - bool folderParsed; -diff -Nur kdepim-3.4.2.orig/kmailcvt/filters.hxx kdepim-3.4.2/kmailcvt/filters.hxx ---- kdepim-3.4.2.orig/kmailcvt/filters.hxx 2005-05-23 14:12:15.000000000 +0200 -+++ kdepim-3.4.2/kmailcvt/filters.hxx 2005-07-26 16:33:01.000000000 +0200 -@@ -85,6 +85,57 @@ - }; - - -+ -+/** -+* Glorified QString[N] for (a) understandability (b) older gcc compatibility. -+*/ -+template class FolderStructureBase -+{ -+public: -+ typedef QString NString[size]; -+ /** Constructor. Need a default constructor for QValueList. */ -+ FolderStructureBase() {} ; -+ -+ /** Constructor. Turn N QStrings into a folder structure -+ * description. -+ */ -+ FolderStructureBase(const NString &s) -+ { -+ for(unsigned int i=0; i - #include -+#include - - /* - =========================================================================== -@@ -414,7 +415,7 @@ - partNode* partNode::findNodeForDwPart( DwBodyPart* part ) - { - partNode* found = 0; -- if( dwPart()->partId() == part->partId() ) -+ if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 ) - return this; - if( mChild ) - found = mChild->findNodeForDwPart( part ); diff --git a/kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff b/kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff deleted file mode 100644 index caae8a4e5fa5..000000000000 --- a/kde-base/kdepim/files/kmail-3.4.1-shift+click-crash.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- kmail/kmreaderwin.cpp.orig 2005-07-01 01:26:44.000000000 +0200 -+++ kmail/kmreaderwin.cpp 2005-07-01 01:28:17.000000000 +0200 -@@ -2378,6 +2378,7 @@ - if ( me->button() == LeftButton && ( me->state() & ShiftButton ) ) { - // special processing for shift+click - mAtmCurrent = msgPartFromUrl( mUrlClicked ); -+ if ( mAtmCurrent < 0 ) return false; - mAtmCurrentName = mUrlClicked.path(); - slotHandleAttachment( KMHandleAttachmentCommand::Save ); // save - return true; // eat event diff --git a/kde-base/kdepim/files/kmail-3.5.6-kde-bug-140660.patch b/kde-base/kdepim/files/kmail-3.5.6-kde-bug-140660.patch new file mode 100644 index 000000000000..323e349267b1 --- /dev/null +++ b/kde-base/kdepim/files/kmail-3.5.6-kde-bug-140660.patch @@ -0,0 +1,19 @@ +Index: kmfolder.cpp +=================================================================== +--- kdepim-3.5.6/kmail/kmfolder.cpp (revision 627528) ++++ kdepim-3.5.6/kmail/kmfolder.cpp (working copy) +@@ -426,12 +426,12 @@ int KMFolder::moveMsg(QPtrListfind( msg ); ++ return mStorage ? mStorage->find( msg ) : 0; + } + + int KMFolder::find( const KMMessage* msg ) const + { +- return mStorage->find( msg ); ++ return mStorage ? mStorage->find( msg ) : 0; + } + + int KMFolder::count( bool cache ) const diff --git a/kde-base/kdepim/files/kmail-3.5.6-templates.patch b/kde-base/kdepim/files/kmail-3.5.6-templates.patch new file mode 100644 index 000000000000..262c9821a1f9 --- /dev/null +++ b/kde-base/kdepim/files/kmail-3.5.6-templates.patch @@ -0,0 +1,20 @@ +--- branches/KDE/3.5/kdepim/kmail/kmfolder.cpp 2006/10/28 17:04:18 599816 ++++ branches/KDE/3.5/kdepim/kmail/kmfolder.cpp 2007/01/27 00:32:53 627548 +@@ -631,11 +631,13 @@ + mWhoField = "From"; + if ( this == kmkernel->outboxFolder() || + this == kmkernel->sentFolder() || +- this == kmkernel->draftsFolder() ) ++ this == kmkernel->draftsFolder() || ++ this == kmkernel->templatesFolder() ) + mWhoField = "To"; +- } else if ( identity.drafts() == idString() +- || identity.fcc() == idString() ) +- // drafts or sent of the identity ++ } else if ( identity.drafts() == idString() || ++ identity.templates() == idString() || ++ identity.fcc() == idString() ) ++ // drafts, templates or sent of the identity + mWhoField = "To"; + else + mWhoField = "From"; diff --git a/kde-base/kdepim/kdepim-3.5.6-r1.ebuild b/kde-base/kdepim/kdepim-3.5.6-r1.ebuild new file mode 100644 index 000000000000..57401a5d17d5 --- /dev/null +++ b/kde-base/kdepim/kdepim-3.5.6-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.6-r1.ebuild,v 1.1 2007/01/27 18:51:23 flameeyes Exp $ + +inherit kde-dist + +SRC_URI="${SRC_URI} + mirror://gentoo/kdepim-3.5-patchset-02.tar.bz2" + +DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..." + +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="crypt gnokii" + +# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises. +DEPEND="~kde-base/kdebase-${PV} + >=dev-libs/cyrus-sasl-2 + gnokii? ( app-mobilephone/gnokii ) + crypt? ( >=app-crypt/gpgme-1.1.2-r1 + || ( >=app-crypt/gnupg-2.0.1-r1 =app-pda/pilot-link-0.12.0 dev-libs/libmal ) + +RDEPEND="${DEPEND} + crypt? ( app-crypt/pinentry )" + +DEPEND="${DEPEND} + x11-proto/scrnsaverproto" + +PATCHES="${FILESDIR}/kmail-3.5.6-kde-bug-140660.patch + ${FILESDIR}/kmail-3.5.6-templates.patch" + +src_unpack() { + kde_src_unpack + # Call Qt 3 designer + sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}"/libkdepim/kcmdesignerfields.cpp || die "sed failed" +} + +src_compile() { + local myconf="--with-sasl $(use_with gnokii)" + use crypt && myconf="${myconf} --with-gpg=/usr/bin/gpg" + + # use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot" + DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot" + + kde_src_compile +} -- 2.26.2