3 files changed, 51 insertions, 2 deletions

diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index d84ca52b8bd5..4b6226dbb381 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdepim-3.3.0.tar.bz2) = 94520aeae0db2fac5da7d1ece7b575a5
-SIZE (KDE/kdepim-3.3.0.tar.bz2) = 9951726
+MD5 (KDE/kdepim-3.3.1.tar.bz2) = 5aed63aed6b7c1ad9232cb30aa124a40
+SIZE (KDE/kdepim-3.3.1.tar.bz2) = 10007944
diff --git a/deskutils/kdepim3/files/patch-kresources_slox_webdavhandler.cpp b/deskutils/kdepim3/files/patch-kresources_slox_webdavhandler.cpp
new file mode 100644
index 000000000000..b76c3270bdfc
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-kresources_slox_webdavhandler.cpp
@@ -0,0 +1,34 @@
+===================================================================
+RCS file: /usr/repos/kde/kdepim/kresources/slox/webdavhandler.cpp,v
+retrieving revision 1.8.2.1
+retrieving revision 1.8.2.2
+diff -u -p -r1.8.2.1 -r1.8.2.2
+--- kresources/slox/webdavhandler.cpp	2004/09/28 14:25:44	1.8.2.1
++++ kresources/slox/webdavhandler.cpp	2004/10/07 23:35:53	1.8.2.2
+@@ -20,7 +20,13 @@
+ 
+ #include "webdavhandler.h"
+ 
++#ifdef HAVE_VALUES_H
+ #include <values.h>
++#else
++#ifdef HAVE_SYS_LIMITS_H
++#include <sys/limits.h>
++#endif
++#endif
+ 
+ #include <libkdepim/kpimprefs.h>
+ 
+@@ -150,9 +156,9 @@ QDateTime WebdavHandler::sloxToQDateTime
+ 
+   if (preEpoch) {
+     dt.setTime_t( 0, Qt::UTC );
+-    if (ticks > MAXINT) {
+-      dt = dt.addSecs(-MAXINT);
+-      ticks -= MAXINT;
++    if (ticks > INT_MAX) {
++      dt = dt.addSecs(-INT_MAX);
++      ticks -= INT_MAX;
+     }
+     dt = dt.addSecs(-((long) ticks));
+   }
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index fa9d993a3aa8..91a4adaf3cea 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -684,6 +684,7 @@ share/apps/kmail/pics/key_ok.png
 share/apps/kmail/pics/key_unknown.png
 share/apps/kmail/pics/kmgroupware_folder_calendar.png
 share/apps/kmail/pics/kmgroupware_folder_contacts.png
+share/apps/kmail/pics/kmgroupware_folder_journals.png
 share/apps/kmail/pics/kmgroupware_folder_notes.png
 share/apps/kmail/pics/kmgroupware_folder_tasks.png
 share/apps/kmail/pics/kmmsgattachment.png
@@ -899,18 +900,30 @@ share/apps/korganizer/tips
 share/apps/kpilot/icons/crystalsvg/16x16/actions/backup.png
 share/apps/kpilot/icons/crystalsvg/16x16/actions/busysync.png
 share/apps/kpilot/icons/crystalsvg/16x16/actions/fastsync.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/fullsync.png
 share/apps/kpilot/icons/crystalsvg/16x16/actions/hotsync.png
+share/apps/kpilot/icons/crystalsvg/16x16/actions/listsync.png
 share/apps/kpilot/icons/crystalsvg/16x16/actions/nosync.png
 share/apps/kpilot/icons/crystalsvg/16x16/actions/restore.png
 share/apps/kpilot/icons/crystalsvg/16x16/apps/kpalmdoc.png
 share/apps/kpilot/icons/crystalsvg/22x22/actions/backup.png
 share/apps/kpilot/icons/crystalsvg/22x22/actions/busysync.png
 share/apps/kpilot/icons/crystalsvg/22x22/actions/fastsync.png
+share/apps/kpilot/icons/crystalsvg/22x22/actions/fullsync.png
 share/apps/kpilot/icons/crystalsvg/22x22/actions/hotsync.png
+share/apps/kpilot/icons/crystalsvg/22x22/actions/listsync.png
 share/apps/kpilot/icons/crystalsvg/22x22/actions/nosync.png
 share/apps/kpilot/icons/crystalsvg/22x22/actions/restore.png
 share/apps/kpilot/icons/crystalsvg/22x22/apps/kpalmdoc.png
+share/apps/kpilot/icons/crystalsvg/32x32/actions/fastsync.png
+share/apps/kpilot/icons/crystalsvg/32x32/actions/fullsync.png
+share/apps/kpilot/icons/crystalsvg/32x32/actions/hotsync.png
+share/apps/kpilot/icons/crystalsvg/32x32/actions/listsync.png
 share/apps/kpilot/icons/crystalsvg/32x32/apps/kpalmdoc.png
+share/apps/kpilot/icons/crystalsvg/48x48/actions/fastsync.png
+share/apps/kpilot/icons/crystalsvg/48x48/actions/fullsync.png
+share/apps/kpilot/icons/crystalsvg/48x48/actions/hotsync.png
+share/apps/kpilot/icons/crystalsvg/48x48/actions/listsync.png
 share/apps/kpilot/icons/crystalsvg/48x48/apps/kpalmdoc.png
 share/apps/kpilot/kpilot-address.png
 share/apps/kpilot/kpilot-bhotsync.png
@@ -1608,8 +1621,10 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/apps/ksync
 @dirrm share/apps/kpilot/sysinfoconduit
 @dirrm share/apps/kpilot/icons/crystalsvg/48x48/apps
+@dirrm share/apps/kpilot/icons/crystalsvg/48x48/actions
 @dirrm share/apps/kpilot/icons/crystalsvg/48x48
 @dirrm share/apps/kpilot/icons/crystalsvg/32x32/apps
+@dirrm share/apps/kpilot/icons/crystalsvg/32x32/actions
 @dirrm share/apps/kpilot/icons/crystalsvg/32x32
 @dirrm share/apps/kpilot/icons/crystalsvg/22x22/apps
 @dirrm share/apps/kpilot/icons/crystalsvg/22x22/actions