diff options
| -rw-r--r-- | kde-base/kmailcvt/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/kmailcvt/Manifest | 5 | ||||
| -rw-r--r-- | kde-base/kmailcvt/files/digest-kmailcvt-3.4.1-r1 | 3 | ||||
| -rw-r--r-- | kde-base/kmailcvt/files/fix-kmailcvt-compilation.diff | 169 | ||||
| -rw-r--r-- | kde-base/kmailcvt/kmailcvt-3.4.1-r1.ebuild | 14 |
5 files changed, 198 insertions, 2 deletions
diff --git a/kde-base/kmailcvt/ChangeLog b/kde-base/kmailcvt/ChangeLog index 1aab7d09cb5b..e7efb0adbbbc 100644 --- a/kde-base/kmailcvt/ChangeLog +++ b/kde-base/kmailcvt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kmailcvt # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/ChangeLog,v 1.12 2005/07/08 04:24:26 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/ChangeLog,v 1.13 2005/07/28 11:31:30 danarmak Exp $ + +*kmailcvt-3.4.1-r1 (28 Jul 2005) + + 28 Jul 2005; Dan Armak <danarmak@gentoo.org> + +files/fix-kmailcvt-compilation.diff, +kmailcvt-3.4.1-r1.ebuild: + Compilation fix, committed to upstream cvs but missed the 3.4.2 release. Bug + #99643. 08 Jul 2005; Jason Wever <weeve@gentoo.org> kmailcvt-3.4.1.ebuild: Stable on SPARC. diff --git a/kde-base/kmailcvt/Manifest b/kde-base/kmailcvt/Manifest index 7b9127496547..aa3206f2e1d1 100644 --- a/kde-base/kmailcvt/Manifest +++ b/kde-base/kmailcvt/Manifest @@ -1,6 +1,9 @@ -MD5 3c41fedd6b314a518dae77b1036e1367 ChangeLog 1940 +MD5 13908166a04e57f0db67cf2df5575a7a kmailcvt-3.4.1-r1.ebuild 460 MD5 090771171d8694e642c5184145ff32df kmailcvt-3.4.0.ebuild 391 MD5 cef98d58639182ee17a50ebbdc116f34 kmailcvt-3.4.1.ebuild 384 +MD5 4338f918c93bc10b07d093652c2d6a81 ChangeLog 2178 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +MD5 5b0dda9287797546fcf34f2ca390d165 files/fix-kmailcvt-compilation.diff 5790 MD5 8c0ffea7b75b42449f4acada755ff36a files/digest-kmailcvt-3.4.0 67 MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmailcvt-3.4.1 208 +MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmailcvt-3.4.1-r1 208 diff --git a/kde-base/kmailcvt/files/digest-kmailcvt-3.4.1-r1 b/kde-base/kmailcvt/files/digest-kmailcvt-3.4.1-r1 new file mode 100644 index 000000000000..1ff7d92e997f --- /dev/null +++ b/kde-base/kmailcvt/files/digest-kmailcvt-3.4.1-r1 @@ -0,0 +1,3 @@ +MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545 +MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503 +MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538 diff --git a/kde-base/kmailcvt/files/fix-kmailcvt-compilation.diff b/kde-base/kmailcvt/files/fix-kmailcvt-compilation.diff new file mode 100644 index 000000000000..04ec9b34e1f7 --- /dev/null +++ b/kde-base/kmailcvt/files/fix-kmailcvt-compilation.diff @@ -0,0 +1,169 @@ +bugs.gentoo.org #99643, bugs.kde.org #106274, in upstream BRANCH post 3.4.2 + +Index: kmailcvt/filters.hxx +=================================================================== +--- kmailcvt/filters.hxx (revision 438560) ++++ kmailcvt/filters.hxx (revision 438561) +@@ -85,6 +85,57 @@ + }; + + ++ ++/** ++* Glorified QString[N] for (a) understandability (b) older gcc compatibility. ++*/ ++template <unsigned int size> 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<size; i++) d[i]=s[i]; ++ } ; ++ ++ /** Copy Constructor. */ ++ FolderStructureBase(const FolderStructureBase &s) ++ { ++ for(unsigned int i=0; i<size; i++) d[i]=s[i]; ++ } ; ++ ++ /** Assignment operator. Does the same thing as ++ * the copy constructor. ++ */ ++ FolderStructureBase &operator =(const FolderStructureBase &s) ++ { ++ for(unsigned int i=0; i<size; i++) d[i]=s[i]; ++ return *this; ++ } ; ++ ++ /** Access the different fields. There doesn't seem to ++ * be a real semantics for the fields. ++ */ ++ const QString operator [](unsigned int i) const ++ { ++ if (i<size) return d[i]; else return QString::null; ++ } ; ++ ++ /** Access the different fields, for writing. */ ++ QString &operator [](unsigned int i) ++ { ++ Q_ASSERT(i<size); ++ if (i<size) return d[i]; else return d[0]; ++ } ; ++private: ++ QString d[size]; ++} ; ++ + #endif + +-// vim: ts=2 sw=2 et +Index: kmailcvt/filter_pmail.cxx +=================================================================== +--- kmailcvt/filter_pmail.cxx (revision 438560) ++++ kmailcvt/filter_pmail.cxx (revision 438561) +@@ -325,8 +325,8 @@ + + while (!found) + { +- for ( QValueList<QString[5]>::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) { +Index: kmailcvt/filter_oe.cxx +=================================================================== +--- kmailcvt/filter_oe.cxx (revision 438560) ++++ kmailcvt/filter_oe.cxx (revision 438561) +@@ -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<QString[4]>::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; + } +Index: kmailcvt/filter_pmail.hxx +=================================================================== +--- kmailcvt/filter_pmail.hxx (revision 438560) ++++ kmailcvt/filter_pmail.hxx (revision 438561) +@@ -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<QString[5]> 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<FolderStructure> folderMatrix; ++ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator; + + /** true, if the folderfile is parsed **/ + bool folderParsed; +Index: kmailcvt/filter_oe.hxx +=================================================================== +--- kmailcvt/filter_oe.hxx (revision 438560) ++++ kmailcvt/filter_oe.hxx (revision 438561) +@@ -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<QString[4]> folderStructure; ++ QValueList<FolderStructure> folderStructure; ++ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator; + + /** name of the current folder */ + QString folderName; diff --git a/kde-base/kmailcvt/kmailcvt-3.4.1-r1.ebuild b/kde-base/kmailcvt/kmailcvt-3.4.1-r1.ebuild new file mode 100644 index 000000000000..147df57830f6 --- /dev/null +++ b/kde-base/kmailcvt/kmailcvt-3.4.1-r1.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/kmailcvt-3.4.1-r1.ebuild,v 1.1 2005/07/28 11:31:30 danarmak Exp $ + +KMNAME=kdepim +MAXKDEVER=3.4.2 +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +DESCRIPTION="KMail Import Filters" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +PATCHES="$FILESDIR/fix-kmailcvt-compilation.diff" # remove for 3.4.3 |