aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/kcharselect/Makefile18
-rw-r--r--deskutils/kcharselect/distinfo6
-rw-r--r--deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--deskutils/kcharselect/files/patch-ark_plugins_libzipplugin-zipplugin.cpp13
-rw-r--r--deskutils/kcharselect/pkg-plist79
-rw-r--r--deskutils/kdepim4-runtime/Makefile51
-rw-r--r--deskutils/kdepim4-runtime/distinfo3
-rw-r--r--deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt33
-rw-r--r--deskutils/kdepim4-runtime/files/qt3to4headers.txt46
-rw-r--r--deskutils/kdepim4-runtime/pkg-descr8
-rw-r--r--deskutils/kdepim4-runtime/pkg-plist106
-rw-r--r--deskutils/kdepim4/Makefile7
-rw-r--r--deskutils/kdepim4/distinfo6
-rw-r--r--deskutils/kdepim4/files/patch-kleopatra-main.cpp20
-rw-r--r--deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp11
-rw-r--r--deskutils/kdepim4/pkg-plist293
-rw-r--r--deskutils/kdepim44-runtime/Makefile51
-rw-r--r--deskutils/kdepim44-runtime/distinfo3
-rw-r--r--deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt33
-rw-r--r--deskutils/kdepim44-runtime/files/qt3to4headers.txt46
-rw-r--r--deskutils/kdepim44-runtime/pkg-descr8
-rw-r--r--deskutils/kdepim44-runtime/pkg-plist106
-rw-r--r--deskutils/kdepim44/Makefile7
-rw-r--r--deskutils/kdepim44/distinfo6
-rw-r--r--deskutils/kdepim44/files/patch-kleopatra-main.cpp20
-rw-r--r--deskutils/kdepim44/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp11
-rw-r--r--deskutils/kdepim44/pkg-plist293
-rw-r--r--deskutils/kdepimlibs4/Makefile5
-rw-r--r--deskutils/kdepimlibs4/distinfo6
-rw-r--r--deskutils/kdepimlibs4/files/patch-CMakeLists.txt11
-rw-r--r--deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt11
-rw-r--r--deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp13
-rw-r--r--deskutils/kdepimlibs4/files/patch-gpgme++-global.h11
-rw-r--r--deskutils/kdepimlibs4/pkg-plist358
-rw-r--r--deskutils/kdeplasma-addons/Makefile15
-rw-r--r--deskutils/kdeplasma-addons/distinfo6
-rw-r--r--deskutils/kdeplasma-addons/files/patch-CMakeLists.txt28
-rw-r--r--deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt24
-rw-r--r--deskutils/kdeplasma-addons/files/qt3to4headers.txt46
-rw-r--r--deskutils/kdeplasma-addons/pkg-plist252
40 files changed, 1343 insertions, 747 deletions
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index b1cb76a28610..4f3ef3b2ecf0 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdeutils
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,6 +16,7 @@ COMMENT= Utilities for the KDE4 integrated X11 Desktop
LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 \
zip.1:${PORTSDIR}/archivers/libzip \
+ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
qimageblitz.4:${PORTSDIR}/x11/qimageblitz
RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg
@@ -24,18 +24,28 @@ LATEST_LINK= ${PORTNAME}4
USE_BZIP2= yes
USE_QT_VER= 4
+USE_PYTHON= 2.5+
KDE4_BUILDENV= yes
-USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4
+USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp
QT_COMPONENTS= network gui porting xml \
qmake_build moc_build rcc_build uic_build
-MAKE_JOBS_UNSAFE= yes
+MAKE_JOBS_SAFE= yes
MAN1= ark.1
-OPTIONS= PRINTER_APPLET "Install printer system tray utility" off
+OPTIONS= PRINTER_APPLET "Install printer system tray utility" off \
+ KONQUI "Konqueror UI integration" off
.include <bsd.port.pre.mk>
+.if defined(WITH_KONQUI)
+USE_KDE4+= kdebase
+PLIST_SUB+= KONQUI=""
+.else
+PLIST_SUB+= KONQUI="@comment "
+
+.endif
+
.if defined(WITH_PRINTER_APPLET)
RUN_DEPENDS+= ${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
.endif
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 9dff5bcea695..80d48a0439d0 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.2.4.tar.bz2) = e7214cb1e84d2e6793d3dbeb8f33a3fe
-SHA256 (KDE/kdeutils-4.2.4.tar.bz2) = 82b9908d4ecbbd5864be9cdeef1eeff5cd190a4c661b25b2f056775b7fe5120f
-SIZE (KDE/kdeutils-4.2.4.tar.bz2) = 2377830
+MD5 (KDE/kdeutils-4.3.0.tar.bz2) = 9d17d3d7bf25be5af1cbd4abf04e4c99
+SHA256 (KDE/kdeutils-4.3.0.tar.bz2) = c94f3462ea8bf375f3a83806380470c234465dcde8b7c63629d89965edc21d40
+SIZE (KDE/kdeutils-4.3.0.tar.bz2) = 2521985
diff --git a/deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
deleted file mode 100644
index 6f6752537061..000000000000
--- a/deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
-+++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
-@@ -567,7 +567,7 @@
- }
- }
-
-- ret = archive_write_finish(arch_writer);
-+ archive_write_finish(arch_writer);
-
- if (!creatingNewFile) {
- archive_read_finish( arch_reader );
-@@ -700,7 +700,7 @@
- archive_entry_clear( entry );
- }
-
-- ret = archive_write_finish(arch_writer);
-+ archive_write_finish(arch_writer);
-
- archive_read_finish( arch_reader );
-
diff --git a/deskutils/kcharselect/files/patch-ark_plugins_libzipplugin-zipplugin.cpp b/deskutils/kcharselect/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
deleted file mode 100644
index eb03ee5e2287..000000000000
--- a/deskutils/kcharselect/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../ark/plugins/libzipplugin/zipplugin.cpp.orig 2008-12-10 16:13:03.000000000 +0000
-+++ ../ark/plugins/libzipplugin/zipplugin.cpp 2008-12-29 22:16:13.000000000 +0000
-@@ -28,8 +28,8 @@
-
- #ifdef LIBZIP_COMPILED_WITH_32BIT_OFF_T
-
--#define __off_t_defined
--typedef quint32 off_t;
-+// #define __off_t_defined
-+// typedef quint32 off_t;
-
- #endif /* LIBZIP_COMPILED_WITH_32BIT_OFF_T */
-
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index bdd61ec32069..7bf4309ec709 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -1,4 +1,5 @@
bin/ark
+bin/irkick
bin/kcalc
bin/kcharselect
bin/kdessh
@@ -13,17 +14,25 @@ bin/superkaramba
bin/sweeper
lib/kde4/kcm_kdf.so
lib/kde4/kcm_kwallet.so
-lib/kde4/kerfuffle_7zip.so
+lib/kde4/kcm_lirc.so
+lib/kde4/kerfuffle_7z.so
+lib/kde4/kerfuffle_clirar.so
+lib/kde4/kerfuffle_clizip.so
lib/kde4/kerfuffle_libarchive.so
+lib/kde4/kerfuffle_libbz2.so
lib/kde4/kerfuffle_libgz.so
-lib/kde4/kerfuffle_libzip.so
-lib/kde4/kerfuffle_rar.so
+lib/kde4/kerfuffle_libxz.so
lib/kde4/libarkpart.so
+%%KONQUI%%lib/kde4/libextracthere.so
lib/kde4/libkbytearrayedit.so
lib/kde4/liboktetapart.so
lib/kde4/plasma_package_superkaramba.so
lib/kde4/plasma_scriptengine_superkaramba.so
+lib/libkdeinit4_irkick.so
lib/libkdeinit4_kcalc.so
+lib/libkdelirc_shared.so
+lib/libkdelirc_shared.so.1
+lib/libkdelirc_shared.so.1.0.0
lib/libkerfuffle.so
lib/libkerfuffle.so.5
lib/libkerfuffle.so.5.0.1
@@ -39,6 +48,7 @@ lib/libsuperkaramba.so.5.0.1
share/applications/kde4/KCharSelect.desktop
share/applications/kde4/KFloppy.desktop
share/applications/kde4/ark.desktop
+share/applications/kde4/irkick.desktop
share/applications/kde4/kcalc.desktop
share/applications/kde4/kdf.desktop
share/applications/kde4/kgpg.desktop
@@ -51,14 +61,13 @@ share/applications/kde4/superkaramba.desktop
share/applications/kde4/sweeper.desktop
share/apps/ark/ark_part.rc
share/apps/ark/arkui.rc
+share/apps/irkick/irkick.notifyrc
share/apps/kcalc/kcalcui.rc
share/apps/kcalc/scienceconstants.xml
share/apps/kcharselect/kcharselectui.rc
share/apps/kconf_update/kcalcrc.upd
share/apps/kconf_update/kcharselect.upd
share/apps/kdf/kdfui.rc
-share/apps/kdf/pics/delete.png
-share/apps/kdf/pics/tick.png
share/apps/kgpg/icons/oxygen/16x16/actions/document-export-key.png
share/apps/kgpg/icons/oxygen/16x16/actions/document-import-key.png
share/apps/kgpg/icons/oxygen/16x16/actions/document-properties-key.png
@@ -102,8 +111,29 @@ share/apps/kwalletmanager/kwalleteditor.rc
share/apps/kwalletmanager/kwalletmanager.rc
share/apps/okteta/oktetaui.rc
share/apps/oktetapart/oktetapartui.rc
+share/apps/profiles/amarok.profile.xml
+share/apps/profiles/dragonplayer.profile.xml
+share/apps/profiles/klauncher.profile.xml
+share/apps/profiles/kmix.profile.xml
+share/apps/profiles/konqueror.profile.xml
+share/apps/profiles/noatun.profile.xml
+share/apps/profiles/okular.profile.xml
+share/apps/profiles/profile.dtd
+share/apps/profiles/shutdown.profile.xml
+share/apps/profiles/suspend.profile.xml
+share/apps/profiles/vlc.profile.xml
+share/apps/remotes/AppleRemote.remote.xml
+share/apps/remotes/AsusDH.remote.xml
+share/apps/remotes/RM-0010.remote.xml
+share/apps/remotes/cimr100.remote.xml
+share/apps/remotes/hauppauge.remote.xml
+share/apps/remotes/packbell.remote.xml
+share/apps/remotes/remote.dtd
+share/apps/remotes/sherwood.remote.xml
+share/apps/remotes/sonytv.remote.xml
share/apps/superkaramba/superkarambaui.rc
share/apps/sweeper/sweeperui.rc
+share/autostart/irkick.desktop
share/autostart/kgpg.desktop
share/config.kcfg/ark.kcfg
share/config.kcfg/kcalc.kcfg
@@ -116,6 +146,9 @@ share/doc/HTML/en/ark/common
share/doc/HTML/en/ark/index.cache.bz2
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/man-ark.1.docbook
+share/doc/HTML/en/irkick/common
+share/doc/HTML/en/irkick/index.cache.bz2
+share/doc/HTML/en/irkick/index.docbook
share/doc/HTML/en/kcalc/commands.docbook
share/doc/HTML/en/kcalc/common
share/doc/HTML/en/kcalc/index.cache.bz2
@@ -123,6 +156,9 @@ share/doc/HTML/en/kcalc/index.docbook
share/doc/HTML/en/kcharselect/common
share/doc/HTML/en/kcharselect/index.cache.bz2
share/doc/HTML/en/kcharselect/index.docbook
+share/doc/HTML/en/kcmlirc/common
+share/doc/HTML/en/kcmlirc/index.cache.bz2
+share/doc/HTML/en/kcmlirc/index.docbook
share/doc/HTML/en/kcontrol/blockdevices/common
share/doc/HTML/en/kcontrol/blockdevices/index.cache.bz2
share/doc/HTML/en/kcontrol/blockdevices/index.docbook
@@ -142,6 +178,7 @@ share/doc/HTML/en/kgpg/keygen.png
share/doc/HTML/en/kgpg/keymanage.png
share/doc/HTML/en/kgpg/keyprop.png
share/doc/HTML/en/kgpg/keys.png
+share/doc/HTML/en/kgpg/keyserver-search.png
share/doc/HTML/en/kgpg/keyserver.png
share/doc/HTML/en/kgpg/kicker.png
share/doc/HTML/en/kgpg/options.png
@@ -192,6 +229,7 @@ share/icons/hicolor/16x16/apps/kwalletmanager2.png
share/icons/hicolor/16x16/apps/kwikdisk.png
share/icons/hicolor/16x16/apps/okteta.png
share/icons/hicolor/16x16/apps/superkaramba.png
+share/icons/hicolor/22x22/apps/irkick.png
share/icons/hicolor/22x22/apps/kdf.png
share/icons/hicolor/22x22/apps/kfloppy.png
share/icons/hicolor/22x22/apps/kgpg.png
@@ -222,30 +260,50 @@ share/icons/hicolor/64x64/apps/kwalletmanager.png
share/icons/hicolor/64x64/apps/kwalletmanager2.png
share/icons/hicolor/64x64/apps/kwikdisk.png
share/icons/hicolor/64x64/apps/superkaramba.png
+share/icons/hicolor/scalable/apps/irkick.svgz
share/icons/hicolor/scalable/apps/superkaramba.svgz
+share/icons/oxygen/128x128/devices/infrared-remote.png
share/icons/oxygen/16x16/apps/kcmdf.png
+share/icons/oxygen/16x16/devices/infrared-remote.png
+share/icons/oxygen/22x22/actions/irkickflash.png
+share/icons/oxygen/22x22/actions/irkickoff.png
share/icons/oxygen/22x22/apps/kcmdf.png
+share/icons/oxygen/22x22/devices/infrared-remote.png
share/icons/oxygen/32x32/apps/kcmdf.png
+share/icons/oxygen/32x32/devices/infrared-remote.png
+share/icons/oxygen/42x42/devices/infrared-remote.png
+share/icons/oxygen/48x48/devices/infrared-remote.png
+share/icons/oxygen/64x64/devices/infrared-remote.png
+share/icons/oxygen/8x8/devices/infrared-remote.png
+share/icons/oxygen/scalable/actions/irkickflash.svgz
+share/icons/oxygen/scalable/actions/irkickoff.svgz
+share/icons/oxygen/scalable/devices/infrared-remote.svgz
share/kde4/services/ServiceMenus/ark_addtoservicemenu.desktop
share/kde4/services/ServiceMenus/ark_servicemenu.desktop
share/kde4/services/ServiceMenus/encryptfile.desktop
share/kde4/services/ServiceMenus/encryptfolder.desktop
share/kde4/services/ServiceMenus/floppy_format.desktop
share/kde4/services/ServiceMenus/viewdecrypted.desktop
+%%KONQUI%%share/kde4/services/ark_dndextract.desktop
share/kde4/services/ark_part.desktop
share/kde4/services/kbytearrayedit.desktop
+share/kde4/services/kcm_lirc.desktop
share/kde4/services/kcmdf.desktop
-share/kde4/services/kerfuffle_7zip.desktop
+share/kde4/services/kerfuffle_7z.desktop
+share/kde4/services/kerfuffle_clirar.desktop
+share/kde4/services/kerfuffle_clizip.desktop
share/kde4/services/kerfuffle_libarchive.desktop
+share/kde4/services/kerfuffle_libbz2.desktop
share/kde4/services/kerfuffle_libgz.desktop
-share/kde4/services/kerfuffle_libzip.desktop
-share/kde4/services/kerfuffle_rar.desktop
+share/kde4/services/kerfuffle_libxz.desktop
share/kde4/services/kwalletconfig.desktop
share/kde4/services/kwalletmanager_show.desktop
share/kde4/services/oktetapart.desktop
share/kde4/services/plasma-package-superkaramba.desktop
share/kde4/services/plasma-scriptengine-superkaramba.desktop
share/kde4/servicetypes/kerfufflePlugin.desktop
+@dirrmtry share/icons/oxygen/42x42/devices
+@dirrmtry share/icons/oxygen/42x42
@dirrm share/doc/HTML/en/superkaramba
@dirrm share/doc/HTML/en/okteta
@dirrm share/doc/HTML/en/kwallet
@@ -254,11 +312,14 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
@dirrm share/doc/HTML/en/kfloppy
@dirrm share/doc/HTML/en/kdf
@dirrm share/doc/HTML/en/kcontrol/blockdevices
+@dirrm share/doc/HTML/en/kcmlirc
@dirrm share/doc/HTML/en/kcharselect
@dirrm share/doc/HTML/en/kcalc
+@dirrm share/doc/HTML/en/irkick
@dirrm share/doc/HTML/en/ark
@dirrm share/apps/sweeper
@dirrm share/apps/superkaramba
+@dirrm share/apps/remotes
@dirrm share/apps/oktetapart
@dirrm share/apps/okteta
@dirrm share/apps/kwalletmanager/icons/oxygen/22x22/actions
@@ -285,7 +346,7 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
@dirrm share/apps/kgpg/icons/oxygen
@dirrm share/apps/kgpg/icons
@dirrm share/apps/kgpg
-@dirrm share/apps/kdf/pics
@dirrm share/apps/kdf
@dirrm share/apps/kcalc
+@dirrm share/apps/irkick
@dirrm share/apps/ark
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
new file mode 100644
index 000000000000..830f2b1b0a3e
--- /dev/null
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -0,0 +1,51 @@
+# New ports collection Makefile for: kdepimp4
+# Date created: 2008-31-05
+# Whom: miwi
+#
+# $FreeBSD$
+
+PORTNAME= kdepim-runtime
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= deskutils kde ipv6
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Libraries for KDE-PIM applications
+
+BUILD_DEPENDS= libassuan>=1.0.4:${PORTSDIR}/security/libassuan
+LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \
+ sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+ boost_python:${PORTSDIR}/devel/boost-python-libs \
+ qca.2:${PORTSDIR}/devel/qca
+
+LATEST_LINK= ${PORTNAME}4
+
+USE_KDE4= kdelibs kdeexp pimlibs runtime akonadi kdeprefix kdehier automoc4
+KDE4_BUILDENV= yes
+USE_BZIP2= yes
+USE_QT_VER= 4
+QT_COMPONENTS= corelib opengl dbus qt3support designer network svg qtestlib \
+ xml gui qmake_build moc_build rcc_build uic_build
+USE_OPENLDAP= yes
+MAKE_JOBS_SAFE= yes
+
+#fix build when kdepim3 is here
+CMAKE_ARGS+= -DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib"
+
+post-extract:
+ ${MKDIR} ${WRKSRC}
+
+post-patch:
+ ${GREP} -H -r "#include <q" ${WRKSRC}/.. | ${CUT} -d: -f1 | uniq | \
+ ${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
+
+pre-configure:
+ #respect prefix
+ ${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \
+ ${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g'
+ @${REINPLACE_CMD} -e 's|add_subdirectory( kolabproxy )||' \
+ ${WRKSRC}/../resources/CMakeLists.txt
+
+.include <bsd.port.mk>
diff --git a/deskutils/kdepim4-runtime/distinfo b/deskutils/kdepim4-runtime/distinfo
new file mode 100644
index 000000000000..3b8981a6befb
--- /dev/null
+++ b/deskutils/kdepim4-runtime/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdepim-runtime-4.3.0.tar.bz2) = 608b629bfc1a1976d6888079e5d839f1
+SHA256 (KDE/kdepim-runtime-4.3.0.tar.bz2) = 8e0e39afaae73bc53f83d57c015172b75852778e4e14fcc6b9ffd6e261115cf2
+SIZE (KDE/kdepim-runtime-4.3.0.tar.bz2) = 743273
diff --git a/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
new file mode 100644
index 000000000000..deb1a277bab8
--- /dev/null
+++ b/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
@@ -0,0 +1,33 @@
+--- ../xml/CMakeLists.txt.orig 2009-06-03 22:54:34.000000000 +1100
++++ ../xml/CMakeLists.txt 2009-07-05 22:39:32.000000000 +1100
+@@ -1,21 +1,24 @@
+ project (akonadixml)
+
+-if ( LIBXML2_FOUND )
+- add_definitions( -DHAVE_LIBXML2 )
+-endif ( LIBXML2_FOUND )
+-
+-add_subdirectory( tests )
+-
+ add_definitions( -DQT_NO_CAST_FROM_ASCII )
+ add_definitions( -DQT_NO_CAST_TO_ASCII )
+
+ include_directories(
++ ${QT_QTGUI_INCLUDE_DIR}
++ ${QT_QTCORE_INCLUDE_DIR}
++ ${QT_QTXML_INCLUDE_DIR}
+ ${AKONADI_INCLUDE_DIR}
+ ${KDE4_INCLUDES}
+ ${KDEPIMLIBS_INCLUDE_DIR}
+ ${LIBXML2_INCLUDE_DIR}
+ )
+
++if ( LIBXML2_FOUND )
++ add_definitions( -DHAVE_LIBXML2 )
++endif ( LIBXML2_FOUND )
++
++add_subdirectory( tests )
++
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+
+ set( akonadixml_SRCS
diff --git a/deskutils/kdepim4-runtime/files/qt3to4headers.txt b/deskutils/kdepim4-runtime/files/qt3to4headers.txt
new file mode 100644
index 000000000000..75f06c344ce0
--- /dev/null
+++ b/deskutils/kdepim4-runtime/files/qt3to4headers.txt
@@ -0,0 +1,46 @@
+s/<q3dragobject.h>/<Q3DragObject>/g
+s/<q3frame.h>/<Q3Frame>/g
+s/<q3groupbox.h>/<Q3GroupBox>/g
+s/<q3hgroupbox.h>/<Q3HGroupBox>/g
+s/<q3listview.h>/<Q3ListView>/g
+s/<q3popupmenu.h>/<Q3PopupMenu>/g
+s/<q3process.h>/<Q3Process>/g
+s/<q3progressdialog.h>/<Q3ProgressDialog>/g
+s/<q3strlist.h>/<Q3StrList>/g
+s/<q3textview.h>/<Q3TextView>/g
+s/<q3vbox.h>/<Q3VBox>/g
+s/<q3vgroupbox.h>/<Q3VGroupBox>/g
+s/<qapplication.h>/<QApplication>/g
+s/<qbuttongroup.h>/<QButtonGroup>/g
+s/<qcheckbox.h>/<QCheckBox>/g
+s/<qcolor.h>/<QColor>/g
+s/<qcombobox.h>/<QComboBox>/g
+s/<qcursor.h>/<QCursor>/g
+s/<qdesktopwidget.h>/<QDesktopWidget>/g
+s/<qdir.h>/<QDir>/g
+s/<qevent.h>/<QEvent>/g
+s/<qfile.h>/<QFile>/g
+s/<qfileinfo.h>/<QFileInfo>/g
+s/<qfont.h>/<QFont>/g
+s/<qfontmetrics.h>/<QFontMetrics>/g
+s/<qgroupbox.h>/<QGroupBox>/g
+s/<qimage.h>/<QImage>/g
+s/<qlabel.h>/<QLabel>/g
+s/<qlayout.h>/<QLayout>/g
+s/<qlineedit.h>/<QLineEdit>/g
+s/<qmatrix.h>/<QMatrix>/g
+s/<qobject.h>/<QObject>/g
+s/<qpainter.h>/<QPainter>/g
+s/<qpalette.h>/<QPalette>/g
+s/<qpixmap.h>/<QPixmap>/g
+s/<qpointer.h>/<QPointer>/g
+s/<qpushbutton.h>/<QPushButton>/g
+s/<qradiobutton.h>/<QRadioButton>/g
+s/<qregexp.h>/<QRegExp>/g
+s/<qspinbox.h>/<QSpinBox>/g
+s/<qstring.h>/<QString>/g
+s/<qtextcodec.h>/<QTextCodec>/g
+s/<qtextstream.h>/<QTextStream>/g
+s/<qtimer.h>/<QTimer>/g
+s/<qtooltip.h>/<QToolTip>/g
+s/<qwidget.h>/<QWidget>/g
diff --git a/deskutils/kdepim4-runtime/pkg-descr b/deskutils/kdepim4-runtime/pkg-descr
new file mode 100644
index 000000000000..8485fc9d7142
--- /dev/null
+++ b/deskutils/kdepim4-runtime/pkg-descr
@@ -0,0 +1,8 @@
+KDE4 is the K Desktop Environment for Unix, Windows, and Mac OS X.
+
+These kde4 ports intend to provide early access to KDE4 for FreeBSD
+developers, porters and beta testers. Use at your own risk!
+
+This package provides PIM runtime libs for KDE4.
+
+WWW: http://www.kde.org/
diff --git a/deskutils/kdepim4-runtime/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist
new file mode 100644
index 000000000000..9ae4d7500692
--- /dev/null
+++ b/deskutils/kdepim4-runtime/pkg-plist
@@ -0,0 +1,106 @@
+bin/akonadi2xml
+bin/akonadi_birthdays_resource
+bin/akonadi_distlist_resource
+bin/akonadi_ical_resource
+bin/akonadi_imap_resource
+bin/akonadi_kabc_resource
+bin/akonadi_kcal_resource
+bin/akonadi_knut_resource
+bin/akonadi_localbookmarks_resource
+bin/akonadi_maildir_resource
+bin/akonadi_microblog_resource
+bin/akonadi_nepomuk_contact_feeder
+bin/akonadi_nepomuk_email_feeder
+bin/akonadi_nepomuktag_resource
+bin/akonadi_nntp_resource
+bin/akonadi_strigi_feeder
+bin/akonadi_vcard_resource
+bin/akonadi_vcarddir_resource
+bin/akonadiconsole
+bin/akonaditray
+bin/kres-migrator
+include/akonadi/xml/akonadi-xml_export.h
+include/akonadi/xml/xmldocument.h
+include/akonadi/xml/xmlreader.h
+include/akonadi/xml/xmlwritejob.h
+include/akonadi/xml/xmlwriter.h
+lib/kde4/akonadi_serializer_addressee.so
+lib/kde4/akonadi_serializer_bookmark.so
+lib/kde4/akonadi_serializer_contactgroup.so
+lib/kde4/akonadi_serializer_kcal.so
+lib/kde4/akonadi_serializer_mail.so
+lib/kde4/akonadi_serializer_microblog.so
+lib/kde4/kabc_akonadi.so
+lib/kde4/kcal_akonadi.so
+lib/kde4/kcm_akonadi.so
+lib/kde4/kcm_akonadi_resources.so
+lib/kde4/kcm_akonadi_server.so
+lib/kde4/kio_akonadi.so
+lib/libakonadi-kabccommon.so
+lib/libakonadi-kabccommon.so.5
+lib/libakonadi-kabccommon.so.5.0.1
+lib/libakonadi-kcal.so
+lib/libakonadi-kcal.so.5
+lib/libakonadi-kcal.so.5.0.1
+lib/libakonadi-xml.so
+lib/libakonadi-xml.so.5
+lib/libakonadi-xml.so.5.0.1
+lib/libakonadi_next.so
+lib/libakonadi_next.so.5
+lib/libakonadi_next.so.5.0.1
+lib/libkdepim-copy.so
+lib/libkdepim-copy.so.5
+lib/libkdepim-copy.so.5.0.1
+lib/libmaildir.so
+lib/libmaildir.so.5
+lib/libmaildir.so.5.0.1
+share/akonadi/agents/birthdaysresource.desktop
+share/akonadi/agents/distlistresource.desktop
+share/akonadi/agents/icalresource.desktop
+share/akonadi/agents/imapresource.desktop
+share/akonadi/agents/kabcresource.desktop
+share/akonadi/agents/kcalresource.desktop
+share/akonadi/agents/knutresource.desktop
+share/akonadi/agents/localbookmarksresource.desktop
+share/akonadi/agents/maildirresource.desktop
+share/akonadi/agents/microblog.desktop
+share/akonadi/agents/nepomukcontactfeeder.desktop
+share/akonadi/agents/nepomukemailfeeder.desktop
+share/akonadi/agents/nepomuktagresource.desktop
+share/akonadi/agents/nntpresource.desktop
+share/akonadi/agents/notesresource.desktop
+share/akonadi/agents/strigifeeder.desktop
+share/akonadi/agents/vcarddirresource.desktop
+share/akonadi/agents/vcardresource.desktop
+share/applications/kde4/akonadiconsole.desktop
+share/applications/kde4/akonaditray.desktop
+share/apps/akonadi/akonadi-xml.xsd
+share/apps/akonadi/firstrun/defaultaddressbook
+share/apps/akonadi/firstrun/defaultcalendar
+share/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
+share/apps/akonadi_knut_resource/knut-template.xml
+share/apps/akonadiconsole/akonadiconsoleui.rc
+share/config/kres-migratorrc
+share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
+share/kde4/services/akonadi.protocol
+share/kde4/services/kcm_akonadi.desktop
+share/kde4/services/kcm_akonadi_resources.desktop
+share/kde4/services/kcm_akonadi_server.desktop
+share/kde4/services/kresources/kabc/akonadi.desktop
+share/kde4/services/kresources/kcal/akonadi.desktop
+share/mime/packages/kdepim-mime.xml
+share/mime/application/x-vnd.kde.notes.xml
+@dirrm share/apps/akonadiconsole
+@dirrm share/apps/akonadi_knut_resource
+@dirrm share/apps/akonadi/plugins/serializer
+@dirrm share/apps/akonadi/plugins
+@dirrm share/apps/akonadi/firstrun
+@dirrm share/apps/akonadi
+@dirrm share/akonadi/agents
+@dirrm share/akonadi
+@dirrm include/akonadi/xml
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 2d107384d6b6..fe107376edaf 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -25,20 +24,18 @@ LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \
LATEST_LINK= ${PORTNAME}4
-USE_KDE4= kdelibs pimlibs kdebase akonadi kdeprefix kdehier automoc4
+USE_KDE4= kdelibs kdeexp pimlibs pimruntime runtime workspace akonadi kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
QT_COMPONENTS= corelib opengl dbus qt3support designer network svg qtestlib \
qmake_build moc_build rcc_build uic_build
USE_OPENLDAP= yes
-MAKE_JOBS_UNSAFE= yes
+MAKE_JOBS_SAFE= yes
#fix build when kdepim3 is here
CMAKE_ARGS+= -DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib"
-MAN1= kabcclient.1
-
OPTIONS= GNOKII "KAdressbook import/export for Nokia phones" off
# KITCHENSYNC "PIM synchronization utility" off
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 0fb10731eb2d..9d7624dc172e 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.2.4.tar.bz2) = e3b14bea173511628767475f0dbfb6ac
-SHA256 (KDE/kdepim-4.2.4.tar.bz2) = 4a9e07f5e6e409a0c20686c9905dc871f34bcb372de61a13478c7c0478f8b651
-SIZE (KDE/kdepim-4.2.4.tar.bz2) = 12132236
+MD5 (KDE/kdepim-4.3.0.tar.bz2) = ddc887f19ef9cd454f4f3226c955aaaf
+SHA256 (KDE/kdepim-4.3.0.tar.bz2) = a5cde787a207da52f065510f27f4980ee852e8b05cc5d72d3a102d967a99f6f8
+SIZE (KDE/kdepim-4.3.0.tar.bz2) = 11320808
diff --git a/deskutils/kdepim4/files/patch-kleopatra-main.cpp b/deskutils/kdepim4/files/patch-kleopatra-main.cpp
deleted file mode 100644
index 71c03cb69e39..000000000000
--- a/deskutils/kdepim4/files/patch-kleopatra-main.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../kleopatra/main.cpp.orig 2009-07-01 18:44:25.000000000 -0400
-+++ ../kleopatra/main.cpp 2009-07-01 18:49:26.000000000 -0400
-@@ -75,6 +75,8 @@
- #include <QEventLoop>
- #include <QThreadPool>
-
-+#include <gpgme++/global.h>
-+
- #include <boost/shared_ptr.hpp>
-
- #include <cassert>
-@@ -153,6 +155,8 @@
- QTime timer;
- timer.start();
-
-+ GpgME::initializeLibrary();
-+
- {
- const unsigned int threads = QThreadPool::globalInstance()->maxThreadCount();
- QThreadPool::globalInstance()->setMaxThreadCount( qMax( 2U, threads ) );
diff --git a/deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp b/deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp
deleted file mode 100644
index 729a1e523dcc..000000000000
--- a/deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../libkleo/backends/qgpgme/qgpgmebackend.cpp.orig 2009-07-01 18:51:09.000000000 -0400
-+++ ../libkleo/backends/qgpgme/qgpgmebackend.cpp 2009-07-01 18:57:10.000000000 -0400
-@@ -280,7 +280,7 @@
- mOpenPGPProtocol( 0 ),
- mSMIMEProtocol( 0 )
- {
--
-+ GpgME::initializeLibrary();
- }
-
- Kleo::QGpgMEBackend::~QGpgMEBackend() {
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 63989472e228..565c1bdf9383 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -1,22 +1,5 @@
-bin/akonadi_distlist_resource
-bin/akonadi_ical_resource
-bin/akonadi_imaplib_resource
-bin/akonadi_kabc_resource
-bin/akonadi_kcal_resource
-bin/akonadi_knut_resource
-bin/akonadi_localbookmarks_resource
-bin/akonadi_maildir_resource
-bin/akonadi_mailthreader_agent
-bin/akonadi_nepomuk_contact_feeder
-bin/akonadi_nepomuk_email_feeder
-bin/akonadi_nepomuktag_resource
-bin/akonadi_nntp_resource
-bin/akonadi_strigi_feeder
-bin/akonadi_vcard_resource
-bin/akonadi_vcarddir_resource
-bin/akonadiconsole
-bin/akonaditray
bin/akregator
+bin/akregatorstorageexporter
bin/egroupwarewizard
bin/groupwarewizard
bin/groupwisewizard
@@ -39,7 +22,6 @@ bin/kmail_sav.sh
bin/kmailcvt
bin/knode
bin/knotes
-bin/kode
bin/kolabwizard
bin/konsolekalendar
bin/kontact
@@ -47,17 +29,11 @@ bin/korgac
bin/korganizer
bin/kpilot
bin/kpilotDaemon
-bin/kres-migrator
bin/ksendemail
bin/ktimetracker
-bin/kung
bin/kwatchgnupg
-bin/kwsdl_compiler
-bin/kxforms
-bin/kxml_compiler
bin/scalixadmin
bin/scalixwizard
-bin/schematest
bin/sloxwizard
include/akregator/akregator_export.h
include/akregator/article.h
@@ -70,7 +46,6 @@ include/akregator/storagefactory.h
include/akregator/storagefactoryregistry.h
include/akregator/types.h
include/kaddressbook/kaddressbook_export.h
-include/kdepimprotocols.h
include/kleo/adduseridjob.h
include/kleo/changeexpiryjob.h
include/kleo/changeownertrustjob.h
@@ -145,32 +120,20 @@ include/kpilot/pilotSerialDatabase.h
include/kpilot/plugin.h
include/kpilot/pluginfactory.h
include/kpilot/syncAction.h
-include/ksieve/error.h
-include/ksieve/lexer.h
include/ksieve/libksieve_export.h
-include/ksieve/parser.h
-include/ksieve/scriptbuilder.h
include/libkleopatraclient/core/command.h
include/libkleopatraclient/core/initialization.h
include/libkleopatraclient/core/selectcertificatecommand.h
include/libkleopatraclient/core/signencryptfilescommand.h
include/libkleopatraclient/gui/certificaterequester.h
include/libkleopatraclient/kleopatraclient_export.h
-lib/kde4/akonadi_serializer_addressee.so
-lib/kde4/akonadi_serializer_bookmark.so
-lib/kde4/akonadi_serializer_contactgroup.so
-lib/kde4/akonadi_serializer_kcal.so
-lib/kde4/akonadi_serializer_mail.so
lib/kde4/akregator_config_advanced.so
lib/kde4/akregator_config_appearance.so
lib/kde4/akregator_config_archive.so
lib/kde4/akregator_config_browser.so
lib/kde4/akregator_config_general.so
-lib/kde4/akregator_config_onlinesync.so
lib/kde4/akregator_mk4storage_plugin.so
-lib/kde4/akregator_onlinesync_plugin.so
lib/kde4/akregatorpart.so
-lib/kde4/kabc_akonadi.so
lib/kde4/kabc_groupdav.so
lib/kde4/kabc_groupwise.so
lib/kde4/kabc_kolab.so
@@ -197,37 +160,33 @@ lib/kde4/kaddressbookpart.so
lib/kde4/kalarm_local.so
lib/kde4/kalarm_localdir.so
lib/kde4/kalarm_remote.so
-lib/kde4/kcal_akonadi.so
lib/kde4/kcal_blog.so
lib/kde4/kcal_groupdav.so
lib/kde4/kcal_groupwise.so
lib/kde4/kcal_kabc.so
lib/kde4/kcal_kolab.so
lib/kde4/kcal_remote.so
-lib/kde4/kcal_resourcefeatureplan_plugin.so
lib/kde4/kcal_scalix.so
lib/kde4/kcal_slox.so
lib/kde4/kcal_xmlrpc.so
-lib/kde4/kcm_akonadi.so
-lib/kde4/kcm_akonadi_resources.so
-lib/kde4/kcm_akonadi_server.so
lib/kde4/kcm_apptsummary.so
lib/kde4/kcm_kabconfig.so
lib/kde4/kcm_kabcustomfields.so
lib/kde4/kcm_kabldapconfig.so
+lib/kde4/kcm_kjots.so
lib/kde4/kcm_kleopatra.so
lib/kde4/kcm_kmail.so
lib/kde4/kcm_kmailsummary.so
lib/kde4/kcm_knode.so
+lib/kde4/kcm_knote.so
lib/kde4/kcm_kontact.so
lib/kde4/kcm_kontactsummary.so
lib/kde4/kcm_korganizer.so
lib/kde4/kcm_kpilot.so
-lib/kde4/kcm_ktimetrackerconfig.so
+lib/kde4/kcm_ktimetracker.so
lib/kde4/kcm_planner.so
lib/kde4/kcm_sdsummary.so
lib/kde4/kcm_todosummary.so
-lib/kde4/kio_akonadi.so
lib/kde4/kio_groupwise.so
lib/kde4/kio_scalix.so
lib/kde4/kjotspart.so
@@ -271,12 +230,6 @@ lib/kde4/ktexteditorkabcbridge.so
lib/kde4/ktimetrackerpart.so
lib/kde4/ldifvcardthumbnail.so
lib/kde4/plugins/designer/kdepimwidgets.so
-lib/libakonadi-kabccommon.so
-lib/libakonadi-kabccommon.so.5
-lib/libakonadi-kabccommon.so.5.0.1
-lib/libakonadi-kcal.so
-lib/libakonadi-kcal.so.5
-lib/libakonadi-kcal.so.5.0.1
lib/libakregatorinterfaces.so
lib/libakregatorinterfaces.so.5
lib/libakregatorinterfaces.so.5.0.1
@@ -285,9 +238,6 @@ lib/libakregatorprivate.so.5.0.1
lib/libgwsoap.so
lib/libgwsoap.so.5
lib/libgwsoap.so.5.0.1
-lib/libimap.so
-lib/libimap.so.5
-lib/libimap.so.5.0.1
lib/libkabc_groupdav.so
lib/libkabc_groupdav.so.5
lib/libkabc_groupdav.so.5.0.1
@@ -323,9 +273,6 @@ lib/libkcal_groupdav.so.5.0.1
lib/libkcal_resourceblog.so
lib/libkcal_resourceblog.so.5
lib/libkcal_resourceblog.so.5.0.1
-lib/libkcal_resourcefeatureplan.so
-lib/libkcal_resourcefeatureplan.so.5
-lib/libkcal_resourcefeatureplan.so.5.0.1
lib/libkcal_resourceremote.so
lib/libkcal_resourceremote.so.5
lib/libkcal_resourceremote.so.5.0.1
@@ -353,9 +300,6 @@ lib/libkgroupwarebase.so.5.0.1
lib/libkgroupwaredav.so
lib/libkgroupwaredav.so.5
lib/libkgroupwaredav.so.5.0.1
-lib/libkholidays.so
-lib/libkholidays.so.5
-lib/libkholidays.so.5.0.1
lib/libkleo.so
lib/libkleo.so.5
lib/libkleo.so.5.0.1
@@ -379,12 +323,6 @@ lib/libknoteskolab.so.5.0.1
lib/libknotesscalix.so
lib/libknotesscalix.so.5
lib/libknotesscalix.so.5.0.1
-lib/libkocorehelper.so
-lib/libkocorehelper.so.5
-lib/libkocorehelper.so.5.0.1
-lib/libkode.so
-lib/libkode.so.5
-lib/libkode.so.5.0.1
lib/libkontactinterfaces.so
lib/libkontactinterfaces.so.5
lib/libkontactinterfaces.so.5.0.1
@@ -396,6 +334,9 @@ lib/libkorg_stdprinting.so.5.0.1
lib/libkorganizer_calendar.so
lib/libkorganizer_calendar.so.5
lib/libkorganizer_calendar.so.5.0.1
+lib/libkorganizer_core.so
+lib/libkorganizer_core.so.5
+lib/libkorganizer_core.so.5.0.1
lib/libkorganizer_eventviewer.so
lib/libkorganizer_eventviewer.so.5
lib/libkorganizer_eventviewer.so.5.0.1
@@ -412,60 +353,21 @@ lib/libkpilot.so.5
lib/libkpilot.so.5.0.1
lib/libkpilot_akonadibase.so
lib/libkpilot_conduit_base.so
-lib/libkschema.so
-lib/libkschema.so.5
-lib/libkschema.so.5.0.1
-lib/libkschemawidgets.so
-lib/libkschemawidgets.so.5
-lib/libkschemawidgets.so.5.0.1
lib/libksieve.so
lib/libksieve.so.5
lib/libksieve.so.5.0.1
lib/libkslox.so
lib/libkslox.so.5
lib/libkslox.so.5.0.1
-lib/libkxmlcommon.so
-lib/libkxmlcommon.so.5
-lib/libkxmlcommon.so.5.0.1
-lib/libmaildir.so
-lib/libmaildir.so.5
-lib/libmaildir.so.5.0.1
lib/libmimelib.so
lib/libmimelib.so.5
lib/libmimelib.so.5.0.1
-lib/libschema.so
-lib/libschema.so.5
-lib/libschema.so.5.0.1
-lib/libwscl.so
-lib/libwscl.so.5
-lib/libwscl.so.5.0.1
-lib/libwsdl.so
-lib/libwsdl.so.5
-lib/libwsdl.so.5.0.1
lib/strigi/strigiea_ics.so
lib/strigi/strigiea_vcf.so
-share/akonadi/agents/distlistresource.desktop
-share/akonadi/agents/icalresource.desktop
-share/akonadi/agents/imaplibresource.desktop
-share/akonadi/agents/kabcresource.desktop
-share/akonadi/agents/kcalresource.desktop
-share/akonadi/agents/knutresource.desktop
-share/akonadi/agents/localbookmarksresource.desktop
-share/akonadi/agents/maildirresource.desktop
-share/akonadi/agents/mailthreaderagent.desktop
-share/akonadi/agents/nepomukcontactfeeder.desktop
-share/akonadi/agents/nepomukemailfeeder.desktop
-share/akonadi/agents/nepomuktagresource.desktop
-share/akonadi/agents/nntpresource.desktop
-share/akonadi/agents/strigifeeder.desktop
-share/akonadi/agents/vcarddirresource.desktop
-share/akonadi/agents/vcardresource.desktop
share/applications/kde4/KMail.desktop
share/applications/kde4/KNode.desktop
share/applications/kde4/Kjots.desktop
share/applications/kde4/Kontact.desktop
-share/applications/kde4/akonadiconsole.desktop
-share/applications/kde4/akonaditray.desktop
share/applications/kde4/akregator.desktop
share/applications/kde4/groupwarewizard.desktop
share/applications/kde4/kaddressbook.desktop
@@ -479,13 +381,6 @@ share/applications/kde4/korganizer.desktop
share/applications/kde4/kpilot.desktop
share/applications/kde4/kpilotdaemon.desktop
share/applications/kde4/ktimetracker.desktop
-share/applications/kde4/kwsdl_compiler.desktop
-share/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
-share/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
-share/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
-share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
-share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
-share/apps/akonadiconsole/akonadiconsoleui.rc
share/apps/akregator/about/akregator.css
share/apps/akregator/about/main.html
share/apps/akregator/about/top-left-akregator.png
@@ -496,9 +391,6 @@ share/apps/akregator/articleviewer.rc
share/apps/akregator/pageviewer.rc
share/apps/akregator/pics/kmmsgnew.png
share/apps/akregator/pics/kmmsgunseen.png
-share/apps/akregator_onlinesync_plugin/akregator_onlinesync_plugin.rc
-share/apps/cmake/modules/FindKode.cmake
-share/apps/cmake/modules/KodeMacros.cmake
share/apps/kaddressbook/bookmark_xxportui.rc
share/apps/kaddressbook/csv-templates/kaddressbook.desktop
share/apps/kaddressbook/csv-templates/outlook2000.desktop
@@ -570,6 +462,8 @@ share/apps/kdepimwidgets/pics/ktimeedit.png
share/apps/kjots/kjotspartui.rc
share/apps/kjots/kjotsui.rc
share/apps/kleopatra/kleopatra.rc
+share/apps/kleopatra/pics/gpg4win-compact.png
+share/apps/kleopatra/pics/gpg4win.png
share/apps/kleopatra/pics/kleopatra_splashscreen.png
share/apps/kleopatra/pics/kleopatra_splashscreen.svgz
share/apps/kleopatra/pics/kleopatra_wizard.png
@@ -605,17 +499,13 @@ share/apps/kmail/pics/key_ok.png
share/apps/kmail/pics/key_unknown.png
share/apps/kmail/pics/kmwizard.png
share/apps/kmail/pics/mail-deleted.png
+share/apps/kmail/pics/mail-download-later.png
+share/apps/kmail/pics/mail-download-now.png
share/apps/kmail/pics/mail-encrypted-full.png
share/apps/kmail/pics/mail-encrypted-part.png
share/apps/kmail/pics/mail-encrypted.png
-share/apps/kmail/pics/mail-horizontal-space.png
share/apps/kmail/pics/mail-thread-ignored.png
share/apps/kmail/pics/mail-thread-watch.png
-share/apps/kmail/pics/mail-vertical-separator-line.png
-share/apps/kmail/pics/overlay-busy-clock-1.png
-share/apps/kmail/pics/overlay-busy-clock-2.png
-share/apps/kmail/pics/overlay-busy-clock-3.png
-share/apps/kmail/pics/overlay-busy-clock-4.png
share/apps/kmail/pics/pgp-keys.png
share/apps/kmail/pics/quotecollapse.png
share/apps/kmail/pics/quoteexpand.png
@@ -671,6 +561,11 @@ share/apps/knotes/icons/oxygen/16x16/actions/knotes_delete.png
share/apps/knotes/knotes_part.rc
share/apps/knotes/knotesappui.rc
share/apps/knotes/knotesui.rc
+share/apps/konsolekalendar/pics/hi128-apps-konsolekalendar.png
+share/apps/konsolekalendar/pics/hi16-apps-konsolekalendar.png
+share/apps/konsolekalendar/pics/hi22-apps-konsolekalendar.png
+share/apps/konsolekalendar/pics/hi32-apps-konsolekalendar.png
+share/apps/konsolekalendar/pics/hi48-apps-konsolekalendar.png
share/apps/kontact/about/kontact.css
share/apps/kontact/about/main.html
share/apps/kontact/about/top-left-kontact.png
@@ -687,7 +582,7 @@ share/apps/kontact/ksettingsdialog/planner.setdlg
share/apps/kontact/ksettingsdialog/specialdates.setdlg
share/apps/kontact/ksettingsdialog/summary.setdlg
share/apps/kontactsummary/kontactsummary_part.rc
-share/apps/korgac/icons/oxygen/22x22/actions/korgac.png
+share/apps/korgac/icons/hicolor/22x22/actions/korgac.png
share/apps/korganizer/korganizer_part.rc
share/apps/korganizer/korganizerui.rc
share/apps/korganizer/sounds/alert.wav
@@ -730,7 +625,6 @@ share/apps/ktimetracker/pics/watch-7.xpm
share/apps/kwatchgnupg/kwatchgnupgui.rc
share/apps/kwatchgnupg/pics/kwatchgnupg.png
share/apps/kwatchgnupg/pics/kwatchgnupg2.png
-share/apps/kxforms/kxformsui.rc
share/apps/libkdepim/about/bar-bottom-left.png
share/apps/libkdepim/about/bar-bottom-middle.png
share/apps/libkdepim/about/bar-bottom-right.png
@@ -754,67 +648,17 @@ share/apps/libkdepim/about/kde_infopage.css
share/apps/libkdepim/about/kde_infopage_rtl.css
share/apps/libkdepim/about/top-left.png
share/apps/libkdepim/about/top-middle.png
-share/apps/libkholidays/holiday_BelgiumDutch
-share/apps/libkholidays/holiday_BelgiumFrench
-share/apps/libkholidays/holiday_BelgiumWalloon
-share/apps/libkholidays/holiday_Suedtirol
-share/apps/libkholidays/holiday_ar
-share/apps/libkholidays/holiday_at
-share/apps/libkholidays/holiday_au
-share/apps/libkholidays/holiday_bavarian
-share/apps/libkholidays/holiday_br
-share/apps/libkholidays/holiday_bg
-share/apps/libkholidays/holiday_ca
-share/apps/libkholidays/holiday_catalan
-share/apps/libkholidays/holiday_ch
-share/apps/libkholidays/holiday_cl
-share/apps/libkholidays/holiday_co
-share/apps/libkholidays/holiday_cz
-share/apps/libkholidays/holiday_de
-share/apps/libkholidays/holiday_dk
-share/apps/libkholidays/holiday_ee
-share/apps/libkholidays/holiday_es
-share/apps/libkholidays/holiday_fi
-share/apps/libkholidays/holiday_fr
-share/apps/libkholidays/holiday_frswiss
-share/apps/libkholidays/holiday_gb
-share/apps/libkholidays/holiday_gr
-share/apps/libkholidays/holiday_gt
-share/apps/libkholidays/holiday_hu
-share/apps/libkholidays/holiday_ie
-share/apps/libkholidays/holiday_il
-share/apps/libkholidays/holiday_is
-share/apps/libkholidays/holiday_it
-share/apps/libkholidays/holiday_jm
-share/apps/libkholidays/holiday_jp
-share/apps/libkholidays/holiday_lt
-share/apps/libkholidays/holiday_mx
-share/apps/libkholidays/holiday_nl
-share/apps/libkholidays/holiday_no
-share/apps/libkholidays/holiday_nz
-share/apps/libkholidays/holiday_pl
-share/apps/libkholidays/holiday_pt
-share/apps/libkholidays/holiday_py
-share/apps/libkholidays/holiday_quebec
-share/apps/libkholidays/holiday_ro
-share/apps/libkholidays/holiday_ru
-share/apps/libkholidays/holiday_se
-share/apps/libkholidays/holiday_si
-share/apps/libkholidays/holiday_sk
-share/apps/libkholidays/holiday_th
-share/apps/libkholidays/holiday_ua
-share/apps/libkholidays/holiday_us
-share/apps/libkholidays/holiday_uy
-share/apps/libkholidays/holiday_za
share/apps/libkleopatra/pics/chiasmus_chi.png
+share/apps/libkleopatra/pics/hi16-app-gpg.png
+share/apps/libkleopatra/pics/hi16-app-gpgsm.png
+share/apps/libkleopatra/pics/hi22-app-gpg.png
+share/apps/libkleopatra/pics/hi22-app-gpgsm.png
+share/apps/libkleopatra/pics/hi32-app-gpg.png
+share/apps/libkleopatra/pics/hi32-app-gpgsm.png
share/apps/libkleopatra/pics/key.png
share/apps/libkleopatra/pics/key_bad.png
share/apps/libkleopatra/pics/key_ok.png
share/apps/libkleopatra/pics/key_unknown.png
-share/apps/nepomuk/ontologies/nco.desktop
-share/apps/nepomuk/ontologies/nco.trig
-share/apps/nepomuk/ontologies/nmo.desktop
-share/apps/nepomuk/ontologies/nmo.trig
share/autostart/kabcdistlistupdater.desktop
share/autostart/kalarm.autostart.desktop
share/autostart/korgac.desktop
@@ -835,7 +679,6 @@ share/config.kcfg/kontact.kcfg
share/config.kcfg/korganizer.kcfg
share/config.kcfg/kpilot.kcfg
share/config.kcfg/kpilotlib.kcfg
-share/config.kcfg/kxforms.kcfg
share/config.kcfg/memofileconduit.kcfg
share/config.kcfg/replyphrases.kcfg
share/config.kcfg/scalix.kcfg
@@ -846,7 +689,6 @@ share/config.kcfg/todosettings.kcfg
share/config/kmail.antispamrc
share/config/kmail.antivirusrc
share/config/korganizer.knsrc
-share/config/kres-migratorrc
share/config/libkleopatrarc
share/dbus-1/interfaces/org.kde.KAddressbook.Core.xml
share/dbus-1/interfaces/org.kde.KNotes.xml
@@ -884,10 +726,6 @@ share/doc/HTML/en/akregator/main-window4.png
share/doc/HTML/en/akregator/quick-filter.png
share/doc/HTML/en/akregator/rss.png
share/doc/HTML/en/akregator/rss3.png
-share/doc/HTML/en/kabcclient/common
-share/doc/HTML/en/kabcclient/index.cache.bz2
-share/doc/HTML/en/kabcclient/index.docbook
-share/doc/HTML/en/kabcclient/man-kabcclient.1.docbook
share/doc/HTML/en/kaddressbook/addhost.png
share/doc/HTML/en/kaddressbook/common
share/doc/HTML/en/kaddressbook/conf.png
@@ -910,9 +748,6 @@ share/doc/HTML/en/kalarm/index.cache.bz2
share/doc/HTML/en/kalarm/index.docbook
share/doc/HTML/en/kalarm/mainwindow.png
share/doc/HTML/en/kalarm/spinbox.png
-share/doc/HTML/en/kioslave/news/common
-share/doc/HTML/en/kioslave/news/index.cache.bz2
-share/doc/HTML/en/kioslave/news/index.docbook
share/doc/HTML/en/kjots/common
share/doc/HTML/en/kjots/index.cache.bz2
share/doc/HTML/en/kjots/index.docbook
@@ -976,9 +811,6 @@ share/doc/HTML/en/knode/using-subscribing.docbook
share/doc/HTML/en/knotes/common
share/doc/HTML/en/knotes/index.cache.bz2
share/doc/HTML/en/knotes/index.docbook
-share/doc/HTML/en/konsolekalendar/common
-share/doc/HTML/en/konsolekalendar/index.cache.bz2
-share/doc/HTML/en/konsolekalendar/index.docbook
share/doc/HTML/en/kontact/calendar-sidebar-icon.png
share/doc/HTML/en/kontact/common
share/doc/HTML/en/kontact/configuration-components.png
@@ -1065,6 +897,7 @@ share/doc/HTML/en/kpilot/conduit-memofile.png
share/doc/HTML/en/kpilot/conduit-todo.png
share/doc/HTML/en/kpilot/conduit-vcal.png
share/doc/HTML/en/kpilot/configuration.docbook
+share/doc/HTML/en/kpilot/daemon-menu-configure.png
share/doc/HTML/en/kpilot/daemon-menu.png
share/doc/HTML/en/kpilot/faq.docbook
share/doc/HTML/en/kpilot/file-app.png
@@ -1082,6 +915,9 @@ share/doc/HTML/en/kpilot/setup-startup-exit.png
share/doc/HTML/en/kpilot/setup-tabs.png
share/doc/HTML/en/kpilot/sidebar.png
share/doc/HTML/en/kpilot/sync.docbook
+share/doc/HTML/en/kpilot/todo-app.png
+share/doc/HTML/en/kpilot/toolbar_backup.png
+share/doc/HTML/en/kpilot/toolbar_hotsync.png
share/doc/HTML/en/kpilot/usage.docbook
share/doc/HTML/en/ktimetracker/clipboard-history.png
share/doc/HTML/en/ktimetracker/common
@@ -1123,7 +959,7 @@ share/icons/hicolor/16x16/apps/knotes.png
share/icons/hicolor/16x16/apps/kontact.png
share/icons/hicolor/16x16/apps/korganizer.png
share/icons/hicolor/16x16/apps/kpilot.png
-share/icons/hicolor/16x16/apps/kpilotDaemon.png
+share/icons/hicolor/16x16/apps/kpilotdaemon.png
share/icons/hicolor/16x16/apps/ktimetracker.png
share/icons/hicolor/22x22/actions/kpilot_backup.png
share/icons/hicolor/22x22/actions/kpilot_busysync.png
@@ -1141,7 +977,7 @@ share/icons/hicolor/22x22/apps/knotes.png
share/icons/hicolor/22x22/apps/kontact.png
share/icons/hicolor/22x22/apps/korganizer.png
share/icons/hicolor/22x22/apps/kpilot.png
-share/icons/hicolor/22x22/apps/kpilotDaemon.png
+share/icons/hicolor/22x22/apps/kpilotdaemon.png
share/icons/hicolor/22x22/apps/ktimetracker.png
share/icons/hicolor/32x32/actions/kpilot_fullsync.png
share/icons/hicolor/32x32/actions/kpilot_hhtopc.png
@@ -1158,7 +994,7 @@ share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/kontact.png
share/icons/hicolor/32x32/apps/korganizer.png
share/icons/hicolor/32x32/apps/kpilot.png
-share/icons/hicolor/32x32/apps/kpilotDaemon.png
+share/icons/hicolor/32x32/apps/kpilotdaemon.png
share/icons/hicolor/32x32/apps/ktimetracker.png
share/icons/hicolor/48x48/actions/kpilot_fullsync.png
share/icons/hicolor/48x48/actions/kpilot_hhtopc.png
@@ -1175,7 +1011,7 @@ share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/kontact.png
share/icons/hicolor/48x48/apps/korganizer.png
share/icons/hicolor/48x48/apps/kpilot.png
-share/icons/hicolor/48x48/apps/kpilotDaemon.png
+share/icons/hicolor/48x48/apps/kpilotdaemon.png
share/icons/hicolor/48x48/apps/ktimetracker.png
share/icons/hicolor/64x64/actions/kpilot_address.png
share/icons/hicolor/64x64/actions/kpilot_bhotsync.png
@@ -1210,23 +1046,15 @@ share/icons/oxygen/16x16/actions/mail-reply-custom.png
share/icons/oxygen/16x16/actions/mail-signed-fully.png
share/icons/oxygen/16x16/actions/mail-signed-part.png
share/icons/oxygen/16x16/actions/mail-signed.png
-share/icons/oxygen/16x16/actions/meeting-attending-tentative.png
-share/icons/oxygen/16x16/actions/meeting-attending.png
share/icons/oxygen/16x16/actions/smallclock.png
share/icons/oxygen/16x16/actions/upindicator.png
share/icons/oxygen/16x16/apps/kalarm.png
share/icons/oxygen/16x16/apps/kleopatra.png
share/icons/oxygen/16x16/apps/kmailcvt.png
share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/16x16/status/appointment-recurring.png
-share/icons/oxygen/16x16/status/appointment-reminder.png
share/icons/oxygen/16x16/status/mail-sent.png
share/icons/oxygen/16x16/status/mail-tagged.png
share/icons/oxygen/16x16/status/mail-task.png
-share/icons/oxygen/16x16/status/meeting-organizer.png
-share/icons/oxygen/16x16/status/task-complete.png
-share/icons/oxygen/16x16/status/task-recurring.png
-share/icons/oxygen/16x16/status/task-reminder.png
share/icons/oxygen/22x22/actions/button_fewer.png
share/icons/oxygen/22x22/actions/button_more.png
share/icons/oxygen/22x22/actions/checkmark.png
@@ -1234,37 +1062,19 @@ share/icons/oxygen/22x22/actions/document-new-from-template.png
share/icons/oxygen/22x22/actions/edit-delete-page.png
share/icons/oxygen/22x22/actions/kalarm.png
share/icons/oxygen/22x22/actions/mail-reply-custom.png
-share/icons/oxygen/22x22/actions/meeting-attending-tentative.png
-share/icons/oxygen/22x22/actions/meeting-attending.png
share/icons/oxygen/22x22/actions/new-command-alarm.png
share/icons/oxygen/22x22/apps/kalarm.png
share/icons/oxygen/22x22/apps/kleopatra.png
share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/22x22/status/appointment-recurring.png
-share/icons/oxygen/22x22/status/appointment-reminder.png
share/icons/oxygen/22x22/status/mail-tagged.png
share/icons/oxygen/22x22/status/mail-task.png
-share/icons/oxygen/22x22/status/meeting-organizer.png
-share/icons/oxygen/22x22/status/task-complete.png
-share/icons/oxygen/22x22/status/task-recurring.png
-share/icons/oxygen/22x22/status/task-reminder.png
share/icons/oxygen/32x32/actions/edit-delete-page.png
-share/icons/oxygen/32x32/actions/journal-new.png
share/icons/oxygen/32x32/actions/mail-reply-custom.png
-share/icons/oxygen/32x32/actions/meeting-attending-tentative.png
-share/icons/oxygen/32x32/actions/meeting-attending.png
-share/icons/oxygen/32x32/actions/task-new.png
share/icons/oxygen/32x32/apps/kalarm.png
share/icons/oxygen/32x32/apps/kleopatra.png
share/icons/oxygen/32x32/apps/kmailcvt.png
share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/32x32/status/appointment-recurring.png
-share/icons/oxygen/32x32/status/appointment-reminder.png
share/icons/oxygen/32x32/status/mail-tagged.png
-share/icons/oxygen/32x32/status/meeting-organizer.png
-share/icons/oxygen/32x32/status/task-complete.png
-share/icons/oxygen/32x32/status/task-recurring.png
-share/icons/oxygen/32x32/status/task-reminder.png
share/icons/oxygen/48x48/actions/edit-delete-page.png
share/icons/oxygen/48x48/actions/mail-reply-custom.png
share/icons/oxygen/48x48/apps/kalarm.png
@@ -1286,15 +1096,12 @@ share/icons/oxygen/scalable/apps/kleopatra.svgz
share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
share/icons/oxygen/scalable/status/mail-tagged.svgz
share/icons/oxygen/scalable/status/mail-task.svgz
-share/kde4/services/akonadi.protocol
share/kde4/services/akregator_config_advanced.desktop
share/kde4/services/akregator_config_appearance.desktop
share/kde4/services/akregator_config_archive.desktop
share/kde4/services/akregator_config_browser.desktop
share/kde4/services/akregator_config_general.desktop
-share/kde4/services/akregator_config_onlinesync.desktop
share/kde4/services/akregator_mk4storage_plugin.desktop
-share/kde4/services/akregator_onlinesync_plugin.desktop
share/kde4/services/akregator_part.desktop
share/kde4/services/feed.protocol
share/kde4/services/groupwise.protocol
@@ -1330,19 +1137,18 @@ share/kde4/services/kaddressbook/tableview.desktop
share/kde4/services/kaddressbook/vcard_xxport.desktop
share/kde4/services/kaddressbook/yahooprotocol.desktop
share/kde4/services/kaddressbookpart.desktop
-share/kde4/services/kcm_akonadi.desktop
-share/kde4/services/kcm_akonadi_resources.desktop
-share/kde4/services/kcm_akonadi_server.desktop
share/kde4/services/kcmapptsummary.desktop
share/kde4/services/kcmkmailsummary.desktop
share/kde4/services/kcmkontactsummary.desktop
share/kde4/services/kcmplanner.desktop
share/kde4/services/kcmsdsummary.desktop
share/kde4/services/kcmtodosummary.desktop
+share/kde4/services/kjots_config_misc.desktop
share/kde4/services/kjotspart.desktop
share/kde4/services/kleopatra_config_appear.desktop
share/kde4/services/kleopatra_config_dirserv.desktop
share/kde4/services/kleopatra_config_dnorder.desktop
+share/kde4/services/kleopatra_config_gnupgsystem.desktop
share/kde4/services/kleopatra_config_smimevalidation.desktop
share/kde4/services/kleopatra_decryptverifyfiles.desktop
share/kde4/services/kleopatra_decryptverifyfolders.desktop
@@ -1362,6 +1168,11 @@ share/kde4/services/knode_config_identity.desktop
share/kde4/services/knode_config_post_news.desktop
share/kde4/services/knode_config_privacy.desktop
share/kde4/services/knode_config_read_news.desktop
+share/kde4/services/knote_config_action.desktop
+share/kde4/services/knote_config_display.desktop
+share/kde4/services/knote_config_editor.desktop
+share/kde4/services/knote_config_network.desktop
+share/kde4/services/knote_config_style.desktop
share/kde4/services/kontact/akregatorplugin.desktop
share/kde4/services/kontact/journalplugin.desktop
share/kde4/services/kontact/kaddressbookplugin.desktop
@@ -1390,6 +1201,7 @@ share/kde4/services/korganizer_configmain.desktop
share/kde4/services/korganizer_configplugins.desktop
share/kde4/services/korganizer_configtime.desktop
share/kde4/services/korganizer_configviews.desktop
+share/kde4/services/korganizer_part.desktop
share/kde4/services/kpilot-conduit-calendar.desktop
share/kde4/services/kpilot-conduit-contacts.desktop
share/kde4/services/kpilot-conduit-todo.desktop
@@ -1397,7 +1209,6 @@ share/kde4/services/kpilot_config.desktop
share/kde4/services/kresources/alarms/local.desktop
share/kde4/services/kresources/alarms/localdir.desktop
share/kde4/services/kresources/alarms/remote.desktop
-share/kde4/services/kresources/kabc/akonadi.desktop
share/kde4/services/kresources/kabc/kabc_groupdav.desktop
share/kde4/services/kresources/kabc/kabc_groupwise.desktop
share/kde4/services/kresources/kabc/kabc_opengroupware.desktop
@@ -1407,14 +1218,12 @@ share/kde4/services/kresources/kabc/kabc_xmlrpc.desktop
share/kde4/services/kresources/kabc/kolab.desktop
share/kde4/services/kresources/kabc/scalix.desktop
share/kde4/services/kresources/kalarm_manager.desktop
-share/kde4/services/kresources/kcal/akonadi.desktop
share/kde4/services/kresources/kcal/blog.desktop
share/kde4/services/kresources/kcal/kabc.desktop
share/kde4/services/kresources/kcal/kcal_groupdav.desktop
share/kde4/services/kresources/kcal/kcal_groupwise.desktop
share/kde4/services/kresources/kcal/kcal_opengroupware.desktop
share/kde4/services/kresources/kcal/kcal_ox.desktop
-share/kde4/services/kresources/kcal/kcal_resourcefeatureplan.desktop
share/kde4/services/kresources/kcal/kcal_slox.desktop
share/kde4/services/kresources/kcal/kcal_xmlrpc.desktop
share/kde4/services/kresources/kcal/kolab.desktop
@@ -1425,7 +1234,9 @@ share/kde4/services/kresources/knotes/kolabresource.desktop
share/kde4/services/kresources/knotes/local.desktop
share/kde4/services/kresources/knotes/scalix.desktop
share/kde4/services/kresources/knotes_manager.desktop
-share/kde4/services/ktimetrackerconfig.desktop
+share/kde4/services/ktimetracker_config_behavior.desktop
+share/kde4/services/ktimetracker_config_display.desktop
+share/kde4/services/ktimetracker_config_storage.desktop
share/kde4/services/ktimetrackerpart.desktop
share/kde4/services/ldifvcardthumbnail.desktop
share/kde4/services/memofile-conduit.desktop
@@ -1458,23 +1269,18 @@ share/kde4/servicetypes/kpilotconduit.desktop
@dirrm share/doc/HTML/en/kpilot
@dirrm share/doc/HTML/en/korganizer
@dirrm share/doc/HTML/en/kontact
-@dirrm share/doc/HTML/en/konsolekalendar
@dirrm share/doc/HTML/en/knotes
@dirrm share/doc/HTML/en/knode
@dirrm share/doc/HTML/en/kmail
@dirrm share/doc/HTML/en/kleopatra
@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/kioslave/news
@dirrm share/doc/HTML/en/kalarm
@dirrm share/doc/HTML/en/kaddressbook
-@dirrm share/doc/HTML/en/kabcclient
@dirrm share/doc/HTML/en/akregator
@dirrm share/apps/libkleopatra/pics
@dirrm share/apps/libkleopatra
-@dirrm share/apps/libkholidays
@dirrm share/apps/libkdepim/about
@dirrm share/apps/libkdepim
-@dirrm share/apps/kxforms
@dirrm share/apps/kwatchgnupg/pics
@dirrm share/apps/kwatchgnupg
@dirrm share/apps/ktimetracker/pics
@@ -1498,15 +1304,17 @@ share/kde4/servicetypes/kpilotconduit.desktop
@dirrm share/apps/kpilot
@dirrm share/apps/korganizer/sounds
@dirrm share/apps/korganizer
-@dirrm share/apps/korgac/icons/oxygen/22x22/actions
-@dirrm share/apps/korgac/icons/oxygen/22x22
-@dirrm share/apps/korgac/icons/oxygen
+@dirrm share/apps/korgac/icons/hicolor/22x22/actions
+@dirrm share/apps/korgac/icons/hicolor/22x22
+@dirrm share/apps/korgac/icons/hicolor
@dirrm share/apps/korgac/icons
@dirrm share/apps/korgac
@dirrm share/apps/kontactsummary
@dirrm share/apps/kontact/ksettingsdialog
@dirrm share/apps/kontact/about
@dirrm share/apps/kontact
+@dirrm share/apps/konsolekalendar/pics
+@dirrm share/apps/konsolekalendar
@dirrm share/apps/knotes/icons/oxygen/16x16/actions
@dirrm share/apps/knotes/icons/oxygen/16x16
@dirrm share/apps/knotes/icons/oxygen
@@ -1536,16 +1344,9 @@ share/kde4/servicetypes/kpilotconduit.desktop
@dirrm share/apps/kaddressbook/icons
@dirrm share/apps/kaddressbook/csv-templates
@dirrm share/apps/kaddressbook
-@dirrm share/apps/akregator_onlinesync_plugin
@dirrmtry share/apps/akregator/pics
@dirrm share/apps/akregator/about
@dirrmtry share/apps/akregator
-@dirrm share/apps/akonadiconsole
-@dirrm share/apps/akonadi/plugins/serializer
-@dirrm share/apps/akonadi/plugins
-@dirrm share/apps/akonadi
-@dirrm share/akonadi/agents
-@dirrm share/akonadi
@dirrm include/libkleopatraclient/gui
@dirrm include/libkleopatraclient/core
@dirrm include/libkleopatraclient
diff --git a/deskutils/kdepim44-runtime/Makefile b/deskutils/kdepim44-runtime/Makefile
new file mode 100644
index 000000000000..830f2b1b0a3e
--- /dev/null
+++ b/deskutils/kdepim44-runtime/Makefile
@@ -0,0 +1,51 @@
+# New ports collection Makefile for: kdepimp4
+# Date created: 2008-31-05
+# Whom: miwi
+#
+# $FreeBSD$
+
+PORTNAME= kdepim-runtime
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= deskutils kde ipv6
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Libraries for KDE-PIM applications
+
+BUILD_DEPENDS= libassuan>=1.0.4:${PORTSDIR}/security/libassuan
+LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \
+ sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+ boost_python:${PORTSDIR}/devel/boost-python-libs \
+ qca.2:${PORTSDIR}/devel/qca
+
+LATEST_LINK= ${PORTNAME}4
+
+USE_KDE4= kdelibs kdeexp pimlibs runtime akonadi kdeprefix kdehier automoc4
+KDE4_BUILDENV= yes
+USE_BZIP2= yes
+USE_QT_VER= 4
+QT_COMPONENTS= corelib opengl dbus qt3support designer network svg qtestlib \
+ xml gui qmake_build moc_build rcc_build uic_build
+USE_OPENLDAP= yes
+MAKE_JOBS_SAFE= yes
+
+#fix build when kdepim3 is here
+CMAKE_ARGS+= -DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib"
+
+post-extract:
+ ${MKDIR} ${WRKSRC}
+
+post-patch:
+ ${GREP} -H -r "#include <q" ${WRKSRC}/.. | ${CUT} -d: -f1 | uniq | \
+ ${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
+
+pre-configure:
+ #respect prefix
+ ${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \
+ ${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g'
+ @${REINPLACE_CMD} -e 's|add_subdirectory( kolabproxy )||' \
+ ${WRKSRC}/../resources/CMakeLists.txt
+
+.include <bsd.port.mk>
diff --git a/deskutils/kdepim44-runtime/distinfo b/deskutils/kdepim44-runtime/distinfo
new file mode 100644
index 000000000000..3b8981a6befb
--- /dev/null
+++ b/deskutils/kdepim44-runtime/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdepim-runtime-4.3.0.tar.bz2) = 608b629bfc1a1976d6888079e5d839f1
+SHA256 (KDE/kdepim-runtime-4.3.0.tar.bz2) = 8e0e39afaae73bc53f83d57c015172b75852778e4e14fcc6b9ffd6e261115cf2
+SIZE (KDE/kdepim-runtime-4.3.0.tar.bz2) = 743273
diff --git a/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt b/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt
new file mode 100644
index 000000000000..deb1a277bab8
--- /dev/null
+++ b/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt
@@ -0,0 +1,33 @@
+--- ../xml/CMakeLists.txt.orig 2009-06-03 22:54:34.000000000 +1100
++++ ../xml/CMakeLists.txt 2009-07-05 22:39:32.000000000 +1100
+@@ -1,21 +1,24 @@
+ project (akonadixml)
+
+-if ( LIBXML2_FOUND )
+- add_definitions( -DHAVE_LIBXML2 )
+-endif ( LIBXML2_FOUND )
+-
+-add_subdirectory( tests )
+-
+ add_definitions( -DQT_NO_CAST_FROM_ASCII )
+ add_definitions( -DQT_NO_CAST_TO_ASCII )
+
+ include_directories(
++ ${QT_QTGUI_INCLUDE_DIR}
++ ${QT_QTCORE_INCLUDE_DIR}
++ ${QT_QTXML_INCLUDE_DIR}
+ ${AKONADI_INCLUDE_DIR}
+ ${KDE4_INCLUDES}
+ ${KDEPIMLIBS_INCLUDE_DIR}
+ ${LIBXML2_INCLUDE_DIR}
+ )
+
++if ( LIBXML2_FOUND )
++ add_definitions( -DHAVE_LIBXML2 )
++endif ( LIBXML2_FOUND )
++
++add_subdirectory( tests )
++
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+
+ set( akonadixml_SRCS
diff --git a/deskutils/kdepim44-runtime/files/qt3to4headers.txt b/deskutils/kdepim44-runtime/files/qt3to4headers.txt
new file mode 100644
index 000000000000..75f06c344ce0
--- /dev/null
+++ b/deskutils/kdepim44-runtime/files/qt3to4headers.txt
@@ -0,0 +1,46 @@
+s/<q3dragobject.h>/<Q3DragObject>/g
+s/<q3frame.h>/<Q3Frame>/g
+s/<q3groupbox.h>/<Q3GroupBox>/g
+s/<q3hgroupbox.h>/<Q3HGroupBox>/g
+s/<q3listview.h>/<Q3ListView>/g
+s/<q3popupmenu.h>/<Q3PopupMenu>/g
+s/<q3process.h>/<Q3Process>/g
+s/<q3progressdialog.h>/<Q3ProgressDialog>/g
+s/<q3strlist.h>/<Q3StrList>/g
+s/<q3textview.h>/<Q3TextView>/g
+s/<q3vbox.h>/<Q3VBox>/g
+s/<q3vgroupbox.h>/<Q3VGroupBox>/g
+s/<qapplication.h>/<QApplication>/g
+s/<qbuttongroup.h>/<QButtonGroup>/g
+s/<qcheckbox.h>/<QCheckBox>/g
+s/<qcolor.h>/<QColor>/g
+s/<qcombobox.h>/<QComboBox>/g
+s/<qcursor.h>/<QCursor>/g
+s/<qdesktopwidget.h>/<QDesktopWidget>/g
+s/<qdir.h>/<QDir>/g
+s/<qevent.h>/<QEvent>/g
+s/<qfile.h>/<QFile>/g
+s/<qfileinfo.h>/<QFileInfo>/g
+s/<qfont.h>/<QFont>/g
+s/<qfontmetrics.h>/<QFontMetrics>/g
+s/<qgroupbox.h>/<QGroupBox>/g
+s/<qimage.h>/<QImage>/g
+s/<qlabel.h>/<QLabel>/g
+s/<qlayout.h>/<QLayout>/g
+s/<qlineedit.h>/<QLineEdit>/g
+s/<qmatrix.h>/<QMatrix>/g
+s/<qobject.h>/<QObject>/g
+s/<qpainter.h>/<QPainter>/g
+s/<qpalette.h>/<QPalette>/g
+s/<qpixmap.h>/<QPixmap>/g
+s/<qpointer.h>/<QPointer>/g
+s/<qpushbutton.h>/<QPushButton>/g
+s/<qradiobutton.h>/<QRadioButton>/g
+s/<qregexp.h>/<QRegExp>/g
+s/<qspinbox.h>/<QSpinBox>/g
+s/<qstring.h>/<QString>/g
+s/<qtextcodec.h>/<QTextCodec>/g
+s/<qtextstream.h>/<QTextStream>/g
+s/<qtimer.h>/<QTimer>/g
+s/<qtooltip.h>/<QToolTip>/g
+s/<qwidget.h>/<QWidget>/g
diff --git a/deskutils/kdepim44-runtime/pkg-descr b/deskutils/kdepim44-runtime/pkg-descr
new file mode 100644
index 000000000000..8485fc9d7142
--- /dev/null
+++ b/deskutils/kdepim44-runtime/pkg-descr
@@ -0,0 +1,8 @@
+KDE4 is the K Desktop Environment for Unix, Windows, and Mac OS X.
+
+These kde4 ports intend to provide early access to KDE4 for FreeBSD
+developers, porters and beta testers. Use at your own risk!
+
+This package provides PIM runtime libs for KDE4.
+
+WWW: http://www.kde.org/
diff --git a/deskutils/kdepim44-runtime/pkg-plist b/deskutils/kdepim44-runtime/pkg-plist
new file mode 100644
index 000000000000..9ae4d7500692
--- /dev/null
+++ b/deskutils/kdepim44-runtime/pkg-plist
@@ -0,0 +1,106 @@
+bin/akonadi2xml
+bin/akonadi_birthdays_resource
+bin/akonadi_distlist_resource
+bin/akonadi_ical_resource
+bin/akonadi_imap_resource
+bin/akonadi_kabc_resource
+bin/akonadi_kcal_resource
+bin/akonadi_knut_resource
+bin/akonadi_localbookmarks_resource
+bin/akonadi_maildir_resource
+bin/akonadi_microblog_resource
+bin/akonadi_nepomuk_contact_feeder
+bin/akonadi_nepomuk_email_feeder
+bin/akonadi_nepomuktag_resource
+bin/akonadi_nntp_resource
+bin/akonadi_strigi_feeder
+bin/akonadi_vcard_resource
+bin/akonadi_vcarddir_resource
+bin/akonadiconsole
+bin/akonaditray
+bin/kres-migrator
+include/akonadi/xml/akonadi-xml_export.h
+include/akonadi/xml/xmldocument.h
+include/akonadi/xml/xmlreader.h
+include/akonadi/xml/xmlwritejob.h
+include/akonadi/xml/xmlwriter.h
+lib/kde4/akonadi_serializer_addressee.so
+lib/kde4/akonadi_serializer_bookmark.so
+lib/kde4/akonadi_serializer_contactgroup.so
+lib/kde4/akonadi_serializer_kcal.so
+lib/kde4/akonadi_serializer_mail.so
+lib/kde4/akonadi_serializer_microblog.so
+lib/kde4/kabc_akonadi.so
+lib/kde4/kcal_akonadi.so
+lib/kde4/kcm_akonadi.so
+lib/kde4/kcm_akonadi_resources.so
+lib/kde4/kcm_akonadi_server.so
+lib/kde4/kio_akonadi.so
+lib/libakonadi-kabccommon.so
+lib/libakonadi-kabccommon.so.5
+lib/libakonadi-kabccommon.so.5.0.1
+lib/libakonadi-kcal.so
+lib/libakonadi-kcal.so.5
+lib/libakonadi-kcal.so.5.0.1
+lib/libakonadi-xml.so
+lib/libakonadi-xml.so.5
+lib/libakonadi-xml.so.5.0.1
+lib/libakonadi_next.so
+lib/libakonadi_next.so.5
+lib/libakonadi_next.so.5.0.1
+lib/libkdepim-copy.so
+lib/libkdepim-copy.so.5
+lib/libkdepim-copy.so.5.0.1
+lib/libmaildir.so
+lib/libmaildir.so.5
+lib/libmaildir.so.5.0.1
+share/akonadi/agents/birthdaysresource.desktop
+share/akonadi/agents/distlistresource.desktop
+share/akonadi/agents/icalresource.desktop
+share/akonadi/agents/imapresource.desktop
+share/akonadi/agents/kabcresource.desktop
+share/akonadi/agents/kcalresource.desktop
+share/akonadi/agents/knutresource.desktop
+share/akonadi/agents/localbookmarksresource.desktop
+share/akonadi/agents/maildirresource.desktop
+share/akonadi/agents/microblog.desktop
+share/akonadi/agents/nepomukcontactfeeder.desktop
+share/akonadi/agents/nepomukemailfeeder.desktop
+share/akonadi/agents/nepomuktagresource.desktop
+share/akonadi/agents/nntpresource.desktop
+share/akonadi/agents/notesresource.desktop
+share/akonadi/agents/strigifeeder.desktop
+share/akonadi/agents/vcarddirresource.desktop
+share/akonadi/agents/vcardresource.desktop
+share/applications/kde4/akonadiconsole.desktop
+share/applications/kde4/akonaditray.desktop
+share/apps/akonadi/akonadi-xml.xsd
+share/apps/akonadi/firstrun/defaultaddressbook
+share/apps/akonadi/firstrun/defaultcalendar
+share/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
+share/apps/akonadi_knut_resource/knut-template.xml
+share/apps/akonadiconsole/akonadiconsoleui.rc
+share/config/kres-migratorrc
+share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
+share/kde4/services/akonadi.protocol
+share/kde4/services/kcm_akonadi.desktop
+share/kde4/services/kcm_akonadi_resources.desktop
+share/kde4/services/kcm_akonadi_server.desktop
+share/kde4/services/kresources/kabc/akonadi.desktop
+share/kde4/services/kresources/kcal/akonadi.desktop
+share/mime/packages/kdepim-mime.xml
+share/mime/application/x-vnd.kde.notes.xml
+@dirrm share/apps/akonadiconsole
+@dirrm share/apps/akonadi_knut_resource
+@dirrm share/apps/akonadi/plugins/serializer
+@dirrm share/apps/akonadi/plugins
+@dirrm share/apps/akonadi/firstrun
+@dirrm share/apps/akonadi
+@dirrm share/akonadi/agents
+@dirrm share/akonadi
+@dirrm include/akonadi/xml
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 2d107384d6b6..fe107376edaf 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -25,20 +24,18 @@ LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \
LATEST_LINK= ${PORTNAME}4
-USE_KDE4= kdelibs pimlibs kdebase akonadi kdeprefix kdehier automoc4
+USE_KDE4= kdelibs kdeexp pimlibs pimruntime runtime workspace akonadi kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
QT_COMPONENTS= corelib opengl dbus qt3support designer network svg qtestlib \
qmake_build moc_build rcc_build uic_build
USE_OPENLDAP= yes
-MAKE_JOBS_UNSAFE= yes
+MAKE_JOBS_SAFE= yes
#fix build when kdepim3 is here
CMAKE_ARGS+= -DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib"
-MAN1= kabcclient.1
-
OPTIONS= GNOKII "KAdressbook import/export for Nokia phones" off
# KITCHENSYNC "PIM synchronization utility" off
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 0fb10731eb2d..9d7624dc172e 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.2.4.tar.bz2) = e3b14bea173511628767475f0dbfb6ac
-SHA256 (KDE/kdepim-4.2.4.tar.bz2) = 4a9e07f5e6e409a0c20686c9905dc871f34bcb372de61a13478c7c0478f8b651
-SIZE (KDE/kdepim-4.2.4.tar.bz2) = 12132236
+MD5 (KDE/kdepim-4.3.0.tar.bz2) = ddc887f19ef9cd454f4f3226c955aaaf
+SHA256 (KDE/kdepim-4.3.0.tar.bz2) = a5cde787a207da52f065510f27f4980ee852e8b05cc5d72d3a102d967a99f6f8
+SIZE (KDE/kdepim-4.3.0.tar.bz2) = 11320808
diff --git a/deskutils/kdepim44/files/patch-kleopatra-main.cpp b/deskutils/kdepim44/files/patch-kleopatra-main.cpp
deleted file mode 100644
index 71c03cb69e39..000000000000
--- a/deskutils/kdepim44/files/patch-kleopatra-main.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../kleopatra/main.cpp.orig 2009-07-01 18:44:25.000000000 -0400
-+++ ../kleopatra/main.cpp 2009-07-01 18:49:26.000000000 -0400
-@@ -75,6 +75,8 @@
- #include <QEventLoop>
- #include <QThreadPool>
-
-+#include <gpgme++/global.h>
-+
- #include <boost/shared_ptr.hpp>
-
- #include <cassert>
-@@ -153,6 +155,8 @@
- QTime timer;
- timer.start();
-
-+ GpgME::initializeLibrary();
-+
- {
- const unsigned int threads = QThreadPool::globalInstance()->maxThreadCount();
- QThreadPool::globalInstance()->setMaxThreadCount( qMax( 2U, threads ) );
diff --git a/deskutils/kdepim44/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp b/deskutils/kdepim44/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp
deleted file mode 100644
index 729a1e523dcc..000000000000
--- a/deskutils/kdepim44/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../libkleo/backends/qgpgme/qgpgmebackend.cpp.orig 2009-07-01 18:51:09.000000000 -0400
-+++ ../libkleo/backends/qgpgme/qgpgmebackend.cpp 2009-07-01 18:57:10.000000000 -0400
-@@ -280,7 +280,7 @@
- mOpenPGPProtocol( 0 ),
- mSMIMEProtocol( 0 )
- {
--
-+ GpgME::initializeLibrary();
- }
-
- Kleo::QGpgMEBackend::~QGpgMEBackend() {
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index 63989472e228..565c1bdf9383 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -1,22 +1,5 @@
-bin/akonadi_distlist_resource
-bin/akonadi_ical_resource
-bin/akonadi_imaplib_resource
-bin/akonadi_kabc_resource
-bin/akonadi_kcal_resource
-bin/akonadi_knut_resource
-bin/akonadi_localbookmarks_resource
-bin/akonadi_maildir_resource
-bin/akonadi_mailthreader_agent
-bin/akonadi_nepomuk_contact_feeder
-bin/akonadi_nepomuk_email_feeder
-bin/akonadi_nepomuktag_resource
-bin/akonadi_nntp_resource
-bin/akonadi_strigi_feeder
-bin/akonadi_vcard_resource
-bin/akonadi_vcarddir_resource
-bin/akonadiconsole
-bin/akonaditray
bin/akregator
+bin/akregatorstorageexporter
bin/egroupwarewizard
bin/groupwarewizard
bin/groupwisewizard
@@ -39,7 +22,6 @@ bin/kmail_sav.sh
bin/kmailcvt
bin/knode
bin/knotes
-bin/kode
bin/kolabwizard
bin/konsolekalendar
bin/kontact
@@ -47,17 +29,11 @@ bin/korgac
bin/korganizer
bin/kpilot
bin/kpilotDaemon
-bin/kres-migrator
bin/ksendemail
bin/ktimetracker
-bin/kung
bin/kwatchgnupg
-bin/kwsdl_compiler
-bin/kxforms
-bin/kxml_compiler
bin/scalixadmin
bin/scalixwizard
-bin/schematest
bin/sloxwizard
include/akregator/akregator_export.h
include/akregator/article.h
@@ -70,7 +46,6 @@ include/akregator/storagefactory.h
include/akregator/storagefactoryregistry.h
include/akregator/types.h
include/kaddressbook/kaddressbook_export.h
-include/kdepimprotocols.h
include/kleo/adduseridjob.h
include/kleo/changeexpiryjob.h
include/kleo/changeownertrustjob.h
@@ -145,32 +120,20 @@ include/kpilot/pilotSerialDatabase.h
include/kpilot/plugin.h
include/kpilot/pluginfactory.h
include/kpilot/syncAction.h
-include/ksieve/error.h
-include/ksieve/lexer.h
include/ksieve/libksieve_export.h
-include/ksieve/parser.h
-include/ksieve/scriptbuilder.h
include/libkleopatraclient/core/command.h
include/libkleopatraclient/core/initialization.h
include/libkleopatraclient/core/selectcertificatecommand.h
include/libkleopatraclient/core/signencryptfilescommand.h
include/libkleopatraclient/gui/certificaterequester.h
include/libkleopatraclient/kleopatraclient_export.h
-lib/kde4/akonadi_serializer_addressee.so
-lib/kde4/akonadi_serializer_bookmark.so
-lib/kde4/akonadi_serializer_contactgroup.so
-lib/kde4/akonadi_serializer_kcal.so
-lib/kde4/akonadi_serializer_mail.so
lib/kde4/akregator_config_advanced.so
lib/kde4/akregator_config_appearance.so
lib/kde4/akregator_config_archive.so
lib/kde4/akregator_config_browser.so
lib/kde4/akregator_config_general.so
-lib/kde4/akregator_config_onlinesync.so
lib/kde4/akregator_mk4storage_plugin.so
-lib/kde4/akregator_onlinesync_plugin.so
lib/kde4/akregatorpart.so
-lib/kde4/kabc_akonadi.so
lib/kde4/kabc_groupdav.so
lib/kde4/kabc_groupwise.so
lib/kde4/kabc_kolab.so
@@ -197,37 +160,33 @@ lib/kde4/kaddressbookpart.so
lib/kde4/kalarm_local.so
lib/kde4/kalarm_localdir.so
lib/kde4/kalarm_remote.so
-lib/kde4/kcal_akonadi.so
lib/kde4/kcal_blog.so
lib/kde4/kcal_groupdav.so
lib/kde4/kcal_groupwise.so
lib/kde4/kcal_kabc.so
lib/kde4/kcal_kolab.so
lib/kde4/kcal_remote.so
-lib/kde4/kcal_resourcefeatureplan_plugin.so
lib/kde4/kcal_scalix.so
lib/kde4/kcal_slox.so
lib/kde4/kcal_xmlrpc.so
-lib/kde4/kcm_akonadi.so
-lib/kde4/kcm_akonadi_resources.so
-lib/kde4/kcm_akonadi_server.so
lib/kde4/kcm_apptsummary.so
lib/kde4/kcm_kabconfig.so
lib/kde4/kcm_kabcustomfields.so
lib/kde4/kcm_kabldapconfig.so
+lib/kde4/kcm_kjots.so
lib/kde4/kcm_kleopatra.so
lib/kde4/kcm_kmail.so
lib/kde4/kcm_kmailsummary.so
lib/kde4/kcm_knode.so
+lib/kde4/kcm_knote.so
lib/kde4/kcm_kontact.so
lib/kde4/kcm_kontactsummary.so
lib/kde4/kcm_korganizer.so
lib/kde4/kcm_kpilot.so
-lib/kde4/kcm_ktimetrackerconfig.so
+lib/kde4/kcm_ktimetracker.so
lib/kde4/kcm_planner.so
lib/kde4/kcm_sdsummary.so
lib/kde4/kcm_todosummary.so
-lib/kde4/kio_akonadi.so
lib/kde4/kio_groupwise.so
lib/kde4/kio_scalix.so
lib/kde4/kjotspart.so
@@ -271,12 +230,6 @@ lib/kde4/ktexteditorkabcbridge.so
lib/kde4/ktimetrackerpart.so
lib/kde4/ldifvcardthumbnail.so
lib/kde4/plugins/designer/kdepimwidgets.so
-lib/libakonadi-kabccommon.so
-lib/libakonadi-kabccommon.so.5
-lib/libakonadi-kabccommon.so.5.0.1
-lib/libakonadi-kcal.so
-lib/libakonadi-kcal.so.5
-lib/libakonadi-kcal.so.5.0.1
lib/libakregatorinterfaces.so
lib/libakregatorinterfaces.so.5
lib/libakregatorinterfaces.so.5.0.1
@@ -285,9 +238,6 @@ lib/libakregatorprivate.so.5.0.1
lib/libgwsoap.so
lib/libgwsoap.so.5
lib/libgwsoap.so.5.0.1
-lib/libimap.so
-lib/libimap.so.5
-lib/libimap.so.5.0.1
lib/libkabc_groupdav.so
lib/libkabc_groupdav.so.5
lib/libkabc_groupdav.so.5.0.1
@@ -323,9 +273,6 @@ lib/libkcal_groupdav.so.5.0.1
lib/libkcal_resourceblog.so
lib/libkcal_resourceblog.so.5
lib/libkcal_resourceblog.so.5.0.1
-lib/libkcal_resourcefeatureplan.so
-lib/libkcal_resourcefeatureplan.so.5
-lib/libkcal_resourcefeatureplan.so.5.0.1
lib/libkcal_resourceremote.so
lib/libkcal_resourceremote.so.5
lib/libkcal_resourceremote.so.5.0.1
@@ -353,9 +300,6 @@ lib/libkgroupwarebase.so.5.0.1
lib/libkgroupwaredav.so
lib/libkgroupwaredav.so.5
lib/libkgroupwaredav.so.5.0.1
-lib/libkholidays.so
-lib/libkholidays.so.5
-lib/libkholidays.so.5.0.1
lib/libkleo.so
lib/libkleo.so.5
lib/libkleo.so.5.0.1
@@ -379,12 +323,6 @@ lib/libknoteskolab.so.5.0.1
lib/libknotesscalix.so
lib/libknotesscalix.so.5
lib/libknotesscalix.so.5.0.1
-lib/libkocorehelper.so
-lib/libkocorehelper.so.5
-lib/libkocorehelper.so.5.0.1
-lib/libkode.so
-lib/libkode.so.5
-lib/libkode.so.5.0.1
lib/libkontactinterfaces.so
lib/libkontactinterfaces.so.5
lib/libkontactinterfaces.so.5.0.1
@@ -396,6 +334,9 @@ lib/libkorg_stdprinting.so.5.0.1
lib/libkorganizer_calendar.so
lib/libkorganizer_calendar.so.5
lib/libkorganizer_calendar.so.5.0.1
+lib/libkorganizer_core.so
+lib/libkorganizer_core.so.5
+lib/libkorganizer_core.so.5.0.1
lib/libkorganizer_eventviewer.so
lib/libkorganizer_eventviewer.so.5
lib/libkorganizer_eventviewer.so.5.0.1
@@ -412,60 +353,21 @@ lib/libkpilot.so.5
lib/libkpilot.so.5.0.1
lib/libkpilot_akonadibase.so
lib/libkpilot_conduit_base.so
-lib/libkschema.so
-lib/libkschema.so.5
-lib/libkschema.so.5.0.1
-lib/libkschemawidgets.so
-lib/libkschemawidgets.so.5
-lib/libkschemawidgets.so.5.0.1
lib/libksieve.so
lib/libksieve.so.5
lib/libksieve.so.5.0.1
lib/libkslox.so
lib/libkslox.so.5
lib/libkslox.so.5.0.1
-lib/libkxmlcommon.so
-lib/libkxmlcommon.so.5
-lib/libkxmlcommon.so.5.0.1
-lib/libmaildir.so
-lib/libmaildir.so.5
-lib/libmaildir.so.5.0.1
lib/libmimelib.so
lib/libmimelib.so.5
lib/libmimelib.so.5.0.1
-lib/libschema.so
-lib/libschema.so.5
-lib/libschema.so.5.0.1
-lib/libwscl.so
-lib/libwscl.so.5
-lib/libwscl.so.5.0.1
-lib/libwsdl.so
-lib/libwsdl.so.5
-lib/libwsdl.so.5.0.1
lib/strigi/strigiea_ics.so
lib/strigi/strigiea_vcf.so
-share/akonadi/agents/distlistresource.desktop
-share/akonadi/agents/icalresource.desktop
-share/akonadi/agents/imaplibresource.desktop
-share/akonadi/agents/kabcresource.desktop
-share/akonadi/agents/kcalresource.desktop
-share/akonadi/agents/knutresource.desktop
-share/akonadi/agents/localbookmarksresource.desktop
-share/akonadi/agents/maildirresource.desktop
-share/akonadi/agents/mailthreaderagent.desktop
-share/akonadi/agents/nepomukcontactfeeder.desktop
-share/akonadi/agents/nepomukemailfeeder.desktop
-share/akonadi/agents/nepomuktagresource.desktop
-share/akonadi/agents/nntpresource.desktop
-share/akonadi/agents/strigifeeder.desktop
-share/akonadi/agents/vcarddirresource.desktop
-share/akonadi/agents/vcardresource.desktop
share/applications/kde4/KMail.desktop
share/applications/kde4/KNode.desktop
share/applications/kde4/Kjots.desktop
share/applications/kde4/Kontact.desktop
-share/applications/kde4/akonadiconsole.desktop
-share/applications/kde4/akonaditray.desktop
share/applications/kde4/akregator.desktop
share/applications/kde4/groupwarewizard.desktop
share/applications/kde4/kaddressbook.desktop
@@ -479,13 +381,6 @@ share/applications/kde4/korganizer.desktop
share/applications/kde4/kpilot.desktop
share/applications/kde4/kpilotdaemon.desktop
share/applications/kde4/ktimetracker.desktop
-share/applications/kde4/kwsdl_compiler.desktop
-share/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
-share/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
-share/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
-share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
-share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
-share/apps/akonadiconsole/akonadiconsoleui.rc
share/apps/akregator/about/akregator.css
share/apps/akregator/about/main.html
share/apps/akregator/about/top-left-akregator.png
@@ -496,9 +391,6 @@ share/apps/akregator/articleviewer.rc
share/apps/akregator/pageviewer.rc
share/apps/akregator/pics/kmmsgnew.png
share/apps/akregator/pics/kmmsgunseen.png
-share/apps/akregator_onlinesync_plugin/akregator_onlinesync_plugin.rc
-share/apps/cmake/modules/FindKode.cmake
-share/apps/cmake/modules/KodeMacros.cmake
share/apps/kaddressbook/bookmark_xxportui.rc
share/apps/kaddressbook/csv-templates/kaddressbook.desktop
share/apps/kaddressbook/csv-templates/outlook2000.desktop
@@ -570,6 +462,8 @@ share/apps/kdepimwidgets/pics/ktimeedit.png
share/apps/kjots/kjotspartui.rc
share/apps/kjots/kjotsui.rc
share/apps/kleopatra/kleopatra.rc
+share/apps/kleopatra/pics/gpg4win-compact.png
+share/apps/kleopatra/pics/gpg4win.png
share/apps/kleopatra/pics/kleopatra_splashscreen.png
share/apps/kleopatra/pics/kleopatra_splashscreen.svgz
share/apps/kleopatra/pics/kleopatra_wizard.png
@@ -605,17 +499,13 @@ share/apps/kmail/pics/key_ok.png
share/apps/kmail/pics/key_unknown.png
share/apps/kmail/pics/kmwizard.png
share/apps/kmail/pics/mail-deleted.png
+share/apps/kmail/pics/mail-download-later.png
+share/apps/kmail/pics/mail-download-now.png
share/apps/kmail/pics/mail-encrypted-full.png
share/apps/kmail/pics/mail-encrypted-part.png
share/apps/kmail/pics/mail-encrypted.png
-share/apps/kmail/pics/mail-horizontal-space.png
share/apps/kmail/pics/mail-thread-ignored.png
share/apps/kmail/pics/mail-thread-watch.png
-share/apps/kmail/pics/mail-vertical-separator-line.png
-share/apps/kmail/pics/overlay-busy-clock-1.png
-share/apps/kmail/pics/overlay-busy-clock-2.png
-share/apps/kmail/pics/overlay-busy-clock-3.png
-share/apps/kmail/pics/overlay-busy-clock-4.png
share/apps/kmail/pics/pgp-keys.png
share/apps/kmail/pics/quotecollapse.png
share/apps/kmail/pics/quoteexpand.png
@@ -671,6 +561,11 @@ share/apps/knotes/icons/oxygen/16x16/actions/knotes_delete.png
share/apps/knotes/knotes_part.rc
share/apps/knotes/knotesappui.rc
share/apps/knotes/knotesui.rc
+share/apps/konsolekalendar/pics/hi128-apps-konsolekalendar.png
+share/apps/konsolekalendar/pics/hi16-apps-konsolekalendar.png
+share/apps/konsolekalendar/pics/hi22-apps-konsolekalendar.png
+share/apps/konsolekalendar/pics/hi32-apps-konsolekalendar.png
+share/apps/konsolekalendar/pics/hi48-apps-konsolekalendar.png
share/apps/kontact/about/kontact.css
share/apps/kontact/about/main.html
share/apps/kontact/about/top-left-kontact.png
@@ -687,7 +582,7 @@ share/apps/kontact/ksettingsdialog/planner.setdlg
share/apps/kontact/ksettingsdialog/specialdates.setdlg
share/apps/kontact/ksettingsdialog/summary.setdlg
share/apps/kontactsummary/kontactsummary_part.rc
-share/apps/korgac/icons/oxygen/22x22/actions/korgac.png
+share/apps/korgac/icons/hicolor/22x22/actions/korgac.png
share/apps/korganizer/korganizer_part.rc
share/apps/korganizer/korganizerui.rc
share/apps/korganizer/sounds/alert.wav
@@ -730,7 +625,6 @@ share/apps/ktimetracker/pics/watch-7.xpm
share/apps/kwatchgnupg/kwatchgnupgui.rc
share/apps/kwatchgnupg/pics/kwatchgnupg.png
share/apps/kwatchgnupg/pics/kwatchgnupg2.png
-share/apps/kxforms/kxformsui.rc
share/apps/libkdepim/about/bar-bottom-left.png
share/apps/libkdepim/about/bar-bottom-middle.png
share/apps/libkdepim/about/bar-bottom-right.png
@@ -754,67 +648,17 @@ share/apps/libkdepim/about/kde_infopage.css
share/apps/libkdepim/about/kde_infopage_rtl.css
share/apps/libkdepim/about/top-left.png
share/apps/libkdepim/about/top-middle.png
-share/apps/libkholidays/holiday_BelgiumDutch
-share/apps/libkholidays/holiday_BelgiumFrench
-share/apps/libkholidays/holiday_BelgiumWalloon
-share/apps/libkholidays/holiday_Suedtirol
-share/apps/libkholidays/holiday_ar
-share/apps/libkholidays/holiday_at
-share/apps/libkholidays/holiday_au
-share/apps/libkholidays/holiday_bavarian
-share/apps/libkholidays/holiday_br
-share/apps/libkholidays/holiday_bg
-share/apps/libkholidays/holiday_ca
-share/apps/libkholidays/holiday_catalan
-share/apps/libkholidays/holiday_ch
-share/apps/libkholidays/holiday_cl
-share/apps/libkholidays/holiday_co
-share/apps/libkholidays/holiday_cz
-share/apps/libkholidays/holiday_de
-share/apps/libkholidays/holiday_dk
-share/apps/libkholidays/holiday_ee
-share/apps/libkholidays/holiday_es
-share/apps/libkholidays/holiday_fi
-share/apps/libkholidays/holiday_fr
-share/apps/libkholidays/holiday_frswiss
-share/apps/libkholidays/holiday_gb
-share/apps/libkholidays/holiday_gr
-share/apps/libkholidays/holiday_gt
-share/apps/libkholidays/holiday_hu
-share/apps/libkholidays/holiday_ie
-share/apps/libkholidays/holiday_il
-share/apps/libkholidays/holiday_is
-share/apps/libkholidays/holiday_it
-share/apps/libkholidays/holiday_jm
-share/apps/libkholidays/holiday_jp
-share/apps/libkholidays/holiday_lt
-share/apps/libkholidays/holiday_mx
-share/apps/libkholidays/holiday_nl
-share/apps/libkholidays/holiday_no
-share/apps/libkholidays/holiday_nz
-share/apps/libkholidays/holiday_pl
-share/apps/libkholidays/holiday_pt
-share/apps/libkholidays/holiday_py
-share/apps/libkholidays/holiday_quebec
-share/apps/libkholidays/holiday_ro
-share/apps/libkholidays/holiday_ru
-share/apps/libkholidays/holiday_se
-share/apps/libkholidays/holiday_si
-share/apps/libkholidays/holiday_sk
-share/apps/libkholidays/holiday_th
-share/apps/libkholidays/holiday_ua
-share/apps/libkholidays/holiday_us
-share/apps/libkholidays/holiday_uy
-share/apps/libkholidays/holiday_za
share/apps/libkleopatra/pics/chiasmus_chi.png
+share/apps/libkleopatra/pics/hi16-app-gpg.png
+share/apps/libkleopatra/pics/hi16-app-gpgsm.png
+share/apps/libkleopatra/pics/hi22-app-gpg.png
+share/apps/libkleopatra/pics/hi22-app-gpgsm.png
+share/apps/libkleopatra/pics/hi32-app-gpg.png
+share/apps/libkleopatra/pics/hi32-app-gpgsm.png
share/apps/libkleopatra/pics/key.png
share/apps/libkleopatra/pics/key_bad.png
share/apps/libkleopatra/pics/key_ok.png
share/apps/libkleopatra/pics/key_unknown.png
-share/apps/nepomuk/ontologies/nco.desktop
-share/apps/nepomuk/ontologies/nco.trig
-share/apps/nepomuk/ontologies/nmo.desktop
-share/apps/nepomuk/ontologies/nmo.trig
share/autostart/kabcdistlistupdater.desktop
share/autostart/kalarm.autostart.desktop
share/autostart/korgac.desktop
@@ -835,7 +679,6 @@ share/config.kcfg/kontact.kcfg
share/config.kcfg/korganizer.kcfg
share/config.kcfg/kpilot.kcfg
share/config.kcfg/kpilotlib.kcfg
-share/config.kcfg/kxforms.kcfg
share/config.kcfg/memofileconduit.kcfg
share/config.kcfg/replyphrases.kcfg
share/config.kcfg/scalix.kcfg
@@ -846,7 +689,6 @@ share/config.kcfg/todosettings.kcfg
share/config/kmail.antispamrc
share/config/kmail.antivirusrc
share/config/korganizer.knsrc
-share/config/kres-migratorrc
share/config/libkleopatrarc
share/dbus-1/interfaces/org.kde.KAddressbook.Core.xml
share/dbus-1/interfaces/org.kde.KNotes.xml
@@ -884,10 +726,6 @@ share/doc/HTML/en/akregator/main-window4.png
share/doc/HTML/en/akregator/quick-filter.png
share/doc/HTML/en/akregator/rss.png
share/doc/HTML/en/akregator/rss3.png
-share/doc/HTML/en/kabcclient/common
-share/doc/HTML/en/kabcclient/index.cache.bz2
-share/doc/HTML/en/kabcclient/index.docbook
-share/doc/HTML/en/kabcclient/man-kabcclient.1.docbook
share/doc/HTML/en/kaddressbook/addhost.png
share/doc/HTML/en/kaddressbook/common
share/doc/HTML/en/kaddressbook/conf.png
@@ -910,9 +748,6 @@ share/doc/HTML/en/kalarm/index.cache.bz2
share/doc/HTML/en/kalarm/index.docbook
share/doc/HTML/en/kalarm/mainwindow.png
share/doc/HTML/en/kalarm/spinbox.png
-share/doc/HTML/en/kioslave/news/common
-share/doc/HTML/en/kioslave/news/index.cache.bz2
-share/doc/HTML/en/kioslave/news/index.docbook
share/doc/HTML/en/kjots/common
share/doc/HTML/en/kjots/index.cache.bz2
share/doc/HTML/en/kjots/index.docbook
@@ -976,9 +811,6 @@ share/doc/HTML/en/knode/using-subscribing.docbook
share/doc/HTML/en/knotes/common
share/doc/HTML/en/knotes/index.cache.bz2
share/doc/HTML/en/knotes/index.docbook
-share/doc/HTML/en/konsolekalendar/common
-share/doc/HTML/en/konsolekalendar/index.cache.bz2
-share/doc/HTML/en/konsolekalendar/index.docbook
share/doc/HTML/en/kontact/calendar-sidebar-icon.png
share/doc/HTML/en/kontact/common
share/doc/HTML/en/kontact/configuration-components.png
@@ -1065,6 +897,7 @@ share/doc/HTML/en/kpilot/conduit-memofile.png
share/doc/HTML/en/kpilot/conduit-todo.png
share/doc/HTML/en/kpilot/conduit-vcal.png
share/doc/HTML/en/kpilot/configuration.docbook
+share/doc/HTML/en/kpilot/daemon-menu-configure.png
share/doc/HTML/en/kpilot/daemon-menu.png
share/doc/HTML/en/kpilot/faq.docbook
share/doc/HTML/en/kpilot/file-app.png
@@ -1082,6 +915,9 @@ share/doc/HTML/en/kpilot/setup-startup-exit.png
share/doc/HTML/en/kpilot/setup-tabs.png
share/doc/HTML/en/kpilot/sidebar.png
share/doc/HTML/en/kpilot/sync.docbook
+share/doc/HTML/en/kpilot/todo-app.png
+share/doc/HTML/en/kpilot/toolbar_backup.png
+share/doc/HTML/en/kpilot/toolbar_hotsync.png
share/doc/HTML/en/kpilot/usage.docbook
share/doc/HTML/en/ktimetracker/clipboard-history.png
share/doc/HTML/en/ktimetracker/common
@@ -1123,7 +959,7 @@ share/icons/hicolor/16x16/apps/knotes.png
share/icons/hicolor/16x16/apps/kontact.png
share/icons/hicolor/16x16/apps/korganizer.png
share/icons/hicolor/16x16/apps/kpilot.png
-share/icons/hicolor/16x16/apps/kpilotDaemon.png
+share/icons/hicolor/16x16/apps/kpilotdaemon.png
share/icons/hicolor/16x16/apps/ktimetracker.png
share/icons/hicolor/22x22/actions/kpilot_backup.png
share/icons/hicolor/22x22/actions/kpilot_busysync.png
@@ -1141,7 +977,7 @@ share/icons/hicolor/22x22/apps/knotes.png
share/icons/hicolor/22x22/apps/kontact.png
share/icons/hicolor/22x22/apps/korganizer.png
share/icons/hicolor/22x22/apps/kpilot.png
-share/icons/hicolor/22x22/apps/kpilotDaemon.png
+share/icons/hicolor/22x22/apps/kpilotdaemon.png
share/icons/hicolor/22x22/apps/ktimetracker.png
share/icons/hicolor/32x32/actions/kpilot_fullsync.png
share/icons/hicolor/32x32/actions/kpilot_hhtopc.png
@@ -1158,7 +994,7 @@ share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/kontact.png
share/icons/hicolor/32x32/apps/korganizer.png
share/icons/hicolor/32x32/apps/kpilot.png
-share/icons/hicolor/32x32/apps/kpilotDaemon.png
+share/icons/hicolor/32x32/apps/kpilotdaemon.png
share/icons/hicolor/32x32/apps/ktimetracker.png
share/icons/hicolor/48x48/actions/kpilot_fullsync.png
share/icons/hicolor/48x48/actions/kpilot_hhtopc.png
@@ -1175,7 +1011,7 @@ share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/kontact.png
share/icons/hicolor/48x48/apps/korganizer.png
share/icons/hicolor/48x48/apps/kpilot.png
-share/icons/hicolor/48x48/apps/kpilotDaemon.png
+share/icons/hicolor/48x48/apps/kpilotdaemon.png
share/icons/hicolor/48x48/apps/ktimetracker.png
share/icons/hicolor/64x64/actions/kpilot_address.png
share/icons/hicolor/64x64/actions/kpilot_bhotsync.png
@@ -1210,23 +1046,15 @@ share/icons/oxygen/16x16/actions/mail-reply-custom.png
share/icons/oxygen/16x16/actions/mail-signed-fully.png
share/icons/oxygen/16x16/actions/mail-signed-part.png
share/icons/oxygen/16x16/actions/mail-signed.png
-share/icons/oxygen/16x16/actions/meeting-attending-tentative.png
-share/icons/oxygen/16x16/actions/meeting-attending.png
share/icons/oxygen/16x16/actions/smallclock.png
share/icons/oxygen/16x16/actions/upindicator.png
share/icons/oxygen/16x16/apps/kalarm.png
share/icons/oxygen/16x16/apps/kleopatra.png
share/icons/oxygen/16x16/apps/kmailcvt.png
share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/16x16/status/appointment-recurring.png
-share/icons/oxygen/16x16/status/appointment-reminder.png
share/icons/oxygen/16x16/status/mail-sent.png
share/icons/oxygen/16x16/status/mail-tagged.png
share/icons/oxygen/16x16/status/mail-task.png
-share/icons/oxygen/16x16/status/meeting-organizer.png
-share/icons/oxygen/16x16/status/task-complete.png
-share/icons/oxygen/16x16/status/task-recurring.png
-share/icons/oxygen/16x16/status/task-reminder.png
share/icons/oxygen/22x22/actions/button_fewer.png
share/icons/oxygen/22x22/actions/button_more.png
share/icons/oxygen/22x22/actions/checkmark.png
@@ -1234,37 +1062,19 @@ share/icons/oxygen/22x22/actions/document-new-from-template.png
share/icons/oxygen/22x22/actions/edit-delete-page.png
share/icons/oxygen/22x22/actions/kalarm.png
share/icons/oxygen/22x22/actions/mail-reply-custom.png
-share/icons/oxygen/22x22/actions/meeting-attending-tentative.png
-share/icons/oxygen/22x22/actions/meeting-attending.png
share/icons/oxygen/22x22/actions/new-command-alarm.png
share/icons/oxygen/22x22/apps/kalarm.png
share/icons/oxygen/22x22/apps/kleopatra.png
share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/22x22/status/appointment-recurring.png
-share/icons/oxygen/22x22/status/appointment-reminder.png
share/icons/oxygen/22x22/status/mail-tagged.png
share/icons/oxygen/22x22/status/mail-task.png
-share/icons/oxygen/22x22/status/meeting-organizer.png
-share/icons/oxygen/22x22/status/task-complete.png
-share/icons/oxygen/22x22/status/task-recurring.png
-share/icons/oxygen/22x22/status/task-reminder.png
share/icons/oxygen/32x32/actions/edit-delete-page.png
-share/icons/oxygen/32x32/actions/journal-new.png
share/icons/oxygen/32x32/actions/mail-reply-custom.png
-share/icons/oxygen/32x32/actions/meeting-attending-tentative.png
-share/icons/oxygen/32x32/actions/meeting-attending.png
-share/icons/oxygen/32x32/actions/task-new.png
share/icons/oxygen/32x32/apps/kalarm.png
share/icons/oxygen/32x32/apps/kleopatra.png
share/icons/oxygen/32x32/apps/kmailcvt.png
share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/32x32/status/appointment-recurring.png
-share/icons/oxygen/32x32/status/appointment-reminder.png
share/icons/oxygen/32x32/status/mail-tagged.png
-share/icons/oxygen/32x32/status/meeting-organizer.png
-share/icons/oxygen/32x32/status/task-complete.png
-share/icons/oxygen/32x32/status/task-recurring.png
-share/icons/oxygen/32x32/status/task-reminder.png
share/icons/oxygen/48x48/actions/edit-delete-page.png
share/icons/oxygen/48x48/actions/mail-reply-custom.png
share/icons/oxygen/48x48/apps/kalarm.png
@@ -1286,15 +1096,12 @@ share/icons/oxygen/scalable/apps/kleopatra.svgz
share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
share/icons/oxygen/scalable/status/mail-tagged.svgz
share/icons/oxygen/scalable/status/mail-task.svgz
-share/kde4/services/akonadi.protocol
share/kde4/services/akregator_config_advanced.desktop
share/kde4/services/akregator_config_appearance.desktop
share/kde4/services/akregator_config_archive.desktop
share/kde4/services/akregator_config_browser.desktop
share/kde4/services/akregator_config_general.desktop
-share/kde4/services/akregator_config_onlinesync.desktop
share/kde4/services/akregator_mk4storage_plugin.desktop
-share/kde4/services/akregator_onlinesync_plugin.desktop
share/kde4/services/akregator_part.desktop
share/kde4/services/feed.protocol
share/kde4/services/groupwise.protocol
@@ -1330,19 +1137,18 @@ share/kde4/services/kaddressbook/tableview.desktop
share/kde4/services/kaddressbook/vcard_xxport.desktop
share/kde4/services/kaddressbook/yahooprotocol.desktop
share/kde4/services/kaddressbookpart.desktop
-share/kde4/services/kcm_akonadi.desktop
-share/kde4/services/kcm_akonadi_resources.desktop
-share/kde4/services/kcm_akonadi_server.desktop
share/kde4/services/kcmapptsummary.desktop
share/kde4/services/kcmkmailsummary.desktop
share/kde4/services/kcmkontactsummary.desktop
share/kde4/services/kcmplanner.desktop
share/kde4/services/kcmsdsummary.desktop
share/kde4/services/kcmtodosummary.desktop
+share/kde4/services/kjots_config_misc.desktop
share/kde4/services/kjotspart.desktop
share/kde4/services/kleopatra_config_appear.desktop
share/kde4/services/kleopatra_config_dirserv.desktop
share/kde4/services/kleopatra_config_dnorder.desktop
+share/kde4/services/kleopatra_config_gnupgsystem.desktop
share/kde4/services/kleopatra_config_smimevalidation.desktop
share/kde4/services/kleopatra_decryptverifyfiles.desktop
share/kde4/services/kleopatra_decryptverifyfolders.desktop
@@ -1362,6 +1168,11 @@ share/kde4/services/knode_config_identity.desktop
share/kde4/services/knode_config_post_news.desktop
share/kde4/services/knode_config_privacy.desktop
share/kde4/services/knode_config_read_news.desktop
+share/kde4/services/knote_config_action.desktop
+share/kde4/services/knote_config_display.desktop
+share/kde4/services/knote_config_editor.desktop
+share/kde4/services/knote_config_network.desktop
+share/kde4/services/knote_config_style.desktop
share/kde4/services/kontact/akregatorplugin.desktop
share/kde4/services/kontact/journalplugin.desktop
share/kde4/services/kontact/kaddressbookplugin.desktop
@@ -1390,6 +1201,7 @@ share/kde4/services/korganizer_configmain.desktop
share/kde4/services/korganizer_configplugins.desktop
share/kde4/services/korganizer_configtime.desktop
share/kde4/services/korganizer_configviews.desktop
+share/kde4/services/korganizer_part.desktop
share/kde4/services/kpilot-conduit-calendar.desktop
share/kde4/services/kpilot-conduit-contacts.desktop
share/kde4/services/kpilot-conduit-todo.desktop
@@ -1397,7 +1209,6 @@ share/kde4/services/kpilot_config.desktop
share/kde4/services/kresources/alarms/local.desktop
share/kde4/services/kresources/alarms/localdir.desktop
share/kde4/services/kresources/alarms/remote.desktop
-share/kde4/services/kresources/kabc/akonadi.desktop
share/kde4/services/kresources/kabc/kabc_groupdav.desktop
share/kde4/services/kresources/kabc/kabc_groupwise.desktop
share/kde4/services/kresources/kabc/kabc_opengroupware.desktop
@@ -1407,14 +1218,12 @@ share/kde4/services/kresources/kabc/kabc_xmlrpc.desktop
share/kde4/services/kresources/kabc/kolab.desktop
share/kde4/services/kresources/kabc/scalix.desktop
share/kde4/services/kresources/kalarm_manager.desktop
-share/kde4/services/kresources/kcal/akonadi.desktop
share/kde4/services/kresources/kcal/blog.desktop
share/kde4/services/kresources/kcal/kabc.desktop
share/kde4/services/kresources/kcal/kcal_groupdav.desktop
share/kde4/services/kresources/kcal/kcal_groupwise.desktop
share/kde4/services/kresources/kcal/kcal_opengroupware.desktop
share/kde4/services/kresources/kcal/kcal_ox.desktop
-share/kde4/services/kresources/kcal/kcal_resourcefeatureplan.desktop
share/kde4/services/kresources/kcal/kcal_slox.desktop
share/kde4/services/kresources/kcal/kcal_xmlrpc.desktop
share/kde4/services/kresources/kcal/kolab.desktop
@@ -1425,7 +1234,9 @@ share/kde4/services/kresources/knotes/kolabresource.desktop
share/kde4/services/kresources/knotes/local.desktop
share/kde4/services/kresources/knotes/scalix.desktop
share/kde4/services/kresources/knotes_manager.desktop
-share/kde4/services/ktimetrackerconfig.desktop
+share/kde4/services/ktimetracker_config_behavior.desktop
+share/kde4/services/ktimetracker_config_display.desktop
+share/kde4/services/ktimetracker_config_storage.desktop
share/kde4/services/ktimetrackerpart.desktop
share/kde4/services/ldifvcardthumbnail.desktop
share/kde4/services/memofile-conduit.desktop
@@ -1458,23 +1269,18 @@ share/kde4/servicetypes/kpilotconduit.desktop
@dirrm share/doc/HTML/en/kpilot
@dirrm share/doc/HTML/en/korganizer
@dirrm share/doc/HTML/en/kontact
-@dirrm share/doc/HTML/en/konsolekalendar
@dirrm share/doc/HTML/en/knotes
@dirrm share/doc/HTML/en/knode
@dirrm share/doc/HTML/en/kmail
@dirrm share/doc/HTML/en/kleopatra
@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/kioslave/news
@dirrm share/doc/HTML/en/kalarm
@dirrm share/doc/HTML/en/kaddressbook
-@dirrm share/doc/HTML/en/kabcclient
@dirrm share/doc/HTML/en/akregator
@dirrm share/apps/libkleopatra/pics
@dirrm share/apps/libkleopatra
-@dirrm share/apps/libkholidays
@dirrm share/apps/libkdepim/about
@dirrm share/apps/libkdepim
-@dirrm share/apps/kxforms
@dirrm share/apps/kwatchgnupg/pics
@dirrm share/apps/kwatchgnupg
@dirrm share/apps/ktimetracker/pics
@@ -1498,15 +1304,17 @@ share/kde4/servicetypes/kpilotconduit.desktop
@dirrm share/apps/kpilot
@dirrm share/apps/korganizer/sounds
@dirrm share/apps/korganizer
-@dirrm share/apps/korgac/icons/oxygen/22x22/actions
-@dirrm share/apps/korgac/icons/oxygen/22x22
-@dirrm share/apps/korgac/icons/oxygen
+@dirrm share/apps/korgac/icons/hicolor/22x22/actions
+@dirrm share/apps/korgac/icons/hicolor/22x22
+@dirrm share/apps/korgac/icons/hicolor
@dirrm share/apps/korgac/icons
@dirrm share/apps/korgac
@dirrm share/apps/kontactsummary
@dirrm share/apps/kontact/ksettingsdialog
@dirrm share/apps/kontact/about
@dirrm share/apps/kontact
+@dirrm share/apps/konsolekalendar/pics
+@dirrm share/apps/konsolekalendar
@dirrm share/apps/knotes/icons/oxygen/16x16/actions
@dirrm share/apps/knotes/icons/oxygen/16x16
@dirrm share/apps/knotes/icons/oxygen
@@ -1536,16 +1344,9 @@ share/kde4/servicetypes/kpilotconduit.desktop
@dirrm share/apps/kaddressbook/icons
@dirrm share/apps/kaddressbook/csv-templates
@dirrm share/apps/kaddressbook
-@dirrm share/apps/akregator_onlinesync_plugin
@dirrmtry share/apps/akregator/pics
@dirrm share/apps/akregator/about
@dirrmtry share/apps/akregator
-@dirrm share/apps/akonadiconsole
-@dirrm share/apps/akonadi/plugins/serializer
-@dirrm share/apps/akonadi/plugins
-@dirrm share/apps/akonadi
-@dirrm share/akonadi/agents
-@dirrm share/akonadi
@dirrm include/libkleopatraclient/gui
@dirrm include/libkleopatraclient/core
@dirrm include/libkleopatraclient
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 936e137eb3d1..02d1ddde336c 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdepimlibs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -20,7 +19,7 @@ LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \
boost_python:${PORTSDIR}/devel/boost-python-libs \
ical.43:${PORTSDIR}/devel/libical
-USE_KDE4= kdelibs akonadi kdeprefix kdehier automoc4
+USE_KDE4= kdelibs kdeexp akonadi kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
@@ -28,7 +27,7 @@ QT_COMPONENTS= corelib opengl dbus qt3support \
designer network svg qtestlib help \
qmake_build moc_build rcc_build uic_build
USE_OPENLDAP= yes
-MAKE_JOBS_UNSAFE= yes
+MAKE_JOBS_SAFE= yes
.include <bsd.port.pre.mk>
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 07e2febaba27..266d42365c27 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepimlibs-4.2.4.tar.bz2) = ee1d783140be0bb67652784f6fa93f70
-SHA256 (KDE/kdepimlibs-4.2.4.tar.bz2) = 860f4f133151c169773c9627e4542cc573f2f8accf0af61346337b7bae5769ce
-SIZE (KDE/kdepimlibs-4.2.4.tar.bz2) = 1595036
+MD5 (KDE/kdepimlibs-4.3.0.tar.bz2) = 313f1a9d353f82c2ffee517115404dd5
+SHA256 (KDE/kdepimlibs-4.3.0.tar.bz2) = 30b2eb661a7b4533d574855302ddb59bd2a91136ad162990e948eb89a1328c30
+SIZE (KDE/kdepimlibs-4.3.0.tar.bz2) = 1778054
diff --git a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
deleted file mode 100644
index 312ff0638d1d..000000000000
--- a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../CMakeLists.txt.orig 2009-02-26 17:15:42.000000000 +0300
-+++ ../CMakeLists.txt 2009-03-07 09:57:33.000000000 +0300
-@@ -127,7 +127,7 @@
- macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KdepimLibsConfigVersion.cmake
- ${KDEPIMLIBS_VERSION_MAJOR} ${KDEPIMLIBS_VERSION_MINOR} ${KDEPIMLIBS_VERSION_PATCH})
-
--set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
-+set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs/cmake)
- # places where find_package() looks for FooConfig.cmake files:
- # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in
- # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR
diff --git a/deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt
deleted file mode 100644
index 1e2d4068c8db..000000000000
--- a/deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../gpgme++/CMakeLists.txt.orig 2009-07-01 18:28:08.000000000 -0400
-+++ ../gpgme++/CMakeLists.txt 2009-07-01 18:28:36.000000000 -0400
-@@ -32,7 +32,7 @@
- gpgadduserideditinteractor.cpp
- )
-
--set( _gpgmepp_version 2.0.2 )
-+set( _gpgmepp_version 2.0.3 )
- set( _gpgmepp_soversion 2 )
-
- set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ${Boost_INCLUDE_DIR} )
diff --git a/deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp b/deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp
deleted file mode 100644
index 836e10518d8d..000000000000
--- a/deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../gpgme++/context.cpp.orig 2009-07-01 18:28:59.000000000 -0400
-+++ ../gpgme++/context.cpp 2009-07-01 18:30:51.000000000 -0400
-@@ -51,6 +51,10 @@
- #include <cassert>
-
- namespace GpgME {
-+ void initializeLibrary() {
-+ gpgme_check_version( 0 );
-+ }
-+
- static inline gpgme_error_t makeError( gpg_err_code_t code ) {
- return gpg_err_make( (gpg_err_source_t)22, code );
- }
diff --git a/deskutils/kdepimlibs4/files/patch-gpgme++-global.h b/deskutils/kdepimlibs4/files/patch-gpgme++-global.h
deleted file mode 100644
index dddc6eb5afe3..000000000000
--- a/deskutils/kdepimlibs4/files/patch-gpgme++-global.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../gpgme++/global.h.orig 2009-07-01 18:26:50.000000000 -0400
-+++ ../gpgme++/global.h 2009-07-01 18:27:58.000000000 -0400
-@@ -39,6 +39,8 @@
-
- namespace GpgME {
-
-+ GPGMEPP_EXPORT void initializeLibrary();
-+
- enum Protocol { OpenPGP, CMS, UnknownProtocol };
-
- enum Engine { GpgEngine, GpgSMEngine, GpgConfEngine, UnknownEngine };
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index f124fec81144..688ab193c8f3 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -1,3 +1,218 @@
+include/KDE/Akonadi/AgentBase
+include/KDE/Akonadi/AgentFilterProxyModel
+include/KDE/Akonadi/AgentInstance
+include/KDE/Akonadi/AgentInstanceCreateJob
+include/KDE/Akonadi/AgentInstanceModel
+include/KDE/Akonadi/AgentInstanceWidget
+include/KDE/Akonadi/AgentManager
+include/KDE/Akonadi/AgentType
+include/KDE/Akonadi/AgentTypeDialog
+include/KDE/Akonadi/AgentTypeModel
+include/KDE/Akonadi/AgentTypeWidget
+include/KDE/Akonadi/Attribute
+include/KDE/Akonadi/AttributeFactory
+include/KDE/Akonadi/CachePolicy
+include/KDE/Akonadi/ChangeRecorder
+include/KDE/Akonadi/Collection
+include/KDE/Akonadi/CollectionCopyJob
+include/KDE/Akonadi/CollectionCreateJob
+include/KDE/Akonadi/CollectionDeleteJob
+include/KDE/Akonadi/CollectionDialog
+include/KDE/Akonadi/CollectionFetchJob
+include/KDE/Akonadi/CollectionFilterProxyModel
+include/KDE/Akonadi/CollectionModel
+include/KDE/Akonadi/CollectionModifyJob
+include/KDE/Akonadi/CollectionPropertiesDialog
+include/KDE/Akonadi/CollectionPropertiesPage
+include/KDE/Akonadi/CollectionRequester
+include/KDE/Akonadi/CollectionStatistics
+include/KDE/Akonadi/CollectionStatisticsDelegate
+include/KDE/Akonadi/CollectionStatisticsJob
+include/KDE/Akonadi/CollectionStatisticsModel
+include/KDE/Akonadi/CollectionView
+include/KDE/Akonadi/Control
+include/KDE/Akonadi/Entity
+include/KDE/Akonadi/EntityDisplayAttribute
+include/KDE/Akonadi/Exception
+include/KDE/Akonadi/Item
+include/KDE/Akonadi/ItemCopyJob
+include/KDE/Akonadi/ItemCreateJob
+include/KDE/Akonadi/ItemDeleteJob
+include/KDE/Akonadi/ItemFetchJob
+include/KDE/Akonadi/ItemFetchScope
+include/KDE/Akonadi/ItemModel
+include/KDE/Akonadi/ItemModifyJob
+include/KDE/Akonadi/ItemMonitor
+include/KDE/Akonadi/ItemMoveJob
+include/KDE/Akonadi/ItemSerializerPlugin
+include/KDE/Akonadi/ItemSync
+include/KDE/Akonadi/ItemView
+include/KDE/Akonadi/Job
+include/KDE/Akonadi/LinkJob
+include/KDE/Akonadi/Monitor
+include/KDE/Akonadi/ResourceBase
+include/KDE/Akonadi/SearchCreateJob
+include/KDE/Akonadi/ServerManager
+include/KDE/Akonadi/Session
+include/KDE/Akonadi/StandardActionManager
+include/KDE/Akonadi/TransactionJobs
+include/KDE/Akonadi/TransactionSequence
+include/KDE/Akonadi/UnlinkJob
+include/KDE/KABC/Address
+include/KDE/KABC/AddressBook
+include/KDE/KABC/AddressLineEdit
+include/KDE/KABC/Addressee
+include/KDE/KABC/AddresseeDialog
+include/KDE/KABC/AddresseeList
+include/KDE/KABC/ContactGroup
+include/KDE/KABC/ContactGroupTool
+include/KDE/KABC/DistributionList
+include/KDE/KABC/DistributionListDialog
+include/KDE/KABC/EmailSelectDialog
+include/KDE/KABC/ErrorHandler
+include/KDE/KABC/Field
+include/KDE/KABC/Format
+include/KDE/KABC/FormatFactory
+include/KDE/KABC/Geo
+include/KDE/KABC/Key
+include/KDE/KABC/LDIFConverter
+include/KDE/KABC/Lock
+include/KDE/KABC/LockNull
+include/KDE/KABC/PhoneNumber
+include/KDE/KABC/Picture
+include/KDE/KABC/Plugin
+include/KDE/KABC/Resource
+include/KDE/KABC/ResourceABC
+include/KDE/KABC/ResourceCached
+include/KDE/KABC/Secrecy
+include/KDE/KABC/SortMode
+include/KDE/KABC/Sound
+include/KDE/KABC/StdAddressBook
+include/KDE/KABC/TimeZone
+include/KDE/KABC/VCardConverter
+include/KDE/KABC/VCardFormat
+include/KDE/KBlog/Blog
+include/KDE/KBlog/BlogComment
+include/KDE/KBlog/BlogMedia
+include/KDE/KBlog/BlogPost
+include/KDE/KBlog/Blogger1
+include/KDE/KBlog/GData
+include/KDE/KBlog/MetaWeblog
+include/KDE/KBlog/MovableType
+include/KDE/KBlog/WordpressBuggy
+include/KDE/KCal/Alarm
+include/KDE/KCal/AssignmentVisitor
+include/KDE/KCal/Attachment
+include/KDE/KCal/Attendee
+include/KDE/KCal/CalFilter
+include/KDE/KCal/CalFormat
+include/KDE/KCal/CalStorage
+include/KDE/KCal/Calendar
+include/KDE/KCal/CalendarLocal
+include/KDE/KCal/CalendarNull
+include/KDE/KCal/CalendarResources
+include/KDE/KCal/ConfirmSaveDialog
+include/KDE/KCal/CustomProperties
+include/KDE/KCal/DndFactory
+include/KDE/KCal/Duration
+include/KDE/KCal/Event
+include/KDE/KCal/Exceptions
+include/KDE/KCal/FileStorage
+include/KDE/KCal/FreeBusy
+include/KDE/KCal/FreeBusyCache
+include/KDE/KCal/FreeBusyPeriod
+include/KDE/KCal/FreeBusyUrlStore
+include/KDE/KCal/HtmlExport
+include/KDE/KCal/HtmlExportSettings
+include/KDE/KCal/ICalDrag
+include/KDE/KCal/ICalFormat
+include/KDE/KCal/ICalTimeZones
+include/KDE/KCal/IMIPScheduler
+include/KDE/KCal/Incidence
+include/KDE/KCal/IncidenceBase
+include/KDE/KCal/IncidenceFormatter
+include/KDE/KCal/Journal
+include/KDE/KCal/KCalVersion
+include/KDE/KCal/KResult
+include/KDE/KCal/ListBase
+include/KDE/KCal/Period
+include/KDE/KCal/Person
+include/KDE/KCal/QtopiaFormat
+include/KDE/KCal/Recurrence
+include/KDE/KCal/RecurrenceRule
+include/KDE/KCal/ResourceCached
+include/KDE/KCal/ResourceCachedConfig
+include/KDE/KCal/ResourceCalendar
+include/KDE/KCal/ResourceLocal
+include/KDE/KCal/ResourceLocalConfig
+include/KDE/KCal/ResourceLocalDir
+include/KDE/KCal/ResourceLocalDirConfig
+include/KDE/KCal/Scheduler
+include/KDE/KCal/SortableList
+include/KDE/KCal/Todo
+include/KDE/KCal/VCalDrag
+include/KDE/KCal/VCalFormat
+include/KDE/KHolidays/AstroSeasons
+include/KDE/KHolidays/Holidays
+include/KDE/KHolidays/LunarPhase
+include/KDE/KHolidays/Zodiac
+include/KDE/KLDAP/Ber
+include/KDE/KLDAP/LdapAttributeProxyModel
+include/KDE/KLDAP/LdapConfigWidget
+include/KDE/KLDAP/LdapConnection
+include/KDE/KLDAP/LdapControl
+include/KDE/KLDAP/LdapDN
+include/KDE/KLDAP/LdapDefs
+include/KDE/KLDAP/LdapModel
+include/KDE/KLDAP/LdapObject
+include/KDE/KLDAP/LdapOperation
+include/KDE/KLDAP/LdapSearch
+include/KDE/KLDAP/LdapServer
+include/KDE/KLDAP/LdapStructureProxyModel
+include/KDE/KLDAP/LdapUrl
+include/KDE/KLDAP/Ldif
+include/KDE/KPIMIdentities/Identity
+include/KDE/KPIMIdentities/IdentityCombo
+include/KDE/KPIMIdentities/IdentityManager
+include/KDE/KPIMIdentities/Signature
+include/KDE/KPIMIdentities/SignatureConfigurator
+include/KDE/KPIMTextEdit/EMailQuoteHighlighter
+include/KDE/KPIMTextEdit/TextEdit
+include/KDE/KPIMUtils/Email
+include/KDE/KPIMUtils/KFileIO
+include/KDE/KPIMUtils/LinkLocator
+include/KDE/KPIMUtils/SpellingFilter
+include/KDE/KPIMUtils/SuperTrait
+include/KDE/KResources/ConfigDialog
+include/KDE/KResources/ConfigPage
+include/KDE/KResources/ConfigWidget
+include/KDE/KResources/Factory
+include/KDE/KResources/IdMapper
+include/KDE/KResources/Manager
+include/KDE/KResources/ManagerImpl
+include/KDE/KResources/Resource
+include/KDE/KResources/SelectDialog
+include/KDE/Syndication/AbstractParser
+include/KDE/Syndication/Category
+include/KDE/Syndication/Constants
+include/KDE/Syndication/DataRetriever
+include/KDE/Syndication/DocumentSource
+include/KDE/Syndication/DocumentVisitor
+include/KDE/Syndication/ElementWrapper
+include/KDE/Syndication/Enclosure
+include/KDE/Syndication/Feed
+include/KDE/Syndication/Global
+include/KDE/Syndication/Image
+include/KDE/Syndication/Item
+include/KDE/Syndication/Loader
+include/KDE/Syndication/Mapper
+include/KDE/Syndication/ParserCollection
+include/KDE/Syndication/Person
+include/KDE/Syndication/SpecificDocument
+include/KDE/Syndication/SpecificItem
+include/KDE/Syndication/SpecificItemVisitor
+include/KDE/Syndication/Syndication
+include/KDE/Syndication/Tools
include/akonadi/agentbase.h
include/akonadi/agentfilterproxymodel.h
include/akonadi/agentinstance.h
@@ -18,12 +233,14 @@ include/akonadi/collection.h
include/akonadi/collectioncopyjob.h
include/akonadi/collectioncreatejob.h
include/akonadi/collectiondeletejob.h
+include/akonadi/collectiondialog.h
include/akonadi/collectionfetchjob.h
include/akonadi/collectionfilterproxymodel.h
include/akonadi/collectionmodel.h
include/akonadi/collectionmodifyjob.h
include/akonadi/collectionpropertiesdialog.h
include/akonadi/collectionpropertiespage.h
+include/akonadi/collectionrequester.h
include/akonadi/collectionstatistics.h
include/akonadi/collectionstatisticsdelegate.h
include/akonadi/collectionstatisticsjob.h
@@ -32,6 +249,7 @@ include/akonadi/collectionview.h
include/akonadi/control.h
include/akonadi/entity.h
include/akonadi/entitydisplayattribute.h
+include/akonadi/exception.h
include/akonadi/item.h
include/akonadi/itemcopyjob.h
include/akonadi/itemcreatejob.h
@@ -55,8 +273,10 @@ include/akonadi/kmime/messageparts.h
include/akonadi/kmime/messagethreaderproxymodel.h
include/akonadi/kmime/messagethreadingattribute.h
include/akonadi/linkjob.h
+include/akonadi/mimetypechecker.h
include/akonadi/monitor.h
include/akonadi/private/collectionpathresolver_p.h
+include/akonadi/qtest_akonadi.h
include/akonadi/resourcebase.h
include/akonadi/searchcreatejob.h
include/akonadi/servermanager.h
@@ -99,6 +319,8 @@ include/kabc/addressee.h
include/kabc/addresseedialog.h
include/kabc/addresseelist.h
include/kabc/addresslineedit.h
+include/kabc/contactgroup.h
+include/kabc/contactgrouptool.h
include/kabc/distributionlist.h
include/kabc/distributionlistdialog.h
include/kabc/emailselectdialog.h
@@ -139,6 +361,7 @@ include/kblog/metaweblog.h
include/kblog/movabletype.h
include/kblog/wordpressbuggy.h
include/kcal/alarm.h
+include/kcal/assignmentvisitor.h
include/kcal/attachment.h
include/kcal/attendee.h
include/kcal/calendar.h
@@ -148,6 +371,7 @@ include/kcal/calendarresources.h
include/kcal/calfilter.h
include/kcal/calformat.h
include/kcal/calstorage.h
+include/kcal/comparisonvisitor.h
include/kcal/confirmsavedialog.h
include/kcal/customproperties.h
include/kcal/dndfactory.h
@@ -190,8 +414,48 @@ include/kcal/sortablelist.h
include/kcal/todo.h
include/kcal/vcaldrag.h
include/kcal/vcalformat.h
+include/kholidays/astroseasons.h
+include/kholidays/holidays.h
+include/kholidays/kholidays_export.h
+include/kholidays/lunarphase.h
+include/kholidays/zodiac.h
+include/kimap/acl.h
+include/kimap/acljobbase.h
+include/kimap/appendjob.h
+include/kimap/capabilitiesjob.h
+include/kimap/closejob.h
+include/kimap/copyjob.h
+include/kimap/createjob.h
+include/kimap/deleteacljob.h
+include/kimap/deletejob.h
+include/kimap/expungejob.h
+include/kimap/fetchjob.h
+include/kimap/getacljob.h
+include/kimap/getmetadatajob.h
+include/kimap/getquotajob.h
+include/kimap/getquotarootjob.h
+include/kimap/imapset.h
+include/kimap/job.h
include/kimap/kimap_export.h
+include/kimap/listjob.h
+include/kimap/listrightsjob.h
+include/kimap/loginjob.h
+include/kimap/logoutjob.h
+include/kimap/metadatajobbase.h
+include/kimap/myrightsjob.h
+include/kimap/quotajobbase.h
+include/kimap/renamejob.h
include/kimap/rfccodecs.h
+include/kimap/searchjob.h
+include/kimap/selectjob.h
+include/kimap/session.h
+include/kimap/sessionuiproxy.h
+include/kimap/setacljob.h
+include/kimap/setmetadatajob.h
+include/kimap/setquotajob.h
+include/kimap/storejob.h
+include/kimap/subscribejob.h
+include/kimap/unsubscribejob.h
include/kldap/ber.h
include/kldap/kldap_export.h
include/kldap/ldapattributeproxymodel.h
@@ -227,11 +491,15 @@ include/kpimidentities/identitymanager.h
include/kpimidentities/kpimidentities_export.h
include/kpimidentities/signature.h
include/kpimidentities/signatureconfigurator.h
+include/kpimtextedit/emailquotehighlighter.h
+include/kpimtextedit/kpimtextedit_export.h
+include/kpimtextedit/textedit.h
include/kpimutils/email.h
include/kpimutils/kfileio.h
include/kpimutils/kpimutils_export.h
include/kpimutils/linklocator.h
include/kpimutils/spellingfilter.h
+include/kpimutils/supertrait.h
include/kresources/configdialog.h
include/kresources/configpage.h
include/kresources/configwidget.h
@@ -264,6 +532,8 @@ include/mailtransport/transportconfigdialog.h
include/mailtransport/transportjob.h
include/mailtransport/transportmanagementwidget.h
include/mailtransport/transportmanager.h
+include/microblog/microblog_export.h
+include/microblog/statusitem.h
include/qgpgme/dataprovider.h
include/qgpgme/eventloopinteractor.h
include/qgpgme/qgpgme_export.h
@@ -366,13 +636,13 @@ lib/libakonadi-kmime.so.5
lib/libakonadi-kmime.so.5.0.1
%%WITH_PTH%%lib/libgpgme++-pth.so
%%WITH_PTH%%lib/libgpgme++-pth.so.2
-%%WITH_PTH%%lib/libgpgme++-pth.so.2.0.3
+%%WITH_PTH%%lib/libgpgme++-pth.so.2.2.1
lib/libgpgme++-pthread.so
lib/libgpgme++-pthread.so.2
-lib/libgpgme++-pthread.so.2.0.3
+lib/libgpgme++-pthread.so.2.2.1
lib/libgpgme++.so
lib/libgpgme++.so.2
-lib/libgpgme++.so.2.0.3
+lib/libgpgme++.so.2.2.1
lib/libkabc.so
lib/libkabc.so.5
lib/libkabc.so.5.0.1
@@ -385,6 +655,9 @@ lib/libkblog.so.5.0.1
lib/libkcal.so
lib/libkcal.so.5
lib/libkcal.so.5.0.1
+lib/libkholidays.so
+lib/libkholidays.so.5
+lib/libkholidays.so.5.0.1
lib/libkimap.so
lib/libkimap.so.5
lib/libkimap.so.5.0.1
@@ -397,6 +670,9 @@ lib/libkmime.so.5.0.1
lib/libkpimidentities.so
lib/libkpimidentities.so.5
lib/libkpimidentities.so.5.0.1
+lib/libkpimtextedit.so
+lib/libkpimtextedit.so.5
+lib/libkpimtextedit.so.5.0.1
lib/libkpimutils.so
lib/libkpimutils.so.5
lib/libkpimutils.so.5.0.1
@@ -412,6 +688,9 @@ lib/libkxmlrpcclient.so.5.0.1
lib/libmailtransport.so
lib/libmailtransport.so.5
lib/libmailtransport.so.5.0.1
+lib/libmicroblog.so
+lib/libmicroblog.so.5
+lib/libmicroblog.so.5.0.1
lib/libqgpgme.so
lib/libqgpgme.so.1
lib/libqgpgme.so.1.0.1
@@ -430,6 +709,59 @@ share/apps/kabc/countrytransl.map
share/apps/kabc/formats/binary.desktop
share/apps/kconf_update/mailtransports.upd
share/apps/kconf_update/migrate-transports.pl
+share/apps/libkholidays/holiday_BelgiumDutch
+share/apps/libkholidays/holiday_BelgiumFrench
+share/apps/libkholidays/holiday_BelgiumWalloon
+share/apps/libkholidays/holiday_Suedtirol
+share/apps/libkholidays/holiday_ar
+share/apps/libkholidays/holiday_at
+share/apps/libkholidays/holiday_au
+share/apps/libkholidays/holiday_bavarian
+share/apps/libkholidays/holiday_bg
+share/apps/libkholidays/holiday_br
+share/apps/libkholidays/holiday_ca
+share/apps/libkholidays/holiday_catalan
+share/apps/libkholidays/holiday_ch
+share/apps/libkholidays/holiday_cl
+share/apps/libkholidays/holiday_co
+share/apps/libkholidays/holiday_cz
+share/apps/libkholidays/holiday_de
+share/apps/libkholidays/holiday_dk
+share/apps/libkholidays/holiday_ee
+share/apps/libkholidays/holiday_es
+share/apps/libkholidays/holiday_fi
+share/apps/libkholidays/holiday_fr
+share/apps/libkholidays/holiday_frswiss
+share/apps/libkholidays/holiday_gb
+share/apps/libkholidays/holiday_gr
+share/apps/libkholidays/holiday_gt
+share/apps/libkholidays/holiday_hu
+share/apps/libkholidays/holiday_ie
+share/apps/libkholidays/holiday_il
+share/apps/libkholidays/holiday_in
+share/apps/libkholidays/holiday_is
+share/apps/libkholidays/holiday_it
+share/apps/libkholidays/holiday_jm
+share/apps/libkholidays/holiday_jp
+share/apps/libkholidays/holiday_lt
+share/apps/libkholidays/holiday_mx
+share/apps/libkholidays/holiday_nl
+share/apps/libkholidays/holiday_no
+share/apps/libkholidays/holiday_nz
+share/apps/libkholidays/holiday_pl
+share/apps/libkholidays/holiday_pt
+share/apps/libkholidays/holiday_py
+share/apps/libkholidays/holiday_quebec
+share/apps/libkholidays/holiday_ro
+share/apps/libkholidays/holiday_ru
+share/apps/libkholidays/holiday_se
+share/apps/libkholidays/holiday_si
+share/apps/libkholidays/holiday_sk
+share/apps/libkholidays/holiday_th
+share/apps/libkholidays/holiday_ua
+share/apps/libkholidays/holiday_us
+share/apps/libkholidays/holiday_uy
+share/apps/libkholidays/holiday_za
share/config.kcfg/mailtransport.kcfg
share/dbus-1/interfaces/org.kde.KResourcesManager.xml
share/dbus-1/interfaces/org.kde.pim.IdentityManager.xml
@@ -475,12 +807,17 @@ share/kde4/services/smtp.protocol
share/kde4/services/smtps.protocol
share/kde4/servicetypes/kresources_manager.desktop
share/kde4/servicetypes/kresources_plugin.desktop
+share/mime/application/x-vnd.kde.contactgroup.xml
+share/mime/packages/kdepimlibs-mime.xml
@dirrm share/doc/HTML/en/kioslave/smtp
@dirrm share/doc/HTML/en/kioslave/pop3
@dirrm share/doc/HTML/en/kioslave/nntp
@dirrm share/doc/HTML/en/kioslave/ldap
@dirrm share/doc/HTML/en/kioslave/imap
@dirrm share/doc/HTML/en/kcontrol/kresources
+@dirrm share/apps/libkholidays
+@dirrmtry share/apps/cmake/modules
+@dirrmtry share/apps/cmake
@dirrm share/apps/akonadi-kde
@dirrm lib/gpgmepp
@dirrm lib/KdepimLibs/cmake
@@ -490,15 +827,18 @@ share/kde4/servicetypes/kresources_plugin.desktop
@dirrm include/syndication/atom
@dirrm include/syndication
@dirrm include/qgpgme
+@dirrm include/microblog
@dirrm include/mailtransport
@dirrm include/kxmlrpcclient
@dirrm include/ktnef
@dirrm include/kresources
@dirrm include/kpimutils
+@dirrm include/kpimtextedit
@dirrm include/kpimidentities
@dirrm include/kmime
@dirrm include/kldap
@dirrm include/kimap
+@dirrm include/kholidays
@dirrm include/kcal
@dirrm include/kblog
@dirrm include/kabc
@@ -508,3 +848,15 @@ share/kde4/servicetypes/kresources_plugin.desktop
@dirrm include/akonadi/kmime
@dirrm include/akonadi/kabc
@dirrmtry include/akonadi
+@dirrm include/KDE/Syndication
+@dirrm include/KDE/KResources
+@dirrm include/KDE/KPIMUtils
+@dirrm include/KDE/KPIMTextEdit
+@dirrm include/KDE/KPIMIdentities
+@dirrm include/KDE/KLDAP
+@dirrm include/KDE/KHolidays
+@dirrm include/KDE/KCal
+@dirrm include/KDE/KBlog
+@dirrm include/KDE/KABC
+@dirrm include/KDE/Akonadi
+@dirrm include/KDE
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 9780b47c3374..691e35f724f7 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -7,7 +7,6 @@
PORTNAME= kdeplasma-addons
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,17 +15,27 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@freebsd.org
COMMENT= Extra plasmoids for KDE4
+BUILD_DEPENDS= eigen>=2.0.b3:${PORTSDIR}/math/eigen2
+LIB_DEPENDS= marblewidget.5:${PORTSDIR}/misc/kdeedu4 \
+ kipi.6:${PORTSDIR}/graphics/kdegraphics4
+
USE_KDE4= kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
-QT_COMPONENTS= opengl webkit xml network \
+QT_COMPONENTS= corelib opengl dbus qt3support webkit \
+ designer network svg qtestlib xml \
qmake_build moc_build rcc_build uic_build
-MAKE_JOBS_UNSAFE= yes
+
+MAKE_JOBS_SAFE= yes
post-extract:
${MKDIR} ${WRKSRC}
+post-patch:
+ ${GREP} -H -r "#include <q" ${WRKSRC}/.. | ${CUT} -d: -f1 | uniq | \
+ ${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
+
pre-configure:
#respect prefix, don't update mime when installing
${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index b95a500f7614..326c23b9c709 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeplasma-addons-4.2.4.tar.bz2) = 8cd684126de488203f644bb59af60ac2
-SHA256 (KDE/kdeplasma-addons-4.2.4.tar.bz2) = 7bb882b61b6ccb8ac252417e890e3914f98f1406f89e78d58aa3b36564fcad97
-SIZE (KDE/kdeplasma-addons-4.2.4.tar.bz2) = 4277138
+MD5 (KDE/kdeplasma-addons-4.3.0.tar.bz2) = 74369a3346c95368a62dc5a1490ed886
+SHA256 (KDE/kdeplasma-addons-4.3.0.tar.bz2) = b469a20740239a547b7ae2833870a506872a4dc39eb35fdc3756e88e95b05483
+SIZE (KDE/kdeplasma-addons-4.3.0.tar.bz2) = 1458073
diff --git a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..01c63002bcf8
--- /dev/null
+++ b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
@@ -0,0 +1,28 @@
+--- ../CMakeLists.txt.orig 2009-04-06 07:00:39.000000000 +1100
++++ ../CMakeLists.txt 2009-06-26 11:00:58.000000000 +1100
+@@ -26,16 +26,20 @@
+ endif (DEPEND_PACKAGE_Marble)
+ macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.")
+
+-if (NEPOMUK_FOUND)
+- include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_INCLUDE_DIR} )
+-endif (NEPOMUK_FOUND)
+-
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+-include_directories (${KDE4_INCLUDES}
++INCLUDE_DIRECTORIES (${QT_QTGUI_INCLUDE_DIR}
++ ${QT_QTCORE_INCLUDE_DIR}
++ ${QT_QTXML_INCLUDE_DIR}
++ ${PHONON_INCLUDE_DIR}
++ ${KDE4_INCLUDES}
+ ${KDE4WORKSPACE_INCLUDE_DIR}
+ ${KDEPIMLIBS_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/libs)
+
++if (NEPOMUK_FOUND)
++ include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_INCLUDE_DIR} )
++endif (NEPOMUK_FOUND)
++
+ add_subdirectory(libs)
+ add_subdirectory(applets)
+ add_subdirectory(dataengines)
diff --git a/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt
new file mode 100644
index 000000000000..9f680c78f7f9
--- /dev/null
+++ b/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt
@@ -0,0 +1,24 @@
+--- ../applets/frame/CMakeLists.txt.orig 2009-05-15 04:26:59.000000000 +1100
++++ ../applets/frame/CMakeLists.txt 2009-06-26 10:37:04.000000000 +1100
+@@ -1,7 +1,20 @@
+ project(plasma-frame)
+ include (MacroLogFeature)
++include (FindPkgConfig)
++
++# Check for KExiv2
++PKG_CHECK_MODULES(LIBKEXIV2 libkexiv2-kde4>=0.5.0)
++FIND_PATH(KEXIV2_INCLUDE_DIR NAMES libkexiv2/version.h
++ PATHS ${LIBKEXIV2_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)
++FIND_LIBRARY(KEXIV2_LIBRARY NAMES kexiv2
++ PATHS ${LIBKEXIV2_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH)
++
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(KEXIV2 DEFAULT_MSG KEXIV2_LIBRARY KEXIV2_INCLUDE_DIR)
++
++IF(KEXIV2_FOUND)
++ SET(KEXIV2_LIBRARIES ${KEXIV2_LIBRARY})
++ENDIF(KEXIV2_FOUND)
+
+-macro_optional_find_package(Kexiv2)
+ macro_log_feature(KEXIV2_FOUND "libkexiv2" "Library to access EXIF information" "http://www.kde.org" FALSE "0.2.0" "RECOMENDED: Enables automatic rotation for frame applet" )
+
+ macro_display_feature_log()
diff --git a/deskutils/kdeplasma-addons/files/qt3to4headers.txt b/deskutils/kdeplasma-addons/files/qt3to4headers.txt
new file mode 100644
index 000000000000..75f06c344ce0
--- /dev/null
+++ b/deskutils/kdeplasma-addons/files/qt3to4headers.txt
@@ -0,0 +1,46 @@
+s/<q3dragobject.h>/<Q3DragObject>/g
+s/<q3frame.h>/<Q3Frame>/g
+s/<q3groupbox.h>/<Q3GroupBox>/g
+s/<q3hgroupbox.h>/<Q3HGroupBox>/g
+s/<q3listview.h>/<Q3ListView>/g
+s/<q3popupmenu.h>/<Q3PopupMenu>/g
+s/<q3process.h>/<Q3Process>/g
+s/<q3progressdialog.h>/<Q3ProgressDialog>/g
+s/<q3strlist.h>/<Q3StrList>/g
+s/<q3textview.h>/<Q3TextView>/g
+s/<q3vbox.h>/<Q3VBox>/g
+s/<q3vgroupbox.h>/<Q3VGroupBox>/g
+s/<qapplication.h>/<QApplication>/g
+s/<qbuttongroup.h>/<QButtonGroup>/g
+s/<qcheckbox.h>/<QCheckBox>/g
+s/<qcolor.h>/<QColor>/g
+s/<qcombobox.h>/<QComboBox>/g
+s/<qcursor.h>/<QCursor>/g
+s/<qdesktopwidget.h>/<QDesktopWidget>/g
+s/<qdir.h>/<QDir>/g
+s/<qevent.h>/<QEvent>/g
+s/<qfile.h>/<QFile>/g
+s/<qfileinfo.h>/<QFileInfo>/g
+s/<qfont.h>/<QFont>/g
+s/<qfontmetrics.h>/<QFontMetrics>/g
+s/<qgroupbox.h>/<QGroupBox>/g
+s/<qimage.h>/<QImage>/g
+s/<qlabel.h>/<QLabel>/g
+s/<qlayout.h>/<QLayout>/g
+s/<qlineedit.h>/<QLineEdit>/g
+s/<qmatrix.h>/<QMatrix>/g
+s/<qobject.h>/<QObject>/g
+s/<qpainter.h>/<QPainter>/g
+s/<qpalette.h>/<QPalette>/g
+s/<qpixmap.h>/<QPixmap>/g
+s/<qpointer.h>/<QPointer>/g
+s/<qpushbutton.h>/<QPushButton>/g
+s/<qradiobutton.h>/<QRadioButton>/g
+s/<qregexp.h>/<QRegExp>/g
+s/<qspinbox.h>/<QSpinBox>/g
+s/<qstring.h>/<QString>/g
+s/<qtextcodec.h>/<QTextCodec>/g
+s/<qtextstream.h>/<QTextStream>/g
+s/<qtimer.h>/<QTimer>/g
+s/<qtooltip.h>/<QToolTip>/g
+s/<qwidget.h>/<QWidget>/g
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist
index 780ec760b056..75dd4a649ef8 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@@ -1,20 +1,31 @@
bin/lancelot
+include/conversion/converter.h
+include/conversion/plasmaconversion_export.h
+include/conversion/unit.h
+include/conversion/unitcategory.h
+include/conversion/value.h
include/lancelot/Global.h
include/lancelot/lancelot.h
include/lancelot/lancelot_export.h
include/lancelot/layouts/CardLayout.h
include/lancelot/layouts/ColumnLayout.h
-include/lancelot/models/ActionListViewModels.h
-include/lancelot/models/PassagewayViewModels.h
+include/lancelot/models/ActionListModel.h
+include/lancelot/models/ActionTreeModel.h
+include/lancelot/models/ActionTreeModelProxy.h
+include/lancelot/models/MergedActionListModel.h
+include/lancelot/models/PlasmaServiceListModel.h
+include/lancelot/models/StandardActionListModel.h
+include/lancelot/models/StandardActionTreeModel.h
include/lancelot/widgets/ActionListView.h
include/lancelot/widgets/BasicWidget.h
include/lancelot/widgets/ExtenderButton.h
include/lancelot/widgets/HoverIcon.h
include/lancelot/widgets/Panel.h
include/lancelot/widgets/PassagewayView.h
+include/lancelot/widgets/PopupList.h
+include/lancelot/widgets/PopupMenu.h
include/lancelot/widgets/ResizeBordersPanel.h
include/lancelot/widgets/Widget.h
-include/lancelot/widgets/WidgetPositioner.h
lib/kde4/kcm_krunner_spellcheck.so
lib/kde4/krunner_browserhistory.so
lib/kde4/krunner_contacts.so
@@ -23,9 +34,10 @@ lib/kde4/krunner_katesessions.so
lib/kde4/krunner_konquerorsessions.so
lib/kde4/krunner_konsolesessions.so
lib/kde4/krunner_spellcheckrunner.so
+lib/kde4/plasma-applet_systemloadviewer.so
lib/kde4/plasma_applet_bball.so
lib/kde4/plasma_applet_binaryclock.so
-lib/kde4/plasma_applet_bluemarble.so
+lib/kde4/plasma_applet_bubblemon.so
lib/kde4/plasma_applet_calculator.so
lib/kde4/plasma_applet_charselect.so
lib/kde4/plasma_applet_comic.so
@@ -44,101 +56,118 @@ lib/kde4/plasma_applet_lancelot_part.so
lib/kde4/plasma_applet_leavenote.so
lib/kde4/plasma_applet_life.so
lib/kde4/plasma_applet_luna.so
+lib/kde4/plasma_applet_magnifique.so
+lib/kde4/plasma_applet_mediaplayer.so
+lib/kde4/plasma_applet_microblog.so
lib/kde4/plasma_applet_news.so
lib/kde4/plasma_applet_notes.so
lib/kde4/plasma_applet_nowplaying.so
+lib/kde4/plasma_applet_opendesktop.so
lib/kde4/plasma_applet_paste.so
lib/kde4/plasma_applet_pastebin.so
lib/kde4/plasma_applet_previewer.so
lib/kde4/plasma_applet_rssnow.so
+lib/kde4/plasma_applet_rtm.so
lib/kde4/plasma_applet_showdashboard.so
lib/kde4/plasma_applet_showdesktop.so
lib/kde4/plasma_applet_timer.so
-lib/kde4/plasma_applet_twitter.so
+lib/kde4/plasma_applet_unitconverter.so
+lib/kde4/plasma_applet_weather.so
lib/kde4/plasma_applet_weatherstation.so
lib/kde4/plasma_comic_krossprovider.so
lib/kde4/plasma_engine_comic.so
-lib/kde4/plasma_engine_twitter.so
+lib/kde4/plasma_engine_microblog.so
+lib/kde4/plasma_engine_ocs.so
+lib/kde4/plasma_engine_potd.so
+lib/kde4/plasma_engine_rtm.so
lib/kde4/plasma_packagestructure_comic.so
+lib/kde4/plasma_potd_apodprovider.so
+lib/kde4/plasma_potd_epodprovider.so
+lib/kde4/plasma_potd_flickrprovider.so
+lib/kde4/plasma_potd_oseiprovider.so
+lib/kde4/plasma_potd_wcpotdprovider.so
+lib/kde4/plasma_wallpaper_mandelbrot.so
+lib/kde4/plasma_wallpaper_marble.so
+lib/kde4/plasma_wallpaper_pattern.so
+lib/kde4/plasma_wallpaper_virus.so
+lib/kde4/plasma_wallpaper_weather.so
+lib/libconversion.so
+lib/libconversion.so.5
+lib/libconversion.so.5.0.1
lib/liblancelot.so
lib/liblancelot.so.0
-lib/liblancelot.so.0.5.0
+lib/liblancelot.so.0.7.0
+lib/libocsclient.so
+lib/libocsclient.so.5
+lib/libocsclient.so.5.0.1
lib/libplasmacomicprovidercore.so
lib/libplasmacomicprovidercore.so.1
lib/libplasmacomicprovidercore.so.1.0.0
-lib/libplasmaconverter.so
-lib/libplasmaconverter.so.5
-lib/libplasmaconverter.so.5.0.1
+lib/libplasmapotdprovidercore.so
+lib/libplasmapotdprovidercore.so.1
+lib/libplasmapotdprovidercore.so.1.0.0
+lib/libplasmaweather.so
+lib/libplasmaweather.so.5
+lib/libplasmaweather.so.5.0.1
+lib/librtm.so
+lib/librtm.so.5
+lib/librtm.so.5.0.1
share/apps/bball/bball.svgz
share/apps/bball/bounce.ogg
share/apps/bball/football.svgz
-share/apps/desktoptheme/Aya/lancelot/main-background.svgz
+share/apps/cmake/modules/FindConversion.cmake
+share/apps/desktoptheme/Aya/lancelot/action-list-view-categories-applet.svgz
+share/apps/desktoptheme/Aya/lancelot/action-list-view-categories-extender.svgz
+share/apps/desktoptheme/Aya/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/Aya/lancelot/action-list-view-headers-plasma-applet.svgz
+share/apps/desktoptheme/Aya/lancelot/action-list-view-headers.svgz
+share/apps/desktoptheme/Aya/lancelot/action-list-view-items-extender.svgz
+share/apps/desktoptheme/Aya/lancelot/action-list-view-items.svgz
+share/apps/desktoptheme/Aya/lancelot/inner-background.svgz
share/apps/desktoptheme/Aya/lancelot/passageway-view-buttons-extender.svgz
share/apps/desktoptheme/Aya/lancelot/passageway-view-buttons.svgz
share/apps/desktoptheme/Aya/lancelot/passageway-view-inactivebuttons.svgz
share/apps/desktoptheme/Aya/lancelot/passageway-view-spacer.svgz
-share/apps/desktoptheme/Aya/lancelot/plasma-theme.config
share/apps/desktoptheme/Aya/lancelot/section-buttons.svgz
share/apps/desktoptheme/Aya/lancelot/system-buttons-extender.svgz
share/apps/desktoptheme/Aya/lancelot/system-buttons.svgz
share/apps/desktoptheme/Aya/lancelot/theme.config
-share/apps/desktoptheme/Elegance/lancelot/action-list-view-categories-extender.svgz
-share/apps/desktoptheme/Elegance/lancelot/action-list-view-categories.svgz
-share/apps/desktoptheme/Elegance/lancelot/action-list-view-items-extender.svgz
-share/apps/desktoptheme/Elegance/lancelot/action-list-view-items.svgz
-share/apps/desktoptheme/Elegance/lancelot/main-background.svgz
-share/apps/desktoptheme/Elegance/lancelot/passageway-view-buttons-extender.svgz
-share/apps/desktoptheme/Elegance/lancelot/passageway-view-buttons.svgz
-share/apps/desktoptheme/Elegance/lancelot/passageway-view-inactivebuttons.svgz
-share/apps/desktoptheme/Elegance/lancelot/passageway-view-spacer.svgz
-share/apps/desktoptheme/Elegance/lancelot/plasma-theme.config
-share/apps/desktoptheme/Elegance/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Elegance/lancelot/inner-background.svgz
share/apps/desktoptheme/Elegance/lancelot/system-buttons.svgz
share/apps/desktoptheme/Elegance/lancelot/theme.config
+share/apps/desktoptheme/Silicon/lancelot/action-list-view-categories-applet.svgz
share/apps/desktoptheme/Silicon/lancelot/action-list-view-categories-extender.svgz
share/apps/desktoptheme/Silicon/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/Silicon/lancelot/action-list-view-headers-plasma-applet.svgz
+share/apps/desktoptheme/Silicon/lancelot/action-list-view-headers.svgz
share/apps/desktoptheme/Silicon/lancelot/action-list-view-items-extender.svgz
share/apps/desktoptheme/Silicon/lancelot/action-list-view-items.svgz
-share/apps/desktoptheme/Silicon/lancelot/main-background.svgz
+share/apps/desktoptheme/Silicon/lancelot/extender-button-icon.svgz
+share/apps/desktoptheme/Silicon/lancelot/inner-background.svgz
+share/apps/desktoptheme/Silicon/lancelot/lancelot-context-extender.svgz
+share/apps/desktoptheme/Silicon/lancelot/lancelot-context.svgz
share/apps/desktoptheme/Silicon/lancelot/passageway-view-buttons-extender.svgz
share/apps/desktoptheme/Silicon/lancelot/passageway-view-buttons.svgz
share/apps/desktoptheme/Silicon/lancelot/passageway-view-inactivebuttons.svgz
share/apps/desktoptheme/Silicon/lancelot/passageway-view-spacer.svgz
-share/apps/desktoptheme/Silicon/lancelot/plasma-theme.config
share/apps/desktoptheme/Silicon/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Silicon/lancelot/system-buttons-extender.svgz
share/apps/desktoptheme/Silicon/lancelot/system-buttons.svgz
share/apps/desktoptheme/Silicon/lancelot/theme.config
+share/apps/desktoptheme/default/bubblemon/bubble.svg
+share/apps/desktoptheme/default/fifteenPuzzle/greensquare.svgz
share/apps/desktoptheme/default/lancelot/action-list-view-categories-extender.svgz
share/apps/desktoptheme/default/lancelot/action-list-view-categories.svgz
-share/apps/desktoptheme/default/lancelot/action-list-view-headers-plasma-applet.svgz
share/apps/desktoptheme/default/lancelot/action-list-view-headers.svgz
share/apps/desktoptheme/default/lancelot/action-list-view-items-extender.svgz
share/apps/desktoptheme/default/lancelot/action-list-view-items.svgz
-share/apps/desktoptheme/default/lancelot/action-list-view-scroll-down-plasma-applet.svgz
-share/apps/desktoptheme/default/lancelot/action-list-view-scroll-down.svgz
-share/apps/desktoptheme/default/lancelot/action-list-view-scroll-up-plasma-applet.svgz
-share/apps/desktoptheme/default/lancelot/action-list-view-scroll-up.svgz
share/apps/desktoptheme/default/lancelot/extender-button-icon.svgz
share/apps/desktoptheme/default/lancelot/inner-background.svgz
-share/apps/desktoptheme/default/lancelot/lancelot-context-extender.svgz
-share/apps/desktoptheme/default/lancelot/lancelot-context.svgz
share/apps/desktoptheme/default/lancelot/main-background.svgz
share/apps/desktoptheme/default/lancelot/passageway-view-buttons-extender.svgz
share/apps/desktoptheme/default/lancelot/passageway-view-buttons.svgz
share/apps/desktoptheme/default/lancelot/passageway-view-inactivebuttons.svgz
share/apps/desktoptheme/default/lancelot/passageway-view-spacer.svgz
-share/apps/desktoptheme/default/lancelot/plasma-theme.config
-share/apps/desktoptheme/default/lancelot/scroll-bar-background-bar-down.svgz
-share/apps/desktoptheme/default/lancelot/scroll-bar-background-bar-left.svgz
-share/apps/desktoptheme/default/lancelot/scroll-bar-background-bar-right.svgz
-share/apps/desktoptheme/default/lancelot/scroll-bar-background-bar-up.svgz
-share/apps/desktoptheme/default/lancelot/scroll-bar-background.svgz
-share/apps/desktoptheme/default/lancelot/scroll-bar-button-down-icon.svgz
-share/apps/desktoptheme/default/lancelot/scroll-bar-button-left-icon.svgz
-share/apps/desktoptheme/default/lancelot/scroll-bar-button-right-icon.svgz
-share/apps/desktoptheme/default/lancelot/scroll-bar-button-up-icon.svgz
-share/apps/desktoptheme/default/lancelot/scroll-bar-handle-horizontal.svgz
-share/apps/desktoptheme/default/lancelot/scroll-bar-handle-vertical.svgz
share/apps/desktoptheme/default/lancelot/section-buttons.svgz
share/apps/desktoptheme/default/lancelot/system-buttons-extender.svgz
share/apps/desktoptheme/default/lancelot/system-buttons.svgz
@@ -148,79 +177,139 @@ share/apps/desktoptheme/default/rssnow/left.svgz
share/apps/desktoptheme/default/rssnow/right.svgz
share/apps/desktoptheme/default/rssnow/rssnow.svgz
share/apps/desktoptheme/default/stylesheets/news.css
+share/apps/desktoptheme/default/weather/wind-arrows.svgz
share/apps/desktoptheme/default/weatherstation/lcd.svgz
share/apps/desktoptheme/default/weatherstation/lcd_panel.svgz
-share/apps/desktoptheme/default/widgets/eyes.svgz
+share/apps/desktoptheme/default/widgets/eyes.svg
share/apps/desktoptheme/default/widgets/luna.svgz
+share/apps/desktoptheme/default/widgets/microblog.svgz
share/apps/desktoptheme/default/widgets/notes.svgz
share/apps/desktoptheme/default/widgets/picture-frame-default.svgz
share/apps/desktoptheme/default/widgets/previewer-16.svgz
share/apps/desktoptheme/default/widgets/previewer-22.svgz
share/apps/desktoptheme/default/widgets/timer.svgz
-share/apps/desktoptheme/default/widgets/twitter.svgz
+share/apps/desktoptheme/heron/lancelot/action-list-view-categories-applet.svgz
share/apps/desktoptheme/heron/lancelot/action-list-view-categories-extender.svgz
share/apps/desktoptheme/heron/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/heron/lancelot/action-list-view-headers-plasma-applet.svgz
+share/apps/desktoptheme/heron/lancelot/action-list-view-headers.svgz
share/apps/desktoptheme/heron/lancelot/action-list-view-items-extender.svgz
share/apps/desktoptheme/heron/lancelot/action-list-view-items.svgz
-share/apps/desktoptheme/heron/lancelot/main-background.svgz
+share/apps/desktoptheme/heron/lancelot/extender-button-icon.svgz
+share/apps/desktoptheme/heron/lancelot/inner-background.svgz
+share/apps/desktoptheme/heron/lancelot/lancelot-context-extender.svgz
+share/apps/desktoptheme/heron/lancelot/lancelot-context.svgz
share/apps/desktoptheme/heron/lancelot/passageway-view-buttons-extender.svgz
share/apps/desktoptheme/heron/lancelot/passageway-view-buttons.svgz
share/apps/desktoptheme/heron/lancelot/passageway-view-inactivebuttons.svgz
share/apps/desktoptheme/heron/lancelot/passageway-view-spacer.svgz
-share/apps/desktoptheme/heron/lancelot/plasma-theme.config
share/apps/desktoptheme/heron/lancelot/section-buttons.svgz
+share/apps/desktoptheme/heron/lancelot/system-buttons-extender.svgz
share/apps/desktoptheme/heron/lancelot/system-buttons.svgz
share/apps/desktoptheme/heron/lancelot/theme.config
+share/apps/desktoptheme/oxygen/lancelot/action-list-view-categories-applet.svgz
+share/apps/desktoptheme/oxygen/lancelot/action-list-view-categories-extender.svgz
+share/apps/desktoptheme/oxygen/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/oxygen/lancelot/action-list-view-headers-plasma-applet.svgz
+share/apps/desktoptheme/oxygen/lancelot/action-list-view-headers.svgz
+share/apps/desktoptheme/oxygen/lancelot/action-list-view-items-extender.svgz
+share/apps/desktoptheme/oxygen/lancelot/action-list-view-items.svgz
+share/apps/desktoptheme/oxygen/lancelot/extender-button-icon.svgz
+share/apps/desktoptheme/oxygen/lancelot/inner-background.svgz
+share/apps/desktoptheme/oxygen/lancelot/lancelot-context-extender.svgz
+share/apps/desktoptheme/oxygen/lancelot/lancelot-context.svgz
+share/apps/desktoptheme/oxygen/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/oxygen/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/oxygen/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/oxygen/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/oxygen/lancelot/section-buttons.svgz
+share/apps/desktoptheme/oxygen/lancelot/system-buttons-extender.svgz
+share/apps/desktoptheme/oxygen/lancelot/system-buttons.svgz
+share/apps/desktoptheme/oxygen/lancelot/theme.config
+share/apps/desktoptheme/slim-glow/lancelot/action-list-view-categories-applet.svgz
share/apps/desktoptheme/slim-glow/lancelot/action-list-view-categories-extender.svgz
share/apps/desktoptheme/slim-glow/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/slim-glow/lancelot/action-list-view-headers-plasma-applet.svgz
+share/apps/desktoptheme/slim-glow/lancelot/action-list-view-headers.svgz
share/apps/desktoptheme/slim-glow/lancelot/action-list-view-items-extender.svgz
share/apps/desktoptheme/slim-glow/lancelot/action-list-view-items.svgz
-share/apps/desktoptheme/slim-glow/lancelot/main-background.svgz
+share/apps/desktoptheme/slim-glow/lancelot/extender-button-icon.svgz
+share/apps/desktoptheme/slim-glow/lancelot/inner-background.svgz
+share/apps/desktoptheme/slim-glow/lancelot/lancelot-context-extender.svgz
+share/apps/desktoptheme/slim-glow/lancelot/lancelot-context.svgz
share/apps/desktoptheme/slim-glow/lancelot/passageway-view-buttons-extender.svgz
share/apps/desktoptheme/slim-glow/lancelot/passageway-view-buttons.svgz
share/apps/desktoptheme/slim-glow/lancelot/passageway-view-inactivebuttons.svgz
share/apps/desktoptheme/slim-glow/lancelot/passageway-view-spacer.svgz
-share/apps/desktoptheme/slim-glow/lancelot/plasma-theme.config
share/apps/desktoptheme/slim-glow/lancelot/section-buttons.svgz
+share/apps/desktoptheme/slim-glow/lancelot/system-buttons-extender.svgz
+share/apps/desktoptheme/slim-glow/lancelot/system-buttons.svgz
share/apps/desktoptheme/slim-glow/lancelot/theme.config
-share/apps/plasma-bluemarble/atmosphere.frag
-share/apps/plasma-bluemarble/atmosphere.vert
-share/apps/plasma-bluemarble/earth-night.png
-share/apps/plasma-bluemarble/earth.frag
-share/apps/plasma-bluemarble/earth.png
-share/apps/plasma-bluemarble/earth.vert
+share/apps/lancelot/lancelot.notifyrc
+share/apps/plasma-applet-opendesktop/user.css
+share/apps/plasma/services/rtmauth.operations
+share/apps/plasma/services/rtmtask.operations
+share/apps/plasma/services/rtmtasks.operations
share/apps/plasma/services/tweet.operations
+share/apps/plasma_pastebin/plasma_pastebin.notifyrc
+share/apps/plasma_wallpaper_pattern/patterns/fish.desktop
+share/apps/plasma_wallpaper_pattern/patterns/fish.png
+share/apps/plasma_wallpaper_pattern/patterns/flowers.desktop
+share/apps/plasma_wallpaper_pattern/patterns/flowers.png
+share/apps/plasma_wallpaper_pattern/patterns/night-rock.desktop
+share/apps/plasma_wallpaper_pattern/patterns/night-rock.jpg
+share/apps/plasma_wallpaper_pattern/patterns/pavement.desktop
+share/apps/plasma_wallpaper_pattern/patterns/pavement.png
+share/apps/plasma_wallpaper_pattern/patterns/rattan.desktop
+share/apps/plasma_wallpaper_pattern/patterns/rattan.png
+share/apps/plasma_wallpaper_pattern/patterns/stonewall2.desktop
+share/apps/plasma_wallpaper_pattern/patterns/stonewall2.png
+share/apps/plasma_wallpaper_pattern/patterns/triangles.desktop
+share/apps/plasma_wallpaper_pattern/patterns/triangles.png
+share/apps/plasma_wallpaper_pattern/patterns/xeroxstar.desktop
+share/apps/plasma_wallpaper_pattern/patterns/xeroxstar.png
share/apps/rssnow/feeds
share/config/comic.knsrc
+share/config/virus_wallpaper.knsrc
share/dbus-1/services/org.kde.lancelot.service
+share/icons/hicolor/128x128/apps/bball.png
share/icons/hicolor/128x128/apps/lancelot-part.png
share/icons/hicolor/128x128/apps/lancelot.png
share/icons/hicolor/128x128/apps/previewer.png
+share/icons/hicolor/16x16/apps/bball.png
share/icons/hicolor/16x16/apps/lancelot-part.png
share/icons/hicolor/16x16/apps/lancelot.png
share/icons/hicolor/16x16/apps/previewer.png
share/icons/hicolor/22x22/apps/lancelot-part.png
share/icons/hicolor/22x22/apps/lancelot.png
share/icons/hicolor/22x22/apps/previewer.png
+share/icons/hicolor/32x32/apps/bball.png
share/icons/hicolor/32x32/apps/lancelot-part.png
share/icons/hicolor/32x32/apps/lancelot.png
share/icons/hicolor/32x32/apps/previewer.png
+share/icons/hicolor/48x48/apps/bball.png
share/icons/hicolor/48x48/apps/lancelot-part.png
share/icons/hicolor/48x48/apps/lancelot.png
share/icons/hicolor/48x48/apps/previewer.png
+share/icons/hicolor/64x64/apps/bball.png
share/icons/hicolor/64x64/apps/lancelot-part.png
share/icons/hicolor/64x64/apps/lancelot.png
share/icons/hicolor/64x64/apps/previewer.png
+share/icons/hicolor/scalable/apps/bball.svgz
share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
-share/icons/oxygen/scalable/apps/bball.svgz
+share/icons/oxygen/scalable/apps/accessories-dictionary.svgz
share/kde4/services/ServiceMenus/preview.desktop
+share/kde4/services/apodprovider.desktop
share/kde4/services/browserhistory.desktop
+share/kde4/services/epodprovider.desktop
+share/kde4/services/flickrprovider.desktop
share/kde4/services/katesessions.desktop
share/kde4/services/konquerorsessions.desktop
share/kde4/services/konsolesessions.desktop
+share/kde4/services/oseiprovider.desktop
share/kde4/services/plasma-applet-bball.desktop
share/kde4/services/plasma-applet-binaryclock.desktop
-share/kde4/services/plasma-applet-bluemarble.desktop
+share/kde4/services/plasma-applet-bubblemon.desktop
share/kde4/services/plasma-applet-calculator.desktop
share/kde4/services/plasma-applet-charselect.desktop
share/kde4/services/plasma-applet-eyes.desktop
@@ -233,21 +322,32 @@ share/kde4/services/plasma-applet-lancelot-part.desktop
share/kde4/services/plasma-applet-leavenote.desktop
share/kde4/services/plasma-applet-life.desktop
share/kde4/services/plasma-applet-luna.desktop
+share/kde4/services/plasma-applet-magnifique.desktop
+share/kde4/services/plasma-applet-mediaplayer.desktop
+share/kde4/services/plasma-applet-microblog.desktop
share/kde4/services/plasma-applet-news.desktop
share/kde4/services/plasma-applet-nowplaying.desktop
+share/kde4/services/plasma-applet-opendesktop.desktop
share/kde4/services/plasma-applet-paste.desktop
share/kde4/services/plasma-applet-pastebin.desktop
share/kde4/services/plasma-applet-previewer.desktop
+share/kde4/services/plasma-applet-rememberthemilk.desktop
share/kde4/services/plasma-applet-rssnow.desktop
share/kde4/services/plasma-applet-showdashboard.desktop
share/kde4/services/plasma-applet-showdesktop.desktop
+share/kde4/services/plasma-applet-systemloadviewer.desktop
share/kde4/services/plasma-applet-timer.desktop
+share/kde4/services/plasma-applet-unitconverter.desktop
+share/kde4/services/plasma-applet-weather.desktop
share/kde4/services/plasma-applet-weatherstation.desktop
share/kde4/services/plasma-clock-fuzzy.desktop
share/kde4/services/plasma-comic-default.desktop
share/kde4/services/plasma-dataengine-comic.desktop
-share/kde4/services/plasma-dataengine-twitter.desktop
+share/kde4/services/plasma-dataengine-microblog.desktop
+share/kde4/services/plasma-dataengine-ocs.desktop
+share/kde4/services/plasma-dataengine-potd.desktop
share/kde4/services/plasma-dict-default.desktop
+share/kde4/services/plasma-engine-rtm.desktop
share/kde4/services/plasma-fileWatcher-default.desktop
share/kde4/services/plasma-frame-default.desktop
share/kde4/services/plasma-kolourpicker-default.desktop
@@ -257,30 +357,48 @@ share/kde4/services/plasma-runner-contacts.desktop
share/kde4/services/plasma-runner-converter.desktop
share/kde4/services/plasma-runner-spellchecker.desktop
share/kde4/services/plasma-runner-spellchecker_config.desktop
-share/kde4/services/plasma-twitter-default.desktop
+share/kde4/services/plasma-wallpaper-mandelbrot.desktop
+share/kde4/services/plasma-wallpaper-marble.desktop
+share/kde4/services/plasma-wallpaper-pattern.desktop
+share/kde4/services/plasma-wallpaper-virus.desktop
+share/kde4/services/plasma-wallpaper-weather.desktop
+share/kde4/services/wcpotdprovider.desktop
share/kde4/servicetypes/plasma_comicprovider.desktop
+share/kde4/servicetypes/plasma_potdprovider.desktop
share/mime/packages/lancelotpart-mime.xml
-share/mime/text/x-lancelotpart.xml
@dirrm share/apps/rssnow
-@dirrm share/apps/plasma-bluemarble
+@dirrm share/apps/plasma_wallpaper_pattern/patterns
+@dirrm share/apps/plasma_wallpaper_pattern
+@dirrm share/apps/plasma_pastebin
+@dirrm share/apps/plasma-applet-opendesktop
+@dirrm share/apps/lancelot
@dirrm share/apps/desktoptheme/slim-glow/lancelot
-@dirrm share/apps/desktoptheme/slim-glow
+@dirrmtry share/apps/desktoptheme/slim-glow
+@dirrm share/apps/desktoptheme/oxygen/lancelot
+@dirrmtry share/apps/desktoptheme/oxygen
@dirrm share/apps/desktoptheme/heron/lancelot
-@dirrm share/apps/desktoptheme/heron
+@dirrmtry share/apps/desktoptheme/heron
@dirrm share/apps/desktoptheme/default/weatherstation
+@dirrm share/apps/desktoptheme/default/weather
@dirrm share/apps/desktoptheme/default/stylesheets
@dirrm share/apps/desktoptheme/default/rssnow
@dirrm share/apps/desktoptheme/default/lancelot
+@dirrm share/apps/desktoptheme/default/fifteenPuzzle
+@dirrm share/apps/desktoptheme/default/bubblemon
@dirrm share/apps/desktoptheme/Silicon/lancelot
-@dirrm share/apps/desktoptheme/Silicon
+@dirrmtry share/apps/desktoptheme/Silicon
@dirrm share/apps/desktoptheme/Elegance/lancelot
-@dirrm share/apps/desktoptheme/Elegance
+@dirrmtry share/apps/desktoptheme/Elegance
+@dirrmtry share/apps/desktoptheme/Clean-Bend
@dirrm share/apps/desktoptheme/Aya/lancelot
-@dirrm share/apps/desktoptheme/Aya
+@dirrmtry share/apps/desktoptheme/Aya
+@dirrmtry share/apps/cmake/modules
+@dirrmtry share/apps/cmake
@dirrm share/apps/bball
@dirrm include/lancelot/widgets
@dirrm include/lancelot/models
@dirrm include/lancelot/layouts
@dirrm include/lancelot
+@dirrm include/conversion
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true