Update to KDE 3.4.2.

(Portage version: 2.0.51.22-r2)

3 files changed, 273 insertions, 0 deletions

diff --git a/kde-base/kdepim/files/digest-kdepim-3.4.2 b/kde-base/kdepim/files/digest-kdepim-3.4.2
new file mode 100644
index 000000000000..6ac9eb92b059
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.4.2
@@ -0,0 +1 @@
+MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kdepim/files/kdepim-3.4-configure.patch b/kde-base/kdepim/files/kdepim-3.4-configure.patch
new file mode 100644
index 000000000000..d7024288d3e7
--- /dev/null
+++ b/kde-base/kdepim/files/kdepim-3.4-configure.patch
@@ -0,0 +1,110 @@
+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.2-gcc32.patch b/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch
new file mode 100644
index 000000000000..e81200a10c50
--- /dev/null
+++ b/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch
@@ -0,0 +1,162 @@
+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<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;
+ }
+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<QString[4]> folderStructure;
++    QValueList<FolderStructure> folderStructure;
++    typedef QValueList<FolderStructure>::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<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) {
+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<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;
+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 <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