Update to KDE SC 4.10.2

bugfixes, other quality improvements, new and improved KDE Applications

5 files changed, 118 insertions, 55 deletions

diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 343e995b0eb..0cba9ae55c4 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2013/02/16 11:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2013/04/03 10:51:47 markd Exp $
 
 DISTNAME=	kdepimlibs-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	13
 CATEGORIES=	misc
 COMMENT=	Support libraries for PIM for the KDE integrated X11 desktop
 
@@ -12,7 +11,7 @@ CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDEPimLibsDependencies.cmake
 
 REPLACE_PERL+= mailtransport/kconf_update/migrate-transports.pl
 
-BUILDLINK_API_DEPENDS.akonadi+=	akonadi>=1.5.52
+BUILDLINK_API_DEPENDS.akonadi+=	akonadi>=1.8.51
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
@@ -21,7 +20,9 @@ BUILDLINK_API_DEPENDS.akonadi+=	akonadi>=1.5.52
 .if ${OPSYS} == "Linux"
 .include "../../devel/libuuid/buildlink3.mk"
 .endif
+.include "../../devel/qjson/buildlink3.mk"
 .include "../../mail/akonadi/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../time/libical/buildlink3.mk"
diff --git a/misc/kdepimlibs4/PLIST b/misc/kdepimlibs4/PLIST
index e38115b2cec..7be0be55d9e 100644
--- a/misc/kdepimlibs4/PLIST
+++ b/misc/kdepimlibs4/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2012/04/15 05:54:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/04/03 10:51:47 markd Exp $
+bin/akonadi_benchmarker
+bin/akonaditest
 include/KDE/Akonadi/AgentBase
+include/KDE/Akonadi/AgentFactory
 include/KDE/Akonadi/AgentFilterProxyModel
 include/KDE/Akonadi/AgentInstance
 include/KDE/Akonadi/AgentInstanceCreateJob
@@ -13,6 +16,8 @@ include/KDE/Akonadi/AgentTypeWidget
 include/KDE/Akonadi/Attribute
 include/KDE/Akonadi/AttributeFactory
 include/KDE/Akonadi/CachePolicy
+include/KDE/Akonadi/Calendar/FreeBusyProviderBase
+include/KDE/Akonadi/Calendar/StandardCalendarActionManager
 include/KDE/Akonadi/ChangeRecorder
 include/KDE/Akonadi/Collection
 include/KDE/Akonadi/CollectionAttributesSynchronizationJob
@@ -26,6 +31,7 @@ include/KDE/Akonadi/CollectionFetchScope
 include/KDE/Akonadi/CollectionFilterProxyModel
 include/KDE/Akonadi/CollectionModel
 include/KDE/Akonadi/CollectionModifyJob
+include/KDE/Akonadi/CollectionMoveJob
 include/KDE/Akonadi/CollectionPropertiesDialog
 include/KDE/Akonadi/CollectionPropertiesPage
 include/KDE/Akonadi/CollectionRequester
@@ -58,11 +64,15 @@ include/KDE/Akonadi/Contact/StandardContactActionManager
 include/KDE/Akonadi/Contact/StandardContactFormatter
 include/KDE/Akonadi/Contact/StandardContactGroupFormatter
 include/KDE/Akonadi/Control
+include/KDE/Akonadi/DBusConnectionPool
 include/KDE/Akonadi/ETMViewStateSaver
 include/KDE/Akonadi/Entity
 include/KDE/Akonadi/EntityDisplayAttribute
+include/KDE/Akonadi/EntityHiddenAttribute
 include/KDE/Akonadi/EntityListView
 include/KDE/Akonadi/EntityMimeTypeFilterModel
+include/KDE/Akonadi/EntityOrderProxyModel
+include/KDE/Akonadi/EntityRightsFilterModel
 include/KDE/Akonadi/EntityTreeModel
 include/KDE/Akonadi/EntityTreeView
 include/KDE/Akonadi/Exception
@@ -84,20 +94,29 @@ include/KDE/Akonadi/Job
 include/KDE/Akonadi/KCal/FreeBusyProviderBase
 include/KDE/Akonadi/KCal/IncidenceMimeTypeVisitor
 include/KDE/Akonadi/KMime/AddressAttribute
+include/KDE/Akonadi/KMime/MessageFlags
 include/KDE/Akonadi/KMime/MessageFolderAttribute
 include/KDE/Akonadi/KMime/MessageModel
+include/KDE/Akonadi/KMime/MessageParts
+include/KDE/Akonadi/KMime/MessageStatus
 include/KDE/Akonadi/KMime/MessageThreaderProxyModel
 include/KDE/Akonadi/KMime/MessageThreadingAttribute
+include/KDE/Akonadi/KMime/RemoveDuplicatesJob
 include/KDE/Akonadi/KMime/SpecialMailCollections
 include/KDE/Akonadi/KMime/SpecialMailCollectionsRequestJob
 include/KDE/Akonadi/LinkJob
 include/KDE/Akonadi/MimeTypeChecker
 include/KDE/Akonadi/Monitor
 include/KDE/Akonadi/PreprocessorBase
+include/KDE/Akonadi/RecursiveCollectionFilterProxyModel
+include/KDE/Akonadi/RecursiveItemFetchJob
 include/KDE/Akonadi/ResourceBase
 include/KDE/Akonadi/SearchCreateJob
 include/KDE/Akonadi/ServerManager
 include/KDE/Akonadi/Session
+include/KDE/Akonadi/SocialUtils/ImageProvider
+include/KDE/Akonadi/SocialUtils/SocialFeedItem
+include/KDE/Akonadi/SocialUtils/SocialNetworkAttributes
 include/KDE/Akonadi/StandardActionManager
 include/KDE/Akonadi/TransactionBeginJob
 include/KDE/Akonadi/TransactionCommitJob
@@ -328,6 +347,14 @@ include/KDE/KPIMIdentities/IdentityManager
 include/KDE/KPIMIdentities/Signature
 include/KDE/KPIMIdentities/SignatureConfigurator
 include/KDE/KPIMTextEdit/EMailQuoteHighlighter
+include/KDE/KPIMTextEdit/EmoticonTextEditAction
+include/KDE/KPIMTextEdit/HtmlHighlighter
+include/KDE/KPIMTextEdit/InsertHtmlDialog
+include/KDE/KPIMTextEdit/InsertImageDialog
+include/KDE/KPIMTextEdit/InsertImageWidget
+include/KDE/KPIMTextEdit/InsertTableDialog
+include/KDE/KPIMTextEdit/InsertTableWidget
+include/KDE/KPIMTextEdit/TableFormatDialog
 include/KDE/KPIMTextEdit/TextEdit
 include/KDE/KPIMUtils/Email
 include/KDE/KPIMUtils/KFileIO
@@ -344,6 +371,7 @@ include/KDE/KResources/Resource
 include/KDE/KResources/SelectDialog
 include/KDE/KTNEF/Formatter
 include/KDE/KTNEF/KTNEFAttach
+include/KDE/KTNEF/KTNEFDefs
 include/KDE/KTNEF/KTNEFMessage
 include/KDE/KTNEF/KTNEFParser
 include/KDE/KTNEF/KTNEFProperty
@@ -514,6 +542,7 @@ include/akonadi/kmime/messageparts.h
 include/akonadi/kmime/messagestatus.h
 include/akonadi/kmime/messagethreaderproxymodel.h
 include/akonadi/kmime/messagethreadingattribute.h
+include/akonadi/kmime/removeduplicatesjob.h
 include/akonadi/kmime/specialmailcollections.h
 include/akonadi/kmime/specialmailcollectionsrequestjob.h
 include/akonadi/kmime/standardmailactionmanager.h
@@ -537,6 +566,10 @@ include/akonadi/searchcreatejob.h
 include/akonadi/selectionproxymodel.h
 include/akonadi/servermanager.h
 include/akonadi/session.h
+include/akonadi/socialutils/imageprovider.h
+include/akonadi/socialutils/libakonadisocialutils_export.h
+include/akonadi/socialutils/socialfeeditem.h
+include/akonadi/socialutils/socialnetworkattributes.h
 include/akonadi/specialcollections.h
 include/akonadi/specialcollectionsrequestjob.h
 include/akonadi/standardactionmanager.h
@@ -791,6 +824,8 @@ include/kimap/setquotajob.h
 include/kimap/storejob.h
 include/kimap/subscribejob.h
 include/kimap/unsubscribejob.h
+include/kimaptest/fakeserver.h
+include/kimaptest/mockjob.h
 include/kldap/ber.h
 include/kldap/kldap_export.h
 include/kldap/ldapattributeproxymodel.h
@@ -836,7 +871,14 @@ include/kpimidentities/kpimidentities_export.h
 include/kpimidentities/signature.h
 include/kpimidentities/signatureconfigurator.h
 include/kpimtextedit/emailquotehighlighter.h
+include/kpimtextedit/emoticontexteditaction.h
+include/kpimtextedit/htmlhighlighter.h
+include/kpimtextedit/inserthtmldialog.h
+include/kpimtextedit/insertimagedialog.h
+include/kpimtextedit/insertimagewidget.h
+include/kpimtextedit/inserttabledialog.h
 include/kpimtextedit/kpimtextedit_export.h
+include/kpimtextedit/tableformatdialog.h
 include/kpimtextedit/textedit.h
 include/kpimtextedit/textutils.h
 include/kpimutils/email.h
@@ -961,12 +1003,13 @@ include/syndication/specificitem.h
 include/syndication/specificitemvisitor.h
 include/syndication/syndication.h
 include/syndication/tools.h
-lib/cmake/KdepimLibs/KDEPimLibsLibraryTargetsWithPrefix-relwithdebinfo.cmake
+lib/cmake/KdepimLibs/KDEPimLibsLibraryTargetsWithPrefix-${TARGET}.cmake
 lib/cmake/KdepimLibs/KDEPimLibsLibraryTargetsWithPrefix.cmake
 lib/cmake/KdepimLibs/KdepimLibsConfig.cmake
 lib/cmake/KdepimLibs/KdepimLibsConfigVersion.cmake
 lib/gpgmepp/GpgmeppConfig.cmake
 lib/gpgmepp/GpgmeppLibraryDepends.cmake
+lib/kde4/akonadi_serializer_socialfeeditem.so
 lib/kde4/kabc_directory.so
 lib/kde4/kabc_file.so
 lib/kde4/kabc_ldapkio.so
@@ -987,25 +1030,28 @@ lib/kde4/kio_smtp.so
 lib/kde4/plugins/designer/kholidayswidgets.so
 lib/libakonadi-calendar.so
 lib/libakonadi-calendar.so.4
-lib/libakonadi-calendar.so.4.8.0
+lib/libakonadi-calendar.so.${PKGVERSION}
 lib/libakonadi-contact.so
 lib/libakonadi-contact.so.4
-lib/libakonadi-contact.so.4.8.0
+lib/libakonadi-contact.so.${PKGVERSION}
 lib/libakonadi-kabc.so
 lib/libakonadi-kabc.so.4
-lib/libakonadi-kabc.so.4.8.0
+lib/libakonadi-kabc.so.${PKGVERSION}
 lib/libakonadi-kcal.so
 lib/libakonadi-kcal.so.4
-lib/libakonadi-kcal.so.4.8.0
+lib/libakonadi-kcal.so.${PKGVERSION}
 lib/libakonadi-kde.so
 lib/libakonadi-kde.so.4
-lib/libakonadi-kde.so.4.8.0
+lib/libakonadi-kde.so.${PKGVERSION}
 lib/libakonadi-kmime.so
 lib/libakonadi-kmime.so.4
-lib/libakonadi-kmime.so.4.8.0
+lib/libakonadi-kmime.so.${PKGVERSION}
 lib/libakonadi-notes.so
 lib/libakonadi-notes.so.4
-lib/libakonadi-notes.so.4.8.0
+lib/libakonadi-notes.so.${PKGVERSION}
+lib/libakonadi-socialutils.so
+lib/libakonadi-socialutils.so.4
+lib/libakonadi-socialutils.so.${PKGVERSION}
 lib/libgpgme++-pthread.so
 lib/libgpgme++-pthread.so.2
 lib/libgpgme++-pthread.so.2.8.0
@@ -1014,73 +1060,74 @@ lib/libgpgme++.so.2
 lib/libgpgme++.so.2.8.0
 lib/libkabc.so
 lib/libkabc.so.4
-lib/libkabc.so.4.8.0
+lib/libkabc.so.${PKGVERSION}
 lib/libkabc_file_core.so
 lib/libkabc_file_core.so.4
-lib/libkabc_file_core.so.4.8.0
+lib/libkabc_file_core.so.${PKGVERSION}
 lib/libkalarmcal.so
 lib/libkalarmcal.so.2
 lib/libkalarmcal.so.2.7.0
 lib/libkblog.so
 lib/libkblog.so.4
-lib/libkblog.so.4.8.0
+lib/libkblog.so.${PKGVERSION}
 lib/libkcal.so
 lib/libkcal.so.4
-lib/libkcal.so.4.8.0
+lib/libkcal.so.${PKGVERSION}
 lib/libkcalcore.so
 lib/libkcalcore.so.4
-lib/libkcalcore.so.4.8.0
+lib/libkcalcore.so.${PKGVERSION}
 lib/libkcalutils.so
 lib/libkcalutils.so.4
-lib/libkcalutils.so.4.8.0
+lib/libkcalutils.so.${PKGVERSION}
 lib/libkholidays.so
 lib/libkholidays.so.4
-lib/libkholidays.so.4.8.0
+lib/libkholidays.so.${PKGVERSION}
 lib/libkimap.so
 lib/libkimap.so.4
-lib/libkimap.so.4.8.0
+lib/libkimap.so.${PKGVERSION}
+lib/libkimaptest.a
 lib/libkldap.so
 lib/libkldap.so.4
-lib/libkldap.so.4.8.0
+lib/libkldap.so.${PKGVERSION}
 lib/libkmbox.so
 lib/libkmbox.so.4
-lib/libkmbox.so.4.8.0
+lib/libkmbox.so.${PKGVERSION}
 lib/libkmime.so
 lib/libkmime.so.4
-lib/libkmime.so.4.8.0
+lib/libkmime.so.${PKGVERSION}
 lib/libkontactinterface.so
 lib/libkontactinterface.so.4
-lib/libkontactinterface.so.4.8.0
+lib/libkontactinterface.so.${PKGVERSION}
 lib/libkpimidentities.so
 lib/libkpimidentities.so.4
-lib/libkpimidentities.so.4.8.0
+lib/libkpimidentities.so.${PKGVERSION}
 lib/libkpimtextedit.so
 lib/libkpimtextedit.so.4
-lib/libkpimtextedit.so.4.8.0
+lib/libkpimtextedit.so.${PKGVERSION}
 lib/libkpimutils.so
 lib/libkpimutils.so.4
-lib/libkpimutils.so.4.8.0
+lib/libkpimutils.so.${PKGVERSION}
 lib/libkresources.so
 lib/libkresources.so.4
-lib/libkresources.so.4.8.0
+lib/libkresources.so.${PKGVERSION}
 lib/libktnef.so
 lib/libktnef.so.4
-lib/libktnef.so.4.8.0
+lib/libktnef.so.${PKGVERSION}
 lib/libkxmlrpcclient.so
 lib/libkxmlrpcclient.so.4
-lib/libkxmlrpcclient.so.4.8.0
+lib/libkxmlrpcclient.so.${PKGVERSION}
 lib/libmailtransport.so
 lib/libmailtransport.so.4
-lib/libmailtransport.so.4.8.0
+lib/libmailtransport.so.${PKGVERSION}
 lib/libmicroblog.so
 lib/libmicroblog.so.4
-lib/libmicroblog.so.4.8.0
+lib/libmicroblog.so.${PKGVERSION}
 lib/libqgpgme.so
 lib/libqgpgme.so.1
 lib/libqgpgme.so.1.0.1
 lib/libsyndication.so
 lib/libsyndication.so.4
-lib/libsyndication.so.4.8.0
+lib/libsyndication.so.${PKGVERSION}
 share/dbus-1/interfaces/org.kde.KResourcesManager.xml
 share/dbus-1/interfaces/org.kde.pim.IdentityManager.xml
 share/doc/kde/HTML/en/kcontrol/kresources/common
@@ -1121,12 +1168,13 @@ share/kde/apps/akonadi/contact/icons/oxygen/16x16/apps/skype_protocol.png
 share/kde/apps/akonadi/contact/icons/oxygen/16x16/apps/sms_protocol.png
 share/kde/apps/akonadi/contact/icons/oxygen/16x16/apps/yahoo_protocol.png
 share/kde/apps/akonadi/contact/pics/world.jpg
+share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_socialfeeditem.desktop
 share/kde/apps/cmake/modules/CheckTimezone.cmake
-share/kde/apps/cmake/modules/FindAkonadi.cmake
 share/kde/apps/cmake/modules/FindGpgme.cmake
 share/kde/apps/cmake/modules/FindLdap.cmake
 share/kde/apps/cmake/modules/FindLibical.cmake
 share/kde/apps/cmake/modules/FindQGpgme.cmake
+share/kde/apps/cmake/modules/FindQtOAuth.cmake
 share/kde/apps/cmake/modules/KDEPimLibsDependencies.cmake
 share/kde/apps/kabc/countrytransl.map
 share/kde/apps/kabc/formats/binary.desktop
@@ -1150,14 +1198,20 @@ share/kde/apps/libkholidays/plan2/holiday_br_pt-br
 share/kde/apps/libkholidays/plan2/holiday_by_be
 share/kde/apps/libkholidays/plan2/holiday_ca-qc_fr
 share/kde/apps/libkholidays/plan2/holiday_ca_en-gb
+share/kde/apps/libkholidays/plan2/holiday_ch_de
 share/kde/apps/libkholidays/plan2/holiday_ch_fr
+share/kde/apps/libkholidays/plan2/holiday_ch_it
 share/kde/apps/libkholidays/plan2/holiday_cl_es
 share/kde/apps/libkholidays/plan2/holiday_cn_zh-cn
 share/kde/apps/libkholidays/plan2/holiday_co_es
+share/kde/apps/libkholidays/plan2/holiday_cr_en
+share/kde/apps/libkholidays/plan2/holiday_cr_es
 share/kde/apps/libkholidays/plan2/holiday_cz_cs
 share/kde/apps/libkholidays/plan2/holiday_de-by_de
 share/kde/apps/libkholidays/plan2/holiday_de_de
 share/kde/apps/libkholidays/plan2/holiday_dk_da
+share/kde/apps/libkholidays/plan2/holiday_dz_ar
+share/kde/apps/libkholidays/plan2/holiday_dz_fr
 share/kde/apps/libkholidays/plan2/holiday_ee_et
 share/kde/apps/libkholidays/plan2/holiday_eg_ar
 share/kde/apps/libkholidays/plan2/holiday_es-ct_ca
@@ -1191,6 +1245,8 @@ share/kde/apps/libkholidays/plan2/holiday_jm_en-gb
 share/kde/apps/libkholidays/plan2/holiday_jp_en-us
 share/kde/apps/libkholidays/plan2/holiday_jp_ja
 share/kde/apps/libkholidays/plan2/holiday_kr_ko
+share/kde/apps/libkholidays/plan2/holiday_kz_kk
+share/kde/apps/libkholidays/plan2/holiday_kz_ru
 share/kde/apps/libkholidays/plan2/holiday_lt_lt
 share/kde/apps/libkholidays/plan2/holiday_lu_fr
 share/kde/apps/libkholidays/plan2/holiday_lu_lb
@@ -1201,13 +1257,17 @@ share/kde/apps/libkholidays/plan2/holiday_na_en-gb
 share/kde/apps/libkholidays/plan2/holiday_nc_fr
 share/kde/apps/libkholidays/plan2/holiday_nl_nl
 share/kde/apps/libkholidays/plan2/holiday_no_nb
+share/kde/apps/libkholidays/plan2/holiday_no_nn
 share/kde/apps/libkholidays/plan2/holiday_nz_en-gb
+share/kde/apps/libkholidays/plan2/holiday_pa_en
+share/kde/apps/libkholidays/plan2/holiday_pa_es
 share/kde/apps/libkholidays/plan2/holiday_pf_fr
 share/kde/apps/libkholidays/plan2/holiday_pl_pl
 share/kde/apps/libkholidays/plan2/holiday_pt_pt
 share/kde/apps/libkholidays/plan2/holiday_py_es
 share/kde/apps/libkholidays/plan2/holiday_re_fr
 share/kde/apps/libkholidays/plan2/holiday_ro_ro
+share/kde/apps/libkholidays/plan2/holiday_rs_sr
 share/kde/apps/libkholidays/plan2/holiday_ru_ru
 share/kde/apps/libkholidays/plan2/holiday_se_sv
 share/kde/apps/libkholidays/plan2/holiday_sg_en-gb
@@ -1227,6 +1287,7 @@ share/kde/config.kcfg/resourcebase.kcfg
 share/kde/config.kcfg/specialmailcollections.kcfg
 share/kde4/services/akonadi/contact/aimprotocol.desktop
 share/kde4/services/akonadi/contact/gaduprotocol.desktop
+share/kde4/services/akonadi/contact/googletalkprotocol.desktop
 share/kde4/services/akonadi/contact/groupwiseprotocol.desktop
 share/kde4/services/akonadi/contact/icqprotocol.desktop
 share/kde4/services/akonadi/contact/ircprotocol.desktop
@@ -1237,7 +1298,7 @@ share/kde4/services/akonadi/contact/skypeprotocol.desktop
 share/kde4/services/akonadi/contact/smsprotocol.desktop
 share/kde4/services/akonadi/contact/yahooprotocol.desktop
 share/kde4/services/akonadicontact_actions.desktop
-share/kde4/services/imap4.protocol
+share/kde4/services/imap.protocol
 share/kde4/services/imaps.protocol
 share/kde4/services/kcm_mailtransport.desktop
 share/kde4/services/kresources.desktop
@@ -1263,3 +1324,4 @@ share/kde4/servicetypes/kontactplugin.desktop
 share/kde4/servicetypes/kresources_manager.desktop
 share/kde4/servicetypes/kresources_plugin.desktop
 share/mime/packages/kdepimlibs-mime.xml
+share/mime/packages/x-vnd.akonadi.socialfeeditem.xml
diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo
index a4d73e032b3..79ed49fca35 100644
--- a/misc/kdepimlibs4/distinfo
+++ b/misc/kdepimlibs4/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.24 2012/12/20 23:00:06 joerg Exp $
+$NetBSD: distinfo,v 1.25 2013/04/03 10:51:47 markd Exp $
 
-SHA1 (kdepimlibs-4.8.4.tar.xz) = 34f693ac71896d0d8653fc2a81323d1e91531bb2
-RMD160 (kdepimlibs-4.8.4.tar.xz) = f9804ea6e6d016d879a16f1077e49aeef429ba13
-Size (kdepimlibs-4.8.4.tar.xz) = 2858756 bytes
+SHA1 (kdepimlibs-4.10.2.tar.xz) = ab163597d36b5457f9bcb0328f21c35777fffc34
+RMD160 (kdepimlibs-4.10.2.tar.xz) = bdcd31a2c3388886196b8b68e805a9672a55f998
+Size (kdepimlibs-4.10.2.tar.xz) = 2808532 bytes
 SHA1 (patch-gpgmexx_config-gpgmexx.h.cmake) = bd8fd1e9a619d6bd52185f37adb5dc7f7b97423c
 SHA1 (patch-kalarmcal_CMakeLists.txt) = 8237552f350f214c3380bf0fc54d19d36765c9b9
 SHA1 (patch-kblog_CMakeLists.txt) = 183d17f2de6f5f4f2f6bd29666b2a35d22c055aa
 SHA1 (patch-kcalutils_CMakeLists.txt) = 5c212ab23d0b1006a43c765bc1d860be85da284a
-SHA1 (patch-kimap_loginjob.cpp) = efcc4ee6915215013cbc8b349741d747cb061a94
+SHA1 (patch-kimap_loginjob.cpp) = 8a0fe3c1779b981d9c9ca6cb34121219f2f97c9f
 SHA1 (patch-kldap_ber.cpp) = 3656e006278db8fd4014f6e4a902f60703955871
 SHA1 (patch-kldap_ber.h) = c4edcaedb7169e261892b973627b3265f1efd3df
 SHA1 (patch-kmbox_CMakeLists.txt) = 924bd70a84c8af1c7d37501d4f718343a0aa7121
-SHA1 (patch-kpimutils_CMakeLists.txt) = 0a9f7283e2b70b38e0c545240251bc9ecb615eab
+SHA1 (patch-kpimutils_CMakeLists.txt) = 540a866b7c9d9de35ed0613519320490d73258d8
 SHA1 (patch-qgpgme_CMakeLists.txt) = 0860963f371a008f1d006dad58ea40329c358cfd
diff --git a/misc/kdepimlibs4/patches/patch-kimap_loginjob.cpp b/misc/kdepimlibs4/patches/patch-kimap_loginjob.cpp
index 85ac4e93983..97d1060cb50 100644
--- a/misc/kdepimlibs4/patches/patch-kimap_loginjob.cpp
+++ b/misc/kdepimlibs4/patches/patch-kimap_loginjob.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-kimap_loginjob.cpp,v 1.1 2012/04/26 13:22:42 hans Exp $
+$NetBSD: patch-kimap_loginjob.cpp,v 1.2 2013/04/03 10:51:48 markd Exp $
 
---- kimap/loginjob.cpp.orig	2012-02-29 23:56:04.000000000 +0100
-+++ kimap/loginjob.cpp	2012-04-26 14:32:19.144049407 +0200
-@@ -260,7 +260,7 @@ void LoginJob::handleResponse( const Mes
+--- kimap/loginjob.cpp.orig	2013-03-01 06:58:43.000000000 +0000
++++ kimap/loginjob.cpp
+@@ -282,7 +282,7 @@ void LoginJob::handleResponse( const Mes
  
    enum ResponseCode {
      OK,
@@ -11,21 +11,21 @@ $NetBSD: patch-kimap_loginjob.cpp,v 1.1 2012/04/26 13:22:42 hans Exp $
      UNTAGGED,
      CONTINUATION,
      MALFORMED
-@@ -282,7 +282,7 @@ void LoginJob::handleResponse( const Mes
-     else if ( response.content[1].toString() == "OK" )
+@@ -305,7 +305,7 @@ void LoginJob::handleResponse( const Mes
+     } else if ( response.content[1].toString() == "OK" ) {
        code = OK;
-     else
+     } else {
 -      code = ERR;
 +      code = ERROR;
+     }
    }
  
-   switch (code) {
-@@ -290,7 +290,7 @@ void LoginJob::handleResponse( const Mes
+@@ -314,7 +314,7 @@ void LoginJob::handleResponse( const Mes
        // We'll handle it later
        break;
  
 -    case ERR:
 +    case ERROR:
        //server replied with NO or BAD for SASL authentication
-       if (d->authState == LoginJobPrivate::Authenticate)
+       if ( d->authState == LoginJobPrivate::Authenticate ) {
          sasl_dispose( &d->conn );
diff --git a/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt
index 3f015ed0978..22a005cd119 100644
--- a/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt
+++ b/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt
@@ -1,12 +1,12 @@
-$NetBSD: patch-kpimutils_CMakeLists.txt,v 1.1 2012/03/19 11:46:44 markd Exp $
+$NetBSD: patch-kpimutils_CMakeLists.txt,v 1.2 2013/04/03 10:51:48 markd Exp $
 
---- kpimutils/CMakeLists.txt.orig	2011-07-27 18:34:56.000000000 +0000
+--- kpimutils/CMakeLists.txt.orig	2013-03-01 06:58:43.000000000 +0000
 +++ kpimutils/CMakeLists.txt
 @@ -1,6 +1,7 @@
  project(kpimutils)
  
- add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5321 )
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5321)
 +add_definitions(${KDE4_ENABLE_EXCEPTIONS})
  
- add_subdirectory( tests )
+ add_subdirectory(tests)