summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authormarkd <markd>2013-04-03 10:51:43 +0000
committermarkd <markd>2013-04-03 10:51:43 +0000
commit9c5284ae3f61b41bf8a9ce6dcffee83f703b98cf (patch)
tree1618b7df1711bf0e3e2a34e61f4e833db5c497aa /x11
parent582804a8474d49a0972b6c71a298148f9c194d0f (diff)
downloadpkgsrc-9c5284ae3f61b41bf8a9ce6dcffee83f703b98cf.tar.gz
Update to KDE SC 4.10.2
bugfixes, other quality improvements, new and improved KDE Applications
Diffstat (limited to 'x11')
-rw-r--r--x11/kactivities/Makefile4
-rw-r--r--x11/kactivities/PLIST49
-rw-r--r--x11/kactivities/distinfo8
-rw-r--r--x11/kde-baseapps4/Makefile6
-rw-r--r--x11/kde-baseapps4/PLIST20
-rw-r--r--x11/kde-baseapps4/distinfo8
-rw-r--r--x11/kde-runtime4/Makefile12
-rw-r--r--x11/kde-runtime4/PLIST188
-rw-r--r--x11/kde-runtime4/distinfo8
-rw-r--r--x11/kde-workspace4/Makefile9
-rw-r--r--x11/kde-workspace4/PLIST350
-rw-r--r--x11/kde-workspace4/distinfo14
-rw-r--r--x11/kde-workspace4/patches/patch-ksysguard_ksysguard_FreeBSD_ProcessList.c10
-rw-r--r--x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp22
-rw-r--r--x11/kde-workspace4/patches/patch-startkde.cmake14
-rw-r--r--x11/kdelibs4/Makefile8
-rw-r--r--x11/kdelibs4/PLIST130
-rw-r--r--x11/kdelibs4/distinfo13
-rw-r--r--x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake19
-rw-r--r--x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt16
-rw-r--r--x11/kdelibs4/patches/patch-kparts_componentfactory.h13
-rw-r--r--x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp15
-rw-r--r--x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp16
-rw-r--r--x11/konsole/Makefile3
-rw-r--r--x11/konsole/PLIST14
-rw-r--r--x11/konsole/distinfo10
-rw-r--r--x11/konsole/patches/patch-src_ProcessInfo.cpp20
-rw-r--r--x11/py-kde4/Makefile8
-rw-r--r--x11/py-kde4/PLIST9
-rw-r--r--x11/py-kde4/distinfo11
-rw-r--r--x11/py-kde4/patches/patch-CMakeLists.txt27
-rw-r--r--x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip84
32 files changed, 610 insertions, 528 deletions
diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index 91d4607d729..806c0dff504 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:19:53 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:45 markd Exp $
DISTNAME= kactivities-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= x11
COMMENT= KDE Activity Manager
@@ -10,5 +9,6 @@ COMMENT= KDE Activity Manager
PKGCONFIG_OVERRIDE+= lib/libkactivities.pc.cmake
.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kactivities/PLIST b/x11/kactivities/PLIST
index 9a4595bb387..1b2cb78cf6c 100644
--- a/x11/kactivities/PLIST
+++ b/x11/kactivities/PLIST
@@ -1,30 +1,63 @@
-@comment $NetBSD: PLIST,v 1.2 2012/06/16 04:45:38 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/04/03 10:51:45 markd Exp $
bin/kactivitymanagerd
include/KDE/KActivities/Consumer
include/KDE/KActivities/Controller
include/KDE/KActivities/Info
+include/KDE/KActivities/Models/ActivityModel
+include/KDE/KActivities/Models/ResourceModel
include/KDE/KActivities/ResourceInstance
+include/kactivities-models/activitymodel.h
+include/kactivities-models/kactivities_models_export.h
+include/kactivities-models/resourcemodel.h
include/kactivities/consumer.h
include/kactivities/controller.h
include/kactivities/info.h
include/kactivities/kactivities_export.h
include/kactivities/resourceinstance.h
+lib/cmake/KActivities-Models/KActivities-ModelsConfig.cmake
+lib/cmake/KActivities-Models/KActivities-ModelsConfigVersion.cmake
+lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets-${TARGET}.cmake
+lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets.cmake
lib/cmake/KActivities/KActivitiesConfig.cmake
lib/cmake/KActivities/KActivitiesConfigVersion.cmake
-lib/cmake/KActivities/KActivitiesLibraryTargets-relwithdebinfo.cmake
+lib/cmake/KActivities/KActivitiesLibraryTargets-${TARGET}.cmake
lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
-lib/kde4/activitymanager_plugin_dummy.so
+lib/kde4/activitymanager_plugin_activityranking.so
lib/kde4/activitymanager_plugin_globalshortcuts.so
-lib/kde4/activitymanager_plugin_nepomuk.so
lib/kde4/activitymanager_plugin_slc.so
+lib/kde4/activitymanager_plugin_sqlite.so
+lib/kde4/activitymanager_plugin_virtualdesktopswitch.so
+lib/kde4/activitymanager_uihandler_declarative.so
+lib/kde4/activitymanager_uihandler_kdialog.so
+lib/kde4/imports/org/kde/activities/models/libkactivities-models-component-plugin.so
+lib/kde4/imports/org/kde/activities/models/qmldir
+lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so
+lib/kde4/kcm_activities.so
+lib/kde4/kio_activities.so
+lib/libkactivities-models.so
+lib/libkactivities-models.so.1
+lib/libkactivities-models.so.1.0.0
lib/libkactivities.so
lib/libkactivities.so.6
-lib/libkactivities.so.6.0.0
+lib/libkactivities.so.6.1.0
+lib/pkgconfig/libkactivities-models.pc
lib/pkgconfig/libkactivities.pc
-share/kde4/services/activitymanager-plugin-dummy.desktop
+share/kde/apps/activitymanager/workspace/settings/BlacklistApplicationView.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/ChoiceDialog.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/MessageDialog.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/NewPasswordDialog.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/PasswordDialog.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/uihandler.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/metadata.desktop
+share/kde4/services/activities.protocol
+share/kde4/services/activitymanager-plugin-activityranking.desktop
share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
-share/kde4/services/activitymanager-plugin-nepomuk.desktop
share/kde4/services/activitymanager-plugin-slc.desktop
+share/kde4/services/activitymanager-plugin-sqlite.desktop
+share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop
share/kde4/services/kactivitymanagerd.desktop
-share/kde4/services/kded/activitymanager.desktop
+share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop
+share/kde4/services/kcm_activities.desktop
share/kde4/servicetypes/activitymanager-plugin.desktop
+share/ontology/kde/kao.ontology
+share/ontology/kde/kao.trig
diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo
index 2615d43f28c..9ff3d980858 100644
--- a/x11/kactivities/distinfo
+++ b/x11/kactivities/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:45 markd Exp $
-SHA1 (kactivities-4.8.4.tar.xz) = 3f42c18bae5a1d6bbd7fca471d8b4f9755875e06
-RMD160 (kactivities-4.8.4.tar.xz) = 0b5c95876f507e990b8d3e98f1964ad72b1c2c91
-Size (kactivities-4.8.4.tar.xz) = 42396 bytes
+SHA1 (kactivities-4.10.2.tar.xz) = bde79ed3db93d5fa72e1081a6638c5cb777f495e
+RMD160 (kactivities-4.10.2.tar.xz) = 04e63600ceddd0788b2f0ba63816b0b07a209643
+Size (kactivities-4.10.2.tar.xz) = 108668 bytes
diff --git a/x11/kde-baseapps4/Makefile b/x11/kde-baseapps4/Makefile
index 5d5800dff79..6b9960792ab 100644
--- a/x11/kde-baseapps4/Makefile
+++ b/x11/kde-baseapps4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2013/02/16 11:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2013/04/03 10:51:48 markd Exp $
DISTNAME= kde-baseapps-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 7
CATEGORIES= x11
COMMENT= Base modules for the KDE 4 integrated X11 desktop
@@ -26,7 +25,10 @@ REPLACE_FILES.scheme= lib/konq/Templates/Program.desktop
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/qimageblitz/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
+.include "../../misc/nepomuk-widgets/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/kactivities/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../x11/kde-runtime4/buildlink3.mk"
.include "../../x11/kde-workspace4/buildlink3.mk"
diff --git a/x11/kde-baseapps4/PLIST b/x11/kde-baseapps4/PLIST
index a9ad59542ab..219351b3735 100644
--- a/x11/kde-baseapps4/PLIST
+++ b/x11/kde-baseapps4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/06/16 04:45:39 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/04/03 10:51:49 markd Exp $
bin/dolphin
bin/fsview
bin/kbookmarkmerger
@@ -75,22 +75,22 @@ lib/kde4/webarchiverplugin.so
lib/kde4/webarchivethumbnail.so
lib/libdolphinprivate.so
lib/libdolphinprivate.so.4
-lib/libdolphinprivate.so.4.8.0
+lib/libdolphinprivate.so.${PKGVERSION}
lib/libkbookmarkmodel_private.so
lib/libkbookmarkmodel_private.so.4
-lib/libkbookmarkmodel_private.so.4.8.0
+lib/libkbookmarkmodel_private.so.${PKGVERSION}
lib/libkdeinit4_dolphin.so
lib/libkdeinit4_keditbookmarks.so
lib/libkdeinit4_kfmclient.so
lib/libkdeinit4_konqueror.so
lib/libkonq.so
lib/libkonq.so.5
-lib/libkonq.so.5.8.0
+lib/libkonq.so.5.10.2
lib/libkonqsidebarplugin.so
lib/libkonqsidebarplugin.so.4
-lib/libkonqsidebarplugin.so.4.8.0
+lib/libkonqsidebarplugin.so.${PKGVERSION}
lib/libkonquerorprivate.so.4
-lib/libkonquerorprivate.so.4.8.0
+lib/libkonquerorprivate.so.${PKGVERSION}
man/man1/kbookmarkmerger.1
man/man1/kfind.1
share/applications/kde4/Home.desktop
@@ -115,13 +115,14 @@ share/dbus-1/interfaces/org.kde.nsplugins.instance.xml
share/dbus-1/interfaces/org.kde.nsplugins.viewer.xml
share/doc/kde/HTML/en/dolphin/common
share/doc/kde/HTML/en/dolphin/default-ui.png
+share/doc/kde/HTML/en/dolphin/grouping-view.png
share/doc/kde/HTML/en/dolphin/index.cache.bz2
share/doc/kde/HTML/en/dolphin/index.docbook
-share/doc/kde/HTML/en/dolphin/grouping-view.png
share/doc/kde/HTML/en/dolphin/locationbar-breadcrumb.png
share/doc/kde/HTML/en/dolphin/locationbar-context-menu.png
share/doc/kde/HTML/en/dolphin/locationbar-editable.png
share/doc/kde/HTML/en/dolphin/locationbar-places-icon.png
+share/doc/kde/HTML/en/dolphin/nepomuk-search-more-options.png
share/doc/kde/HTML/en/dolphin/nepomuk-search.png
share/doc/kde/HTML/en/dolphin/preferences-general-behavior.png
share/doc/kde/HTML/en/dolphin/preferences-navigation.png
@@ -156,6 +157,7 @@ share/doc/kde/HTML/en/konqueror/filemanager.docbook
share/doc/kde/HTML/en/konqueror/folders.png
share/doc/kde/HTML/en/konqueror/format-font-size-less.png
share/doc/kde/HTML/en/konqueror/format-font-size-more.png
+share/doc/kde/HTML/en/konqueror/grouping-view.png
share/doc/kde/HTML/en/konqueror/index.cache.bz2
share/doc/kde/HTML/en/konqueror/index.docbook
share/doc/kde/HTML/en/konqueror/introduction.docbook
@@ -220,10 +222,6 @@ share/kde/apps/domtreeviewer/domtreeviewerui.rc
share/kde/apps/fsview/fsview_part.rc
share/kde/apps/kbookmark/directory_bookmarkbar.desktop
share/kde/apps/kcmcss/template.css
-share/kde/apps/kconf_update/favicons.upd
-share/kde/apps/kconf_update/kfmclient_3_2.upd
-share/kde/apps/kconf_update/kfmclient_3_2_update.sh
-share/kde/apps/kconf_update/move_favicons.sh
share/kde/apps/kcontrol/pics/onlyone.png
share/kde/apps/kcontrol/pics/overlapping.png
share/kde/apps/kdm/pics/users/Blackbox.png
diff --git a/x11/kde-baseapps4/distinfo b/x11/kde-baseapps4/distinfo
index af1c38f87c9..243febf5e44 100644
--- a/x11/kde-baseapps4/distinfo
+++ b/x11/kde-baseapps4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:39 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:49 markd Exp $
-SHA1 (kde-baseapps-4.8.4.tar.xz) = a1d6951b27c868c738a36dbd21702b658f3d6245
-RMD160 (kde-baseapps-4.8.4.tar.xz) = 779de14275b475bf556d47515b5219119c7ac969
-Size (kde-baseapps-4.8.4.tar.xz) = 2780696 bytes
+SHA1 (kde-baseapps-4.10.2.tar.xz) = 7f505292e95b35205cec3baa67e9e9b24f79b9b9
+RMD160 (kde-baseapps-4.10.2.tar.xz) = 74646825112ebaa313f1ab542b5d848d049c3260
+Size (kde-baseapps-4.10.2.tar.xz) = 2611976 bytes
diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile
index 238e80cdede..f0507007f4b 100644
--- a/x11/kde-runtime4/Makefile
+++ b/x11/kde-runtime4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2013/03/16 06:20:49 obache Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/03 10:51:49 markd Exp $
DISTNAME= kde-runtime-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 10
CATEGORIES= x11
COMMENT= Runtime requirements for the KDE integrated X11 desktop
@@ -10,6 +9,7 @@ COMMENT= Runtime requirements for the KDE integrated X11 desktop
# BUILD_MAKE_FLAGS+= VERBOSE=1
CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=off
+CMAKE_ARGS+= -DWITH_LibSSH:BOOL=OFF
CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
@@ -44,9 +44,6 @@ REPLACE_PERL+= \
khelpcenter/searchhandlers/khc_mansearch.pl \
kioslave/info/kde-info2html
-REPLACE_PYTHON+= \
- nepomuk/services/storage/rcgen/nepomuk-simpleresource-rcgen.py
-
CONF_FILES+= ${PREFIX}/share/examples/kde-runtime4/kde-information.menu \
${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf \
@@ -60,10 +57,12 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../audio/libcanberra/buildlink3.mk"
-.include "../../lang/python/application.mk"
+#.include "../../lang/python/application.mk"
# not the libssh the package wants
#.include "../../security/libssh/buildlink3.mk"
.include "../../security/qca2/buildlink3.mk"
+.include "../../misc/kdepimlibs4/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../multimedia/phonon/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
.include "../../graphics/exiv2/buildlink3.mk"
@@ -75,6 +74,7 @@ BUILDLINK_ABI_DEPENDS.attica?= attica>=0.1.4
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
BUILDLINK_ABI_DEPENDS.soprano?= soprano>=2.6.50
.include "../../textproc/soprano/buildlink3.mk"
+.include "../../x11/kactivities/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde-runtime4/PLIST b/x11/kde-runtime4/PLIST
index 85bf7e773e2..c2c0badfad4 100644
--- a/x11/kde-runtime4/PLIST
+++ b/x11/kde-runtime4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/09/26 09:55:39 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/04/03 10:51:49 markd Exp $
bin/kcmshell4
bin/kde-cp
bin/kde-mv
@@ -25,26 +25,13 @@ bin/ktrash
bin/kuiserver
bin/kwalletd
bin/kwriteconfig
-bin/nepomuk-simpleresource-rcgen
-bin/nepomukbackup
bin/nepomukcontroller
-bin/nepomukindexer
-bin/nepomukserver
-bin/nepomukservicestub
bin/plasma-remote-helper
bin/plasmapkg
bin/solid-hardware
include/knotify_export.h
include/knotifyconfig.h
include/knotifyplugin.h
-include/nepomuk/createresourcejob.h
-include/nepomuk/datamanagement.h
-include/nepomuk/describeresourcesjob.h
-include/nepomuk/nepomukdatamanagement_export.h
-include/nepomuk/resourcewatcher.h
-include/nepomuk/simpleresource.h
-include/nepomuk/simpleresourcegraph.h
-include/nepomuk/storeresourcesjob.h
lib/attica_kde.so
lib/kconf_update_bin/phonon_devicepreference_update
lib/kconf_update_bin/phonon_deviceuids_update
@@ -57,56 +44,79 @@ lib/kde4/htmlthumbnail.so
lib/kde4/imagethumbnail.so
lib/kde4/imports/org/kde/draganddrop/libdraganddropplugin.so
lib/kde4/imports/org/kde/draganddrop/qmldir
-lib/kde4/imports/org/kde/plasma/components/AppManager.js
+lib/kde4/imports/org/kde/locale/liblocalebindingsplugin.so
+lib/kde4/imports/org/kde/locale/qmldir
lib/kde4/imports/org/kde/plasma/components/BusyIndicator.qml
lib/kde4/imports/org/kde/plasma/components/Button.qml
lib/kde4/imports/org/kde/plasma/components/ButtonColumn.qml
lib/kde4/imports/org/kde/plasma/components/ButtonGroup.js
lib/kde4/imports/org/kde/plasma/components/ButtonRow.qml
-lib/kde4/imports/org/kde/plasma/components/ButtonShadow.qml
lib/kde4/imports/org/kde/plasma/components/CheckBox.qml
lib/kde4/imports/org/kde/plasma/components/CommonDialog.qml
+lib/kde4/imports/org/kde/plasma/components/ContextMenu.qml
lib/kde4/imports/org/kde/plasma/components/Dialog.qml
-lib/kde4/imports/org/kde/plasma/components/DualStateButton.qml
lib/kde4/imports/org/kde/plasma/components/Highlight.qml
-lib/kde4/imports/org/kde/plasma/components/IconLoader.qml
lib/kde4/imports/org/kde/plasma/components/Label.qml
lib/kde4/imports/org/kde/plasma/components/ListItem.qml
lib/kde4/imports/org/kde/plasma/components/Page.qml
-lib/kde4/imports/org/kde/plasma/components/PageStack.js
lib/kde4/imports/org/kde/plasma/components/PageStack.qml
lib/kde4/imports/org/kde/plasma/components/ProgressBar.qml
+lib/kde4/imports/org/kde/plasma/components/QueryDialog.qml
lib/kde4/imports/org/kde/plasma/components/RadioButton.qml
-lib/kde4/imports/org/kde/plasma/components/RoundShadow.qml
lib/kde4/imports/org/kde/plasma/components/ScrollBar.qml
-lib/kde4/imports/org/kde/plasma/components/ScrollBarDelegate.qml
-lib/kde4/imports/org/kde/plasma/components/ScrollDecoratorDelegate.qml
-lib/kde4/imports/org/kde/plasma/components/SectionScroller.js
lib/kde4/imports/org/kde/plasma/components/SectionScroller.qml
lib/kde4/imports/org/kde/plasma/components/SelectionDialog.qml
+lib/kde4/imports/org/kde/plasma/components/Sheet.qml
lib/kde4/imports/org/kde/plasma/components/Slider.qml
lib/kde4/imports/org/kde/plasma/components/Switch.qml
lib/kde4/imports/org/kde/plasma/components/TabBar.qml
-lib/kde4/imports/org/kde/plasma/components/TabBarLayout.qml
lib/kde4/imports/org/kde/plasma/components/TabButton.qml
-lib/kde4/imports/org/kde/plasma/components/TabGroup.js
lib/kde4/imports/org/kde/plasma/components/TabGroup.qml
lib/kde4/imports/org/kde/plasma/components/TextArea.qml
lib/kde4/imports/org/kde/plasma/components/TextField.qml
-lib/kde4/imports/org/kde/plasma/components/TextFieldFocus.qml
lib/kde4/imports/org/kde/plasma/components/ToolBar.qml
lib/kde4/imports/org/kde/plasma/components/ToolBarLayout.qml
lib/kde4/imports/org/kde/plasma/components/ToolButton.qml
lib/kde4/imports/org/kde/plasma/components/libplasmacomponentsplugin.so
+lib/kde4/imports/org/kde/plasma/components/private/AppManager.js
+lib/kde4/imports/org/kde/plasma/components/private/ButtonShadow.qml
+lib/kde4/imports/org/kde/plasma/components/private/Config.js
+lib/kde4/imports/org/kde/plasma/components/private/DualStateButton.qml
+lib/kde4/imports/org/kde/plasma/components/private/InlineDialog.qml
+lib/kde4/imports/org/kde/plasma/components/private/PageStack.js
+lib/kde4/imports/org/kde/plasma/components/private/RoundShadow.qml
+lib/kde4/imports/org/kde/plasma/components/private/ScrollBarDelegate.qml
+lib/kde4/imports/org/kde/plasma/components/private/ScrollDecoratorDelegate.qml
+lib/kde4/imports/org/kde/plasma/components/private/SectionScroller.js
+lib/kde4/imports/org/kde/plasma/components/private/TabBarLayout.qml
+lib/kde4/imports/org/kde/plasma/components/private/TabGroup.js
+lib/kde4/imports/org/kde/plasma/components/private/TextFieldFocus.qml
lib/kde4/imports/org/kde/plasma/components/qmldir
lib/kde4/imports/org/kde/plasma/core/libcorebindingsplugin.so
lib/kde4/imports/org/kde/plasma/core/qmldir
+lib/kde4/imports/org/kde/plasma/extras/App.qml
+lib/kde4/imports/org/kde/plasma/extras/ConditionalLoader.qml
+lib/kde4/imports/org/kde/plasma/extras/Heading.qml
+lib/kde4/imports/org/kde/plasma/extras/PageRow.qml
+lib/kde4/imports/org/kde/plasma/extras/Paragraph.qml
+lib/kde4/imports/org/kde/plasma/extras/ScrollArea.qml
+lib/kde4/imports/org/kde/plasma/extras/Title.qml
+lib/kde4/imports/org/kde/plasma/extras/animations/ActivateAnimation.qml
+lib/kde4/imports/org/kde/plasma/extras/animations/Animations.js
+lib/kde4/imports/org/kde/plasma/extras/animations/AppearAnimation.qml
+lib/kde4/imports/org/kde/plasma/extras/animations/DisappearAnimation.qml
+lib/kde4/imports/org/kde/plasma/extras/animations/PressedAnimation.qml
+lib/kde4/imports/org/kde/plasma/extras/animations/ReleasedAnimation.qml
+lib/kde4/imports/org/kde/plasma/extras/libplasmaextracomponentsplugin.so
+lib/kde4/imports/org/kde/plasma/extras/qmldir
lib/kde4/imports/org/kde/plasma/graphicslayouts/libgraphicslayoutsbindingsplugin.so
lib/kde4/imports/org/kde/plasma/graphicslayouts/qmldir
lib/kde4/imports/org/kde/plasma/graphicswidgets/libgraphicswidgetsbindingsplugin.so
lib/kde4/imports/org/kde/plasma/graphicswidgets/qmldir
lib/kde4/imports/org/kde/qtextracomponents/libqtextracomponentsplugin.so
lib/kde4/imports/org/kde/qtextracomponents/qmldir
+lib/kde4/imports/org/kde/runnermodel/librunnermodelplugin.so
+lib/kde4/imports/org/kde/runnermodel/qmldir
lib/kde4/jpegthumbnail.so
lib/kde4/kcm_attica.so
lib/kde4/kcm_cgi.so
@@ -121,7 +131,6 @@ lib/kde4/kcm_knotify.so
lib/kde4/kcm_locale.so
lib/kde4/kcm_nepomuk.so
lib/kde4/kcm_phonon.so
-lib/kde4/kcm_phononxine.so
lib/kde4/kcm_trash.so
lib/kde4/kcmspellchecking.so
lib/kde4/kded_desktopnotifier.so
@@ -132,6 +141,7 @@ lib/kde4/kded_nepomuksearchmodule.so
lib/kde4/kded_networkstatus.so
lib/kde4/kded_networkwatcher.so
lib/kde4/kded_phononserver.so
+lib/kde4/kded_recentdocumentsnotifier.so
lib/kde4/kded_remotedirnotify.so
lib/kde4/kded_solidautoeject.so
lib/kde4/kded_soliduiserver.so
@@ -151,9 +161,11 @@ lib/kde4/kio_nepomuk.so
lib/kde4/kio_nepomuksearch.so
lib/kde4/kio_network.so
lib/kde4/kio_nfs.so
+lib/kde4/kio_recentdocuments.so
lib/kde4/kio_remote.so
lib/kde4/kio_settings.so
${PLIST.smb}lib/kde4/kio_smb.so
+lib/kde4/kio_tags.so
lib/kde4/kio_thumbnail.so
lib/kde4/kio_timeline.so
lib/kde4/kio_trash.so
@@ -177,11 +189,6 @@ lib/kde4/libkmanpart.so
lib/kde4/librenaudioplugin.so
lib/kde4/librenimageplugin.so
lib/kde4/localdomainurifilter.so
-lib/kde4/nepomukbackupsync.so
-lib/kde4/nepomukfileindexer.so
-lib/kde4/nepomukfilewatch.so
-lib/kde4/nepomukqueryservice.so
-lib/kde4/nepomukstorage.so
lib/kde4/plasma-kpart.so
lib/kde4/plasma_appletscript_declarative.so
lib/kde4/plasma_appletscript_simple_javascript.so
@@ -189,43 +196,35 @@ lib/kde4/plasma_containment_newspaper.so
lib/kde4/plasma_dataenginescript_javascript.so
lib/kde4/plasma_packagestructure_javascriptaddon.so
lib/kde4/plasma_runnerscript_javascript.so
-lib/kde4/platformimports/touch/org/kde/plasma/components/AppManager.js
lib/kde4/platformimports/touch/org/kde/plasma/components/BusyIndicator.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Button.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ButtonColumn.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ButtonGroup.js
lib/kde4/platformimports/touch/org/kde/plasma/components/ButtonRow.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/ButtonShadow.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/CheckBox.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/CommonDialog.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Dialog.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/DualStateButton.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/EditBubble.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/EditBubble.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Highlight.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/IconLoader.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Label.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ListItem.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Menu.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/MenuItem.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Page.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/PageStack.js
lib/kde4/platformimports/touch/org/kde/plasma/components/PageStack.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ProgressBar.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/QueryDialog.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/RadioButton.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/RoundShadow.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ScrollBar.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/ScrollBarDelegate.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ScrollDecorator.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/ScrollDecoratorDelegate.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/SectionScroller.js
lib/kde4/platformimports/touch/org/kde/plasma/components/SectionScroller.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/SelectionDialog.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/Sheet.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Slider.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Switch.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/TabBar.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/TabBarLayout.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/TabButton.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/TabGroup.js
lib/kde4/platformimports/touch/org/kde/plasma/components/TabGroup.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/TextArea.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/TextField.qml
@@ -235,6 +234,19 @@ lib/kde4/platformimports/touch/org/kde/plasma/components/ToolBarLayout.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ToolButton.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Window.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/libplasmacomponentsplugin.so
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/AppManager.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/ButtonShadow.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/Config.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/DualStateButton.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/InlineDialog.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/PageStack.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/RoundShadow.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/ScrollBarDelegate.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/ScrollDecoratorDelegate.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/SectionScroller.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/TabBarLayout.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/TabGroup.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/TextFieldFocus.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/qmldir
lib/kde4/plugins/phonon_platform/kde.so
lib/kde4/svgthumbnail.so
@@ -246,45 +258,23 @@ lib/libkdeinit4_kglobalaccel.so
lib/libkdeinit4_khelpcenter.so
lib/libkdeinit4_kuiserver.so
lib/libkdeinit4_kwalletd.so
-lib/libkdeinit4_nepomukserver.so
lib/libknotifyplugin.so
lib/libkwalletbackend.so
lib/libkwalletbackend.so.4
-lib/libkwalletbackend.so.4.8.0
+lib/libkwalletbackend.so.${PKGVERSION}
lib/libmolletnetwork.so
lib/libmolletnetwork.so.4
-lib/libmolletnetwork.so.4.8.0
-lib/libnepomukcommon.so
-lib/libnepomukdatamanagement.so
-lib/libnepomukdatamanagement.so.4
-lib/libnepomukdatamanagement.so.4.8.0
-lib/libnepomuksync.so
-lib/libnepomuksync.so.4
-lib/libnepomuksync.so.4.8.0
+lib/libmolletnetwork.so.${PKGVERSION}
man/man1/kdesu.1
+man/man1/plasmapkg.1
man/man8/nepomukserver.8
man/man8/nepomukservicestub.8
share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
share/applications/kde4/Help.desktop
share/applications/kde4/knetattach.desktop
-share/applications/kde4/nepomukbackup.desktop
share/applications/kde4/nepomukcontroller.desktop
share/dbus-1/interfaces/org.kde.KTimeZoned.xml
-share/dbus-1/interfaces/org.kde.NepomukServer.xml
share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
-share/dbus-1/interfaces/org.kde.nepomuk.BackupSync.xml
-share/dbus-1/interfaces/org.kde.nepomuk.DataManagement.xml
-share/dbus-1/interfaces/org.kde.nepomuk.FileIndexer.xml
-share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
-share/dbus-1/interfaces/org.kde.nepomuk.Query.xml
-share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml
-share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcher.xml
-share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml
-share/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml
-share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
-share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
-share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
-share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml
share/dbus-1/interfaces/org.kde.network.kioslavenotifier.xml
share/dbus-1/services/org.kde.knotify.service
share/dbus-1/services/org.kde.kuiserver.service
@@ -328,6 +318,33 @@ share/desktop-directories/kde-utilities-peripherals.directory
share/desktop-directories/kde-utilities-pim.directory
share/desktop-directories/kde-utilities-xutils.directory
share/desktop-directories/kde-utilities.directory
+share/doc/kde/HTML/en/fundamentals/colors.png
+share/doc/kde/HTML/en/fundamentals/common
+share/doc/kde/HTML/en/fundamentals/config.docbook
+share/doc/kde/HTML/en/fundamentals/files-locationbar-breadcrumb.png
+share/doc/kde/HTML/en/fundamentals/files-locationbar-context-menu.png
+share/doc/kde/HTML/en/fundamentals/files-locationbar-editable.png
+share/doc/kde/HTML/en/fundamentals/files-locationbar-places-icon.png
+share/doc/kde/HTML/en/fundamentals/files-open.png
+share/doc/kde/HTML/en/fundamentals/files-save.png
+share/doc/kde/HTML/en/fundamentals/find-find-inline.png
+share/doc/kde/HTML/en/fundamentals/find-find.png
+share/doc/kde/HTML/en/fundamentals/find-found.png
+share/doc/kde/HTML/en/fundamentals/find-replace-inline.png
+share/doc/kde/HTML/en/fundamentals/find-replace.png
+share/doc/kde/HTML/en/fundamentals/fonts.png
+share/doc/kde/HTML/en/fundamentals/index.cache.bz2
+share/doc/kde/HTML/en/fundamentals/index.docbook
+share/doc/kde/HTML/en/fundamentals/install.docbook
+share/doc/kde/HTML/en/fundamentals/menus.png
+share/doc/kde/HTML/en/fundamentals/shortcuts-schemes.png
+share/doc/kde/HTML/en/fundamentals/shortcuts-search.png
+share/doc/kde/HTML/en/fundamentals/shortcuts-set.png
+share/doc/kde/HTML/en/fundamentals/spellcheck-check.png
+share/doc/kde/HTML/en/fundamentals/tasks.docbook
+share/doc/kde/HTML/en/fundamentals/toolbars-configure.png
+share/doc/kde/HTML/en/fundamentals/toolbars-toolbar.png
+share/doc/kde/HTML/en/fundamentals/ui.docbook
share/doc/kde/HTML/en/kcontrol/attica/common
share/doc/kde/HTML/en/kcontrol/attica/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/attica/index.docbook
@@ -604,6 +621,7 @@ share/kde/apps/desktoptheme/default/icons/notification.svgz
share/kde/apps/desktoptheme/default/icons/preferences.svgz
share/kde/apps/desktoptheme/default/icons/printer.svgz
share/kde/apps/desktoptheme/default/icons/quassel.svgz
+share/kde/apps/desktoptheme/default/icons/slc.svgz
share/kde/apps/desktoptheme/default/icons/wallet.svgz
share/kde/apps/desktoptheme/default/metadata.desktop
share/kde/apps/desktoptheme/default/opaque/dialogs/background.svgz
@@ -612,6 +630,12 @@ share/kde/apps/desktoptheme/default/opaque/dialogs/shutdowndialog.svgz
share/kde/apps/desktoptheme/default/opaque/widgets/extender-background.svgz
share/kde/apps/desktoptheme/default/opaque/widgets/panel-background.svgz
share/kde/apps/desktoptheme/default/opaque/widgets/tooltip.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/configure.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/edit.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/go.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/list.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/media.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/window.svgz
share/kde/apps/desktoptheme/default/translucent/dialogs/background.svgz
share/kde/apps/desktoptheme/default/translucent/dialogs/krunner.svgz
share/kde/apps/desktoptheme/default/translucent/widgets/extender-background.svgz
@@ -647,6 +671,7 @@ share/kde/apps/desktoptheme/default/widgets/media-delegate.svgz
share/kde/apps/desktoptheme/default/widgets/monitor.svgz
share/kde/apps/desktoptheme/default/widgets/pager.svgz
share/kde/apps/desktoptheme/default/widgets/panel-background.svgz
+share/kde/apps/desktoptheme/default/widgets/picker.svgz
share/kde/apps/desktoptheme/default/widgets/plot-background.svgz
share/kde/apps/desktoptheme/default/widgets/scrollbar.svgz
share/kde/apps/desktoptheme/default/widgets/scrollwidget.svgz
@@ -692,6 +717,7 @@ share/kde/apps/desktoptheme/oxygen/widgets/frame.svgz
share/kde/apps/desktoptheme/oxygen/widgets/glowbar.svgz
share/kde/apps/desktoptheme/oxygen/widgets/line.svgz
share/kde/apps/desktoptheme/oxygen/widgets/lineedit.svgz
+share/kde/apps/desktoptheme/oxygen/widgets/media-delegate.svgz
share/kde/apps/desktoptheme/oxygen/widgets/monitor.svgz
share/kde/apps/desktoptheme/oxygen/widgets/pager.svgz
share/kde/apps/desktoptheme/oxygen/widgets/panel-background.svgz
@@ -713,7 +739,6 @@ share/kde/apps/drkonqi/debuggers/internal/gdbrc
share/kde/apps/drkonqi/debuggers/internal/kdbgwinrc
share/kde/apps/drkonqi/mappings
share/kde/apps/drkonqi/pics/crash.png
-share/kde/apps/fileindexerservice/nepomukfileindexer.notifyrc
share/kde/apps/hardwarenotifications/hardwarenotifications.notifyrc
share/kde/apps/kcm_componentchooser/kcm_browser.desktop
share/kde/apps/kcm_componentchooser/kcm_filemanager.desktop
@@ -724,7 +749,6 @@ share/kde/apps/kcm_phonon/listview-background.png
share/kde/apps/kcmlocale/pics/background.png
share/kde/apps/kconf_update/devicepreference.upd
share/kde/apps/kconf_update/kuriikwsfilter.upd
-share/kde/apps/kconf_update/nepomukstrigiservice-migrate.upd
share/kde/apps/kde/kde.notifyrc
share/kde/apps/kglobalaccel/kglobalaccel.notifyrc
share/kde/apps/khelpcenter/glossary.html.in
@@ -743,6 +767,7 @@ share/kde/apps/khelpcenter/plugins/Manpages/man7.desktop
share/kde/apps/khelpcenter/plugins/Manpages/man8.desktop
share/kde/apps/khelpcenter/plugins/Scrollkeeper/.directory
share/kde/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop
+share/kde/apps/khelpcenter/plugins/fundamentals.desktop
share/kde/apps/khelpcenter/plugins/info.desktop
share/kde/apps/khelpcenter/plugins/kcontrolmodules.desktop
share/kde/apps/khelpcenter/plugins/kicmodules.desktop
@@ -771,13 +796,10 @@ share/kde/apps/ksmserver/windowmanagers/metacity.desktop
share/kde/apps/ksmserver/windowmanagers/openbox.desktop
share/kde/apps/kwalletd/kwalletd.notifyrc
share/kde/apps/libphonon/hardwaredatabase
-share/kde/apps/nepomukfilewatch/nepomukfilewatch.notifyrc
-share/kde/apps/nepomukstorage/nepomukstorage.notifyrc
share/kde/apps/phonon/phonon.notifyrc
share/kde/apps/remoteview/network.desktop
${PLIST.smb}share/kde/apps/remoteview/smb-network.desktop
share/kde/autostart/nepomukcontroller.desktop
-share/kde/autostart/nepomukserver.desktop
share/kde/config.kcfg/jpegcreatorsettings.kcfg
share/kde/config.kcfg/khelpcenter.kcfg
share/kde/config/emoticons.knsrc
@@ -817,7 +839,6 @@ share/kde4/services/kcm_attica.desktop
share/kde4/services/kcm_kdnssd.desktop
share/kde4/services/kcm_nepomuk.desktop
share/kde4/services/kcm_phonon.desktop
-share/kde4/services/kcm_phononxine.desktop
share/kde4/services/kcmcgi.desktop
share/kde4/services/kcmkded.desktop
share/kde4/services/kcmnotify.desktop
@@ -830,6 +851,7 @@ share/kde4/services/kded/nepomuksearchmodule.desktop
share/kde4/services/kded/networkstatus.desktop
share/kde4/services/kded/networkwatcher.desktop
share/kde4/services/kded/phononserver.desktop
+share/kde4/services/kded/recentdocumentsnotifier.desktop
share/kde4/services/kded/remotedirnotify.desktop
share/kde4/services/kded/solidautoeject.desktop
share/kde4/services/kded/soliduiserver.desktop
@@ -847,16 +869,7 @@ share/kde4/services/localdomainurifilter.desktop
share/kde4/services/lzma.protocol
share/kde4/services/man.protocol
share/kde4/services/nepomuk.protocol
-share/kde4/services/nepomukactivitiesservice.desktop
-share/kde4/services/nepomukbackupsync.desktop
-share/kde4/services/nepomukfileindexer.desktop
-share/kde4/services/nepomukfilewatch.desktop
-share/kde4/services/nepomukontologyloader.desktop
-share/kde4/services/nepomukqueryservice.desktop
-share/kde4/services/nepomukremovablestorageservice.desktop
share/kde4/services/nepomuksearch.protocol
-share/kde4/services/nepomukstorage.desktop
-share/kde4/services/nepomukstrigiservice.desktop
share/kde4/services/network.protocol
share/kde4/services/nfs.protocol
share/kde4/services/plasma-containment-newspaper.desktop
@@ -867,6 +880,7 @@ share/kde4/services/plasma-scriptengine-applet-simple-javascript.desktop
share/kde4/services/plasma-scriptengine-dataengine-javascript.desktop
share/kde4/services/plasma-scriptengine-runner-javascript.desktop
share/kde4/services/programs.protocol
+share/kde4/services/recentdocuments.protocol
share/kde4/services/remote.protocol
share/kde4/services/renaudiodlg.desktop
share/kde4/services/renimagedlg.desktop
@@ -999,6 +1013,7 @@ share/kde4/services/settings.protocol
${PLIST.smb}share/kde4/services/smb.protocol
share/kde4/services/spellchecking.desktop
share/kde4/services/svgthumbnail.desktop
+share/kde4/services/tags.protocol
share/kde4/services/tar.protocol
share/kde4/services/textthumbnail.desktop
share/kde4/services/thumbnail.protocol
@@ -1009,7 +1024,6 @@ share/kde4/services/windowsimagethumbnail.desktop
share/kde4/services/xz.protocol
share/kde4/services/zip.protocol
share/kde4/servicetypes/knotifynotifymethod.desktop
-share/kde4/servicetypes/nepomukservice.desktop
share/kde4/servicetypes/phononbackend.desktop
share/kde4/servicetypes/plasma-javascriptaddon.desktop
share/kde4/servicetypes/searchprovider.desktop
@@ -1723,12 +1737,6 @@ share/locale/l10n/zm/flag.png
share/locale/l10n/zw/entry.desktop
share/locale/l10n/zw/flag.png
share/mime/packages/network.xml
-share/ontology/kde/kext.ontology
-share/ontology/kde/kext.trig
-share/ontology/kde/kuvo.ontology
-share/ontology/kde/kuvo.trig
-share/ontology/kde/nrio.ontology
-share/ontology/kde/nrio.trig
share/sounds/KDE-Im-Cant-Connect.ogg
share/sounds/KDE-Im-Connection-Lost.ogg
share/sounds/KDE-Im-Contact-In.ogg
diff --git a/x11/kde-runtime4/distinfo b/x11/kde-runtime4/distinfo
index d0047f036de..6454c3f1748 100644
--- a/x11/kde-runtime4/distinfo
+++ b/x11/kde-runtime4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:49 markd Exp $
-SHA1 (kde-runtime-4.8.4.tar.xz) = 557fada748de52e5275058c50ec3cf8a652c0001
-RMD160 (kde-runtime-4.8.4.tar.xz) = 258f7d62a763a4df1494f6eecfb8b9f1e3e18f7f
-Size (kde-runtime-4.8.4.tar.xz) = 6060492 bytes
+SHA1 (kde-runtime-4.10.2.tar.xz) = b7f3c3907b8f19dcd975b1724b8ae01c4cae638b
+RMD160 (kde-runtime-4.10.2.tar.xz) = a97a193ece40c6b1c74bc81bcfbeebedf4f69ba1
+Size (kde-runtime-4.10.2.tar.xz) = 7218688 bytes
SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
SHA1 (patch-ac) = fadc0c0d3b7c8f893a9249724f26e2fc2c7f0f1e
SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile
index f956fd2f86d..e23214668bb 100644
--- a/x11/kde-workspace4/Makefile
+++ b/x11/kde-workspace4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2013/02/16 11:19:52 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2013/04/03 10:51:49 markd Exp $
DISTNAME= kde-workspace-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 11
CATEGORIES= x11
COMMENT= Base workspace for the KDE 4 integrated X11 desktop
@@ -116,6 +115,7 @@ BUILDLINK_DEPMETHOD.qt4-tools= full
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/qjson/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/qimageblitz/buildlink3.mk"
.include "../../security/polkit-qt/buildlink3.mk"
@@ -125,11 +125,12 @@ BUILDLINK_DEPMETHOD.qt4-tools= full
.include "../../sysutils/pciutils/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
+.include "../../misc/kdepimlibs4/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../multimedia/phonon/buildlink3.mk"
.include "../../x11/py-kde4/buildlink3.mk"
.include "../../x11/kactivities/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../misc/kdepimlibs4/buildlink3.mk"
.include "../../x11/libxklavier/buildlink3.mk"
.include "../../x11/libXcomposite/buildlink3.mk"
.include "../../x11/libXdamage/buildlink3.mk"
@@ -137,6 +138,8 @@ BUILDLINK_DEPMETHOD.qt4-tools= full
.include "../../x11/libXres/buildlink3.mk"
.include "../../x11/libXxf86misc/buildlink3.mk"
.include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../x11/xcb-util-image/buildlink3.mk"
+.include "../../x11/xcb-util-renderutil/buildlink3.mk"
.include "../../mk/pam.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde-workspace4/PLIST b/x11/kde-workspace4/PLIST
index 65c79932be8..ef569b87316 100644
--- a/x11/kde-workspace4/PLIST
+++ b/x11/kde-workspace4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/06/16 04:45:39 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/04/03 10:51:50 markd Exp $
bin/genkdmconf
bin/kaccess
bin/kapplymousetheme
@@ -37,10 +37,6 @@ bin/plasma-desktop
bin/plasma-netbook
bin/plasma-overlay
bin/plasma-windowed
-bin/plasmaengineexplorer
-bin/plasmawallpaperviewer
-bin/plasmoidviewer
-bin/remote-widgets-browser
bin/solid-action-desktop-gen
bin/startkde
bin/systemsettings
@@ -51,6 +47,7 @@ include/kdecorationbridge.h
include/kdecorationfactory.h
include/kgreeterplugin.h
include/kscreensaver.h
+include/kscreensaver_export.h
include/kscreensaver_vroot.h
include/ksgrd/SensorAgent.h
include/ksgrd/SensorClient.h
@@ -150,19 +147,30 @@ include/taskmanager/taskmanager.h
include/taskmanager/taskmanager_export.h
lib/cmake/KDE4Workspace/KDE4WorkspaceConfig.cmake
lib/cmake/KDE4Workspace/KDE4WorkspaceConfigVersion.cmake
-lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets-relwithdebinfo.cmake
+lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets-${TARGET}.cmake
lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets.cmake
+lib/kconf_update_bin/force_krunner_lock_shortcut_unreg
lib/kconf_update_bin/krdb_clearlibrarypath
lib/kconf_update_bin/kwin_update_default_rules
+lib/kconf_update_bin/kwin_update_settings_410
+lib/kconf_update_bin/kwin_update_settings_49
lib/kconf_update_bin/kwin_update_tabbox_qml_settings
lib/kconf_update_bin/kwin_update_tabbox_settings
-lib/kconf_update_bin/kwin_update_window_settings
+lib/kconf_update_bin/notifications-to-orgkdenotifications
lib/kconf_update_bin/plasma-add-shortcut-to-menu
lib/kconf_update_bin/plasma-to-plasma-desktop
lib/kde4/classic_mode.so
lib/kde4/devinfo.so
lib/kde4/fontthumbnail.so
lib/kde4/icon_mode.so
+lib/kde4/imports/org/kde/kwin/decoration/ButtonGroup.qml
+lib/kde4/imports/org/kde/kwin/decoration/Decoration.qml
+lib/kde4/imports/org/kde/kwin/decoration/DecorationButton.qml
+lib/kde4/imports/org/kde/kwin/decoration/MenuButton.qml
+lib/kde4/imports/org/kde/kwin/decoration/libdecorationplugin.so
+lib/kde4/imports/org/kde/kwin/decoration/qmldir
+lib/kde4/imports/org/kde/kwin/decorations/plastik/libplastikplugin.so
+lib/kde4/imports/org/kde/kwin/decorations/plastik/qmldir
lib/kde4/ion_bbcukmet.so
lib/kde4/ion_debianweather.so
lib/kde4/ion_envcan.so
@@ -189,6 +197,7 @@ lib/kde4/kcm_keys.so
lib/kde4/kcm_krunner_kill.so
lib/kde4/kcm_ksplashthemes.so
lib/kde4/kcm_kwin4_effect_builtins.so
+lib/kde4/kcm_kwin_scripts.so
lib/kde4/kcm_kwincompositing.so
lib/kde4/kcm_kwindecoration.so
lib/kde4/kcm_kwindesktop.so
@@ -214,12 +223,13 @@ lib/kde4/kcm_standard_actions.so
lib/kde4/kcm_style.so
lib/kde4/kcm_usb.so
lib/kde4/kcm_workspaceoptions.so
-lib/kde4/kcm_xinerama.so
+lib/kde4/kded_appmenu.so
lib/kde4/kded_freespacenotifier.so
lib/kde4/kded_kephal.so
lib/kde4/kded_keyboard.so
lib/kde4/kded_khotkeys.so
${PLIST.utempter}lib/kde4/kded_kwrited.so
+lib/kde4/kded_ktouchpadenabler.so
lib/kde4/kded_powerdevil.so
lib/kde4/kded_randrmonitor.so
lib/kde4/kded_statusnotifierwatcher.so
@@ -251,13 +261,9 @@ lib/kde4/kwin3_aurorae.so
lib/kde4/kwin3_b2.so
lib/kde4/kwin3_laptop.so
lib/kde4/kwin3_oxygen.so
-lib/kde4/kwin3_plastik.so
-lib/kde4/kwin3_tabstrip.so
lib/kde4/kwin4_effect_builtins.so
lib/kde4/kwin_b2_config.so
lib/kde4/kwin_oxygen_config.so
-lib/kde4/kwin_plastik_config.so
-lib/kde4/kwin_tabstrip_config.so
lib/kde4/libexec/backlighthelper
lib/kde4/libexec/fontinst
lib/kde4/libexec/fontinst_helper
@@ -269,16 +275,14 @@ lib/kde4/libexec/kdm_config
lib/kde4/libexec/kdm_greet
lib/kde4/libexec/kfontprint
lib/kde4/libexec/krootimage
-lib/kde4/libexec/kscreenlocker
+lib/kde4/libexec/kscreenlocker_greet
lib/kde4/libexec/ksysguardprocesslist_helper
lib/kde4/libexec/kwin_killer_helper
lib/kde4/libexec/kwin_opengl_test
lib/kde4/libexec/kwin_rules_dialog
-lib/kde4/libexec/test_kcm_xinerama
lib/kde4/plasma-geolocation-ip.so
lib/kde4/plasma_animator_default.so
lib/kde4/plasma_applet_activitybar.so
-lib/kde4/plasma_applet_battery.so
lib/kde4/plasma_applet_calendar.so
lib/kde4/plasma_applet_clock.so
lib/kde4/plasma_applet_currentappcontrol.so
@@ -286,16 +290,14 @@ lib/kde4/plasma_applet_dig_clock.so
lib/kde4/plasma_applet_icon.so
lib/kde4/plasma_applet_keyboard.so
lib/kde4/plasma_applet_launcher.so
-lib/kde4/plasma_applet_lockout.so
-lib/kde4/plasma_applet_notifications.so
lib/kde4/plasma_applet_pager.so
lib/kde4/plasma_applet_panelspacer_internal.so
lib/kde4/plasma_applet_quicklaunch.so
lib/kde4/plasma_applet_searchbox.so
-lib/kde4/plasma_applet_showActivityManager.so
lib/kde4/plasma_applet_simplelauncher.so
lib/kde4/plasma_applet_sm_cpu.so
lib/kde4/plasma_applet_sm_hdd.so
+lib/kde4/plasma_applet_sm_hdd_activity.so
lib/kde4/plasma_applet_sm_hwinfo.so
lib/kde4/plasma_applet_sm_net.so
lib/kde4/plasma_applet_sm_ram.so
@@ -335,6 +337,7 @@ lib/kde4/plasma_engine_hotplug.so
lib/kde4/plasma_engine_keystate.so
lib/kde4/plasma_engine_metadata.so
lib/kde4/plasma_engine_mouse.so
+lib/kde4/plasma_engine_mpris2.so
lib/kde4/plasma_engine_network.so
lib/kde4/plasma_engine_notifications.so
lib/kde4/plasma_engine_nowplaying.so
@@ -373,7 +376,7 @@ lib/kde4/solid_fakenet.so
lib/kde4/solid_wicd.so
lib/libkdecorations.so
lib/libkdecorations.so.4
-lib/libkdecorations.so.4.8.0
+lib/libkdecorations.so.${PKGVERSION}
lib/libkdeinit4_kaccess.so
lib/libkdeinit4_kcminit.so
lib/libkdeinit4_kcminit_startup.so
@@ -389,25 +392,25 @@ lib/libkdeinit4_plasma-netbook.so
lib/libkdeinit4_plasma-windowed.so
lib/libkephal.so
lib/libkephal.so.4
-lib/libkephal.so.4.8.0
+lib/libkephal.so.${PKGVERSION}
lib/libkfontinst.so
lib/libkfontinst.so.4
-lib/libkfontinst.so.4.8.0
+lib/libkfontinst.so.${PKGVERSION}
lib/libkfontinstui.so
lib/libkfontinstui.so.4
-lib/libkfontinstui.so.4.8.0
+lib/libkfontinstui.so.${PKGVERSION}
lib/libkhotkeysprivate.so.4
-lib/libkhotkeysprivate.so.4.8.0
+lib/libkhotkeysprivate.so.${PKGVERSION}
lib/libkickoff.so
lib/libkscreensaver.so
lib/libkscreensaver.so.5
lib/libkscreensaver.so.5.0.0
lib/libksgrd.so
lib/libksgrd.so.4
-lib/libksgrd.so.4.8.0
+lib/libksgrd.so.${PKGVERSION}
lib/libksignalplotter.so
lib/libksignalplotter.so.4
-lib/libksignalplotter.so.4.8.0
+lib/libksignalplotter.so.${PKGVERSION}
lib/libkwineffects.so
lib/libkwineffects.so.1
lib/libkwineffects.so.1.0.0
@@ -415,66 +418,63 @@ lib/libkwinglutils.so
lib/libkwinglutils.so.1
lib/libkwinglutils.so.1.0.0
lib/libkwinnvidiahack.so.4
-lib/libkwinnvidiahack.so.4.8.0
+lib/libkwinnvidiahack.so.${PKGVERSION}
lib/libkworkspace.so
lib/libkworkspace.so.4
-lib/libkworkspace.so.4.8.0
+lib/libkworkspace.so.${PKGVERSION}
lib/liblsofui.so
lib/liblsofui.so.4
-lib/liblsofui.so.4.8.0
+lib/liblsofui.so.${PKGVERSION}
lib/liboxygenstyle.so
lib/liboxygenstyle.so.4
-lib/liboxygenstyle.so.4.8.0
+lib/liboxygenstyle.so.${PKGVERSION}
lib/liboxygenstyleconfig.so
lib/liboxygenstyleconfig.so.4
-lib/liboxygenstyleconfig.so.4.8.0
+lib/liboxygenstyleconfig.so.${PKGVERSION}
lib/libplasma-geolocation-interface.so
lib/libplasma-geolocation-interface.so.4
-lib/libplasma-geolocation-interface.so.4.8.0
+lib/libplasma-geolocation-interface.so.${PKGVERSION}
lib/libplasma_applet-system-monitor.so
lib/libplasma_applet-system-monitor.so.4
-lib/libplasma_applet-system-monitor.so.4.8.0
+lib/libplasma_applet-system-monitor.so.${PKGVERSION}
lib/libplasmaclock.so
lib/libplasmaclock.so.4
-lib/libplasmaclock.so.4.8.0
+lib/libplasmaclock.so.${PKGVERSION}
lib/libplasmagenericshell.so
lib/libplasmagenericshell.so.4
-lib/libplasmagenericshell.so.4.8.0
+lib/libplasmagenericshell.so.${PKGVERSION}
lib/libpowerdevilconfigcommonprivate.so
lib/libpowerdevilconfigcommonprivate.so.4
-lib/libpowerdevilconfigcommonprivate.so.4.8.0
+lib/libpowerdevilconfigcommonprivate.so.${PKGVERSION}
lib/libpowerdevilcore.so
lib/libpowerdevilcore.so.0
lib/libpowerdevilcore.so.0.1.0
lib/libpowerdevilui.so
lib/libpowerdevilui.so.4
-lib/libpowerdevilui.so.4.8.0
+lib/libpowerdevilui.so.${PKGVERSION}
lib/libprocesscore.so
lib/libprocesscore.so.4
-lib/libprocesscore.so.4.8.0
+lib/libprocesscore.so.${PKGVERSION}
lib/libprocessui.so
lib/libprocessui.so.4
-lib/libprocessui.so.4.8.0
+lib/libprocessui.so.${PKGVERSION}
lib/libsolidcontrol.so
lib/libsolidcontrol.so.4
-lib/libsolidcontrol.so.4.8.0
+lib/libsolidcontrol.so.${PKGVERSION}
lib/libsolidcontrolifaces.so
lib/libsolidcontrolifaces.so.4
-lib/libsolidcontrolifaces.so.4.8.0
+lib/libsolidcontrolifaces.so.${PKGVERSION}
lib/libsystemsettingsview.so
lib/libsystemsettingsview.so.2
lib/libtaskmanager.so
lib/libtaskmanager.so.4
-lib/libtaskmanager.so.4.8.0
+lib/libtaskmanager.so.${PKGVERSION}
lib/libweather_ion.so
lib/libweather_ion.so.6
lib/libweather_ion.so.6.0.0
${PYSITELIB}/PyKDE4/plasmascript.py
${PYSITELIB}/PyKDE4/plasmascript.pyc
lib/strigi/strigita_font.so
-man/man1/plasmaengineexplorer.1
-man/man1/plasmapkg.1
-man/man1/plasmoidviewer.1
share/PolicyKit/policy/org.kde.fontinst.policy
share/PolicyKit/policy/org.kde.kcontrol.kcmclock.policy
share/PolicyKit/policy/org.kde.kcontrol.kcmkdm.policy
@@ -488,12 +488,12 @@ share/applications/kde4/kmenuedit.desktop
share/applications/kde4/krandrtray.desktop
share/applications/kde4/ksysguard.desktop
share/applications/kde4/systemsettings.desktop
-share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml
+share/dbus-1/interfaces/com.canonical.AppMenu.Registrar.xml
share/dbus-1/interfaces/org.kde.KSMServerInterface.xml
share/dbus-1/interfaces/org.kde.KWin.xml
+share/dbus-1/interfaces/org.kde.kded.appmenu.xml
share/dbus-1/interfaces/org.kde.khotkeys.xml
share/dbus-1/interfaces/org.kde.krunner.App.xml
-share/dbus-1/interfaces/org.kde.screensaver.xml
share/dbus-1/services/org.kde.fontinst.service
share/dbus-1/services/org.kde.krunner.service
share/dbus-1/system-services/org.kde.fontinst.service
@@ -558,6 +558,7 @@ share/doc/kde/HTML/en/kcontrol/khotkeys/groups-comment.png
share/doc/kde/HTML/en/kcontrol/khotkeys/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/khotkeys/index.docbook
share/doc/kde/HTML/en/kcontrol/khotkeys/manage-export.png
+share/doc/kde/HTML/en/kcontrol/khotkeys/oxygen-22x22-edit-clear-locationbar-rtl.png
share/doc/kde/HTML/en/kcontrol/khotkeys/settings.png
share/doc/kde/HTML/en/kcontrol/khotkeys/shortcuts-action-command.png
share/doc/kde/HTML/en/kcontrol/khotkeys/shortcuts-action-keyboard.png
@@ -581,11 +582,6 @@ share/doc/kde/HTML/en/kcontrol/kwintabbox/index.docbook
share/doc/kde/HTML/en/kcontrol/mouse/common
share/doc/kde/HTML/en/kcontrol/mouse/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/mouse/index.docbook
-share/doc/kde/HTML/en/kcontrol/multiplemonitors/common
-share/doc/kde/HTML/en/kcontrol/multiplemonitors/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/multiplemonitors/index.docbook
-share/doc/kde/HTML/en/kcontrol/multiplemonitors/multiplemonitors-error.png
-share/doc/kde/HTML/en/kcontrol/multiplemonitors/multiplemonitors.png
share/doc/kde/HTML/en/kcontrol/paths/common
share/doc/kde/HTML/en/kcontrol/paths/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/paths/index.docbook
@@ -712,7 +708,7 @@ share/examples/kde4-dbus/org.kde.ksysguard.processlisthelper.conf
share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf
share/examples/rc.d/kdm
share/icons/Daemon.png
-share/icons/NetBSD-flag.png
+share/icons/${OPSYS}-flag.png
share/icons/Oxygen_Black/cursors/00000000000000020006000e7e9ffc3f
share/icons/Oxygen_Black/cursors/00008160000006810000408080010102
share/icons/Oxygen_Black/cursors/03b6e0fcb3499374a867c041f52298f0
@@ -1181,40 +1177,24 @@ share/kde/apps/kcmkeys/win3.kksrc
share/kde/apps/kcmkeys/win4.kksrc
share/kde/apps/kcmkeys/wm3.kksrc
share/kde/apps/kcmsolidactions/solid-action-template.desktop
+share/kde/apps/kcmstyle/kcmstyle.notifyrc
share/kde/apps/kcmusb/usb.ids
-share/kde/apps/kconf_update/convertShortcuts.pl
-share/kde/apps/kconf_update/kaccel.upd
-share/kde/apps/kconf_update/kcmdisplayrc.upd
share/kde/apps/kconf_update/klipper-kconfigxt.upd
share/kde/apps/kconf_update/krdb_libpathwipe.upd
-share/kde/apps/kconf_update/ksmserver.upd
+share/kde/apps/kconf_update/kscreenlocker_locksession-shortcut.upd
share/kde/apps/kconf_update/ksmserver_shortcuts.upd
-share/kde/apps/kconf_update/kwin.upd
-share/kde/apps/kconf_update/kwin3_plugin.pl
-share/kde/apps/kconf_update/kwin3_plugin.upd
-share/kde/apps/kconf_update/kwin_focus1.sh
-share/kde/apps/kconf_update/kwin_focus1.upd
-share/kde/apps/kconf_update/kwin_focus2.sh
-share/kde/apps/kconf_update/kwin_focus2.upd
share/kde/apps/kconf_update/kwin_fsp_workarounds_1.upd
-share/kde/apps/kconf_update/kwin_on_off.upd
share/kde/apps/kconf_update/kwin_remove_delay_focus.sh
share/kde/apps/kconf_update/kwin_remove_delay_focus.upd
share/kde/apps/kconf_update/kwin_remove_effects.upd
+share/kde/apps/kconf_update/kwin_update_410.upd
+share/kde/apps/kconf_update/kwin_update_49.upd
share/kde/apps/kconf_update/kwin_update_tabbox_qml_settings.upd
share/kde/apps/kconf_update/kwin_update_tabbox_settings.upd
-share/kde/apps/kconf_update/kwin_window_shortcuts.sh
-share/kde/apps/kconf_update/kwin_window_shortcuts.upd
-share/kde/apps/kconf_update/kwiniconify.upd
-share/kde/apps/kconf_update/kwinsticky.upd
-share/kde/apps/kconf_update/kwinupdatewindowsettings.upd
-share/kde/apps/kconf_update/mouse_cursor_theme.upd
-share/kde/apps/kconf_update/move_session_config.sh
-share/kde/apps/kconf_update/on-off_to_true-false.sh
+share/kde/apps/kconf_update/notifications-to-orgkdenotifications.upd
share/kde/apps/kconf_update/plasma-add-shortcut-to-menu.upd
share/kde/apps/kconf_update/plasma-to-plasmadesktop-shortcuts.upd
share/kde/apps/kconf_update/plasmarc-to-plasmadesktoprc.upd
-share/kde/apps/kconf_update/pluginlibFix.pl
share/kde/apps/kcontrol/pics/anchor.png
share/kde/apps/kcontrol/pics/logo.png
share/kde/apps/kcontrol/pics/mini-world.png
@@ -1333,6 +1313,20 @@ share/kde/apps/kdm/themes/circles/flower.png
share/kde/apps/kdm/themes/circles/help.png
share/kde/apps/kdm/themes/circles/options.png
share/kde/apps/kdm/themes/circles/screenshot.png
+share/kde/apps/kdm/themes/elarun/KdmGreeterTheme.desktop
+share/kde/apps/kdm/themes/elarun/elarun.xml
+share/kde/apps/kdm/themes/elarun/lineedit_active.png
+share/kde/apps/kdm/themes/elarun/lineedit_normal.png
+share/kde/apps/kdm/themes/elarun/lock.png
+share/kde/apps/kdm/themes/elarun/login_active.png
+share/kde/apps/kdm/themes/elarun/login_normal.png
+share/kde/apps/kdm/themes/elarun/pw_icon.png
+share/kde/apps/kdm/themes/elarun/rectangle.png
+share/kde/apps/kdm/themes/elarun/rectangle_overlay.png
+share/kde/apps/kdm/themes/elarun/screenshot.png
+share/kde/apps/kdm/themes/elarun/session_normal.png
+share/kde/apps/kdm/themes/elarun/system_normal.png
+share/kde/apps/kdm/themes/elarun/user_icon.png
share/kde/apps/kdm/themes/horos/KdmGreeterTheme.desktop
share/kde/apps/kdm/themes/horos/horos.xml
share/kde/apps/kdm/themes/horos/lineedit_active.png
@@ -1387,34 +1381,29 @@ share/kde/apps/khotkeys/kde32b1.khotkeys
share/kde/apps/khotkeys/konqueror_gestures_kde321.khotkeys
share/kde/apps/khotkeys/printscreen.khotkeys
share/kde/apps/kinfocenter/kinfocenterui.rc
-share/kde/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new.png
-share/kde/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new_sep.png
-share/kde/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new.png
-share/kde/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new_sep.png
+share/kde/apps/kmenuedit/icons/hicolor/22x22/actions/menu_new.png
+share/kde/apps/kmenuedit/icons/hicolor/22x22/actions/menu_new_sep.png
+share/kde/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new.png
+share/kde/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new_sep.png
share/kde/apps/kmenuedit/kmenueditui.rc
share/kde/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-share/kde/apps/kscreenlocker/kscreenlocker.notifyrc
-share/kde/apps/ksplash/Themes/Default/1024x768/background.png
-share/kde/apps/ksplash/Themes/Default/1280x1024/background.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/background.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/description.txt
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon1.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon1_anim.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon2.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon2_anim.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon3.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon3_anim.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon4.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon4_anim.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon5.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon5_anim.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/rectangle.png
-share/kde/apps/ksplash/Themes/Default/1920x1080/background.png
-share/kde/apps/ksplash/Themes/Default/1920x1200/background.png
-share/kde/apps/ksplash/Themes/Default/600x400/background.png
-share/kde/apps/ksplash/Themes/Default/800x600/background.png
-share/kde/apps/ksplash/Themes/Default/Preview.png
-share/kde/apps/ksplash/Themes/Default/Theme.rc
+share/kde/apps/ksmserver/ksmserver.notifyrc
+share/kde/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/AccelButton.qml
+share/kde/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/Greeter.qml
+share/kde/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/SessionSwitching.qml
+share/kde/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/main.qml
+share/kde/apps/ksmserver/screenlocker/org.kde.passworddialog/metadata.desktop
+share/kde/apps/ksmserver/themes/contour/ContourButton.qml
+share/kde/apps/ksmserver/themes/contour/main.qml
+share/kde/apps/ksmserver/themes/contour/metadata.desktop
+share/kde/apps/ksmserver/themes/contour/screenshot.png
+share/kde/apps/ksmserver/themes/default/ContextMenu.qml
+share/kde/apps/ksmserver/themes/default/KSMButton.qml
+share/kde/apps/ksmserver/themes/default/MenuItem.qml
+share/kde/apps/ksmserver/themes/default/helper.js
+share/kde/apps/ksmserver/themes/default/main.qml
+share/kde/apps/ksmserver/themes/default/metadata.desktop
+share/kde/apps/ksmserver/themes/default/screenshot.png
share/kde/apps/ksplash/Themes/Minimalistic/Preview.png
share/kde/apps/ksplash/Themes/Minimalistic/Theme.rc
share/kde/apps/ksplash/Themes/Minimalistic/images/kdegear.png
@@ -1470,8 +1459,14 @@ share/kde/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.pn
share/kde/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
share/kde/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
share/kde/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
-share/kde/apps/kwin/DefaultTabBoxLayouts.xml
share/kde/apps/kwin/aurorae.desktop
+share/kde/apps/kwin/aurorae/AuroraeButton.qml
+share/kde/apps/kwin/aurorae/AuroraeButtonGroup.qml
+share/kde/apps/kwin/aurorae/AuroraeMaximizeButton.qml
+share/kde/apps/kwin/aurorae/Decoration.qml
+share/kde/apps/kwin/aurorae/DecorationButton.qml
+share/kde/apps/kwin/aurorae/MenuButton.qml
+share/kde/apps/kwin/aurorae/aurorae.qml
share/kde/apps/kwin/b2.desktop
share/kde/apps/kwin/blinking-startup-fragment.glsl
share/kde/apps/kwin/coverswitch-reflection.glsl
@@ -1480,12 +1475,28 @@ share/kde/apps/kwin/cube-reflection.glsl
share/kde/apps/kwin/cubecap.png
share/kde/apps/kwin/cylinder.frag
share/kde/apps/kwin/cylinder.vert
+share/kde/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/config/main.xml
+share/kde/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui/PlastikButton.qml
+share/kde/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui/config.ui
+share/kde/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui/main.qml
+share/kde/apps/kwin/decorations/kwin4_decoration_qml_plastik/metadata.desktop
share/kde/apps/kwin/default_rules/fsp_workarounds_1.kwinrules
share/kde/apps/kwin/default_rules/plasma_desktop_containment.kwinrules
+share/kde/apps/kwin/effects/kwin4_effect_fade/contents/code/main.js
+share/kde/apps/kwin/effects/kwin4_effect_fade/contents/config/main.xml
+share/kde/apps/kwin/effects/kwin4_effect_fade/metadata.desktop
+share/kde/apps/kwin/effects/kwin4_effect_fadedesktop/contents/code/main.js
+share/kde/apps/kwin/effects/kwin4_effect_fadedesktop/metadata.desktop
+share/kde/apps/kwin/effects/kwin4_effect_maximize/contents/code/maximize.js
+share/kde/apps/kwin/effects/kwin4_effect_maximize/metadata.desktop
share/kde/apps/kwin/explosion-end.png
share/kde/apps/kwin/explosion-start.png
share/kde/apps/kwin/explosion.frag
share/kde/apps/kwin/invert.frag
+share/kde/apps/kwin/kcm_kwindecoration/AuroraeDecoration.qml
+share/kde/apps/kwin/kcm_kwindecoration/AuroraePreview.qml
+share/kde/apps/kwin/kcm_kwindecoration/DecorationPreview.qml
+share/kde/apps/kwin/kcm_kwindecoration/main.qml
share/kde/apps/kwin/kcm_kwintabbox/dolphin.png
share/kde/apps/kwin/kcm_kwintabbox/kmail.png
share/kde/apps/kwin/kcm_kwintabbox/konqueror.png
@@ -1493,24 +1504,53 @@ share/kde/apps/kwin/kcm_kwintabbox/main.qml
share/kde/apps/kwin/kcm_kwintabbox/systemsettings.png
share/kde/apps/kwin/kwin.notifyrc
share/kde/apps/kwin/laptop.desktop
+share/kde/apps/kwin/logout-blur.frag
share/kde/apps/kwin/lookingglass.frag
share/kde/apps/kwin/oxygenclient.desktop
-share/kde/apps/kwin/plastik.desktop
+share/kde/apps/kwin/scripts/desktopchangeosd/contents/ui/main.qml
+share/kde/apps/kwin/scripts/desktopchangeosd/metadata.desktop
+share/kde/apps/kwin/scripts/synchronizeskipswitcher/contents/code/main.js
+share/kde/apps/kwin/scripts/synchronizeskipswitcher/metadata.desktop
+share/kde/apps/kwin/scripts/videowall/contents/code/main.js
+share/kde/apps/kwin/scripts/videowall/metadata.desktop
share/kde/apps/kwin/sphere.vert
-share/kde/apps/kwin/tabbox/IconTabBox.qml
-share/kde/apps/kwin/tabbox/big_icons.qml
-share/kde/apps/kwin/tabbox/compact.qml
-share/kde/apps/kwin/tabbox/informative.qml
-share/kde/apps/kwin/tabbox/small_icons.qml
+share/kde/apps/kwin/stripTitle.js
+share/kde/apps/kwin/tabbox/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/big_icons/contents/ui/IconTabBox.qml
+share/kde/apps/kwin/tabbox/big_icons/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/big_icons/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/big_icons/metadata.desktop
+share/kde/apps/kwin/tabbox/compact/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/compact/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/compact/metadata.desktop
+share/kde/apps/kwin/tabbox/desktop.qml
+share/kde/apps/kwin/tabbox/informative/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/informative/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/informative/metadata.desktop
+share/kde/apps/kwin/tabbox/present_windows/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/present_windows/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/present_windows/metadata.desktop
+share/kde/apps/kwin/tabbox/small_icons/contents/ui/IconTabBox.qml
+share/kde/apps/kwin/tabbox/small_icons/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/small_icons/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/small_icons/metadata.desktop
share/kde/apps/kwin/tabbox/tabbox.qml
-share/kde/apps/kwin/tabbox/text.qml
-share/kde/apps/kwin/tabbox/thumbnails.qml
-share/kde/apps/kwin/tabstrip.desktop
-share/kde/apps/kwin/trackmouse.png
+share/kde/apps/kwin/tabbox/text/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/text/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/text/metadata.desktop
+share/kde/apps/kwin/tabbox/thumbnails/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/thumbnails/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/thumbnails/metadata.desktop
+share/kde/apps/kwin/tabbox/window_strip/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/window_strip/metadata.desktop
+share/kde/apps/kwin/tm_inner.png
+share/kde/apps/kwin/tm_outer.png
+share/kde/apps/kwin/vignetting.frag
share/kde/apps/kwrited/kwrited.notifyrc
share/kde/apps/plasma-desktop/init/00-defaultLayout.js
share/kde/apps/plasma-desktop/plasma-desktop.notifyrc
share/kde/apps/plasma-desktop/updates/addShowActivitiesManagerPlasmoid.js
+share/kde/apps/plasma-desktop/updates/set-hidden-single-vd-pager.js
share/kde/apps/plasma-desktop/updates/systray-to-notifications-widget.js
share/kde/apps/plasma-netbook/init/00-defaultLayout.js
share/kde/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
@@ -1536,6 +1576,40 @@ share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/conte
share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/metadata.desktop
share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents/layout.js
share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/metadata.desktop
+share/kde/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/.directory
+share/kde/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/ActivityDelegate.qml
+share/kde/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/main.qml
+share/kde/apps/plasma/packages/org.kde.desktop.activitymanager/metadata.desktop
+share/kde/apps/plasma/packages/org.kde.desktop.widgetexplorer/Messages.sh
+share/kde/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/AppletDelegate.qml
+share/kde/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/Tooltip.qml
+share/kde/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/main.qml
+share/kde/apps/plasma/packages/org.kde.desktop.widgetexplorer/metadata.desktop
+share/kde/apps/plasma/packages/org.kde.pager/contents/ui/main.qml
+share/kde/apps/plasma/packages/org.kde.pager/contents/ui/utils.js
+share/kde/apps/plasma/packages/org.kde.pager/metadata.desktop
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/code/IconsList.js
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/code/TasksSet.js
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/code/main.js
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/ArrowArea.qml
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/IconsGrid.qml
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/IconsList.qml
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/StatusNotifierItem.qml
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/TrayIcon.qml
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/main.qml
+share/kde/apps/plasma/plasmoids/battery/contents/code/logic.js
+share/kde/apps/plasma/plasmoids/battery/contents/code/platform.js
+share/kde/apps/plasma/plasmoids/battery/contents/config/main.xml
+share/kde/apps/plasma/plasmoids/battery/contents/ui/BatteryIcon.qml
+share/kde/apps/plasma/plasmoids/battery/contents/ui/PopupDialog.qml
+share/kde/apps/plasma/plasmoids/battery/contents/ui/batterymonitor.qml
+share/kde/apps/plasma/plasmoids/battery/contents/ui/config.ui
+share/kde/apps/plasma/plasmoids/battery/metadata.desktop
+share/kde/apps/plasma/plasmoids/lockout/contents/config/main.xml
+share/kde/apps/plasma/plasmoids/lockout/contents/ui/config.ui
+share/kde/apps/plasma/plasmoids/lockout/contents/ui/data.js
+share/kde/apps/plasma/plasmoids/lockout/contents/ui/lockout.qml
+share/kde/apps/plasma/plasmoids/lockout/metadata.desktop
share/kde/apps/plasma/plasmoids/notifier/contents/config/main.xml
share/kde/apps/plasma/plasmoids/notifier/contents/ui/ActionItem.qml
share/kde/apps/plasma/plasmoids/notifier/contents/ui/DeviceItem.qml
@@ -1543,11 +1617,30 @@ share/kde/apps/plasma/plasmoids/notifier/contents/ui/StatusBar.qml
share/kde/apps/plasma/plasmoids/notifier/contents/ui/config.ui
share/kde/apps/plasma/plasmoids/notifier/contents/ui/devicenotifier.qml
share/kde/apps/plasma/plasmoids/notifier/metadata.desktop
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/config/main.xml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/JobDelegate.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/Jobs.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/LastNotificationPopup.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationDelegate/NotificationDelegate.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationDelegate/qmldir
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationIcon.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/Notifications.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/Title.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/config.ui
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/main.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/uiproperties.js
+share/kde/apps/plasma/plasmoids/org.kde.notifications/metadata.desktop
+share/kde/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/NotificationDelegate/NotificationDelegate.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/NotificationDelegate/qmldir
+share/kde/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/uiproperties.js
+share/kde/apps/plasma/plasmoids/org.kde.showActivityManager/contents/ui/main.qml
+share/kde/apps/plasma/plasmoids/org.kde.showActivityManager/metadata.desktop
share/kde/apps/plasma/services/activities.operations
share/kde/apps/plasma/services/applicationjobs.operations
share/kde/apps/plasma/services/apps.operations
share/kde/apps/plasma/services/hotplug.operations
share/kde/apps/plasma/services/modifierkeystate.operations
+share/kde/apps/plasma/services/mpris2.operations
share/kde/apps/plasma/services/notifications.operations
share/kde/apps/plasma/services/nowplaying.operations
share/kde/apps/plasma/services/org.kde.places.operations
@@ -1621,7 +1714,6 @@ share/kde/autostart/plasma-desktop.desktop
share/kde/autostart/plasma.desktop
share/kde/config.kcfg/freespacenotifier.kcfg
share/kde/config.kcfg/klaunch.kcfg
-share/kde/config.kcfg/kscreensaversettings.kcfg
share/kde/config.kcfg/kwin.kcfg
share/kde/config.kcfg/plasma-shell-desktop.kcfg
share/kde/config/activities.knsrc
@@ -1641,6 +1733,9 @@ share/kde/config/kdm/kdmrc
share/kde/config/kfontinst.knsrc
share/kde/config/ksplash.knsrc
share/kde/config/ksysguard.knsrc
+share/kde/config/kwineffect.knsrc
+share/kde/config/kwinscripts.knsrc
+share/kde/config/kwinswitcher.knsrc
share/kde/config/plasma-overlayrc
share/kde/config/plasma-themes.knsrc
share/kde/config/wallpaper.knsrc
@@ -1684,11 +1779,13 @@ share/kde4/services/kcmaccess.desktop
share/kde4/services/kcmlaunch.desktop
share/kde4/services/kcmsmserver.desktop
share/kde4/services/kcmusb.desktop
+share/kde4/services/kded/appmenu.desktop
share/kde4/services/kded/freespacenotifier.desktop
share/kde4/services/kded/kephal.desktop
share/kde4/services/kded/keyboard.desktop
share/kde4/services/kded/khotkeys.desktop
${PLIST.utempter}share/kde4/services/kded/kwrited.desktop
+share/kde4/services/kded/ktouchpadenabler.desktop
share/kde4/services/kded/powerdevil.desktop
share/kde4/services/kded/randrmonitor.desktop
share/kde4/services/kded/statusnotifierwatcher.desktop
@@ -1697,6 +1794,9 @@ share/kde4/services/keys.desktop
share/kde4/services/kfontviewpart.desktop
share/kde4/services/khotkeys.desktop
share/kde4/services/ksplashthememgr.desktop
+share/kde4/services/kwin-script-desktopchangeosd.desktop
+share/kde4/services/kwin-script-synchronizeskipswitcher.desktop
+share/kde4/services/kwin-script-videowall.desktop
share/kde4/services/kwin/blur.desktop
share/kde4/services/kwin/blur_config.desktop
share/kde4/services/kwin/boxswitch.desktop
@@ -1716,8 +1816,6 @@ share/kde4/services/kwin/diminactive.desktop
share/kde4/services/kwin/diminactive_config.desktop
share/kde4/services/kwin/dimscreen.desktop
share/kde4/services/kwin/explosion.desktop
-share/kde4/services/kwin/fade.desktop
-share/kde4/services/kwin/fadedesktop.desktop
share/kde4/services/kwin/fallapart.desktop
share/kde4/services/kwin/flipswitch.desktop
share/kde4/services/kwin/flipswitch_config.desktop
@@ -1726,6 +1824,18 @@ share/kde4/services/kwin/glide_config.desktop
share/kde4/services/kwin/highlightwindow.desktop
share/kde4/services/kwin/invert.desktop
share/kde4/services/kwin/invert_config.desktop
+share/kde4/services/kwin/kwin4_decoration_qml_plastik.desktop
+share/kde4/services/kwin/kwin4_effect_fade.desktop
+share/kde4/services/kwin/kwin4_effect_fadedesktop.desktop
+share/kde4/services/kwin/kwin4_effect_maximize.desktop
+share/kde4/services/kwin/kwin4_window_switcher_big_icons.desktop
+share/kde4/services/kwin/kwin4_window_switcher_compact.desktop
+share/kde4/services/kwin/kwin4_window_switcher_informative.desktop
+share/kde4/services/kwin/kwin4_window_switcher_present_windows.desktop
+share/kde4/services/kwin/kwin4_window_switcher_small_icons.desktop
+share/kde4/services/kwin/kwin4_window_switcher_text.desktop
+share/kde4/services/kwin/kwin4_window_switcher_thumbnails.desktop
+share/kde4/services/kwin/kwin4_window_switcher_window_strip.desktop
share/kde4/services/kwin/login.desktop
share/kde4/services/kwin/login_config.desktop
share/kde4/services/kwin/logout.desktop
@@ -1736,6 +1846,8 @@ share/kde4/services/kwin/magiclamp_config.desktop
share/kde4/services/kwin/magnifier.desktop
share/kde4/services/kwin/magnifier_config.desktop
share/kde4/services/kwin/minimizeanimation.desktop
+share/kde4/services/kwin/mouseclick.desktop
+share/kde4/services/kwin/mouseclick_config.desktop
share/kde4/services/kwin/mousemark.desktop
share/kde4/services/kwin/mousemark_config.desktop
share/kde4/services/kwin/outline.desktop
@@ -1776,6 +1888,7 @@ share/kde4/services/kwinmoving.desktop
share/kde4/services/kwinoptions.desktop
share/kde4/services/kwinrules.desktop
share/kde4/services/kwinscreenedges.desktop
+share/kde4/services/kwinscripts.desktop
share/kde4/services/kwintabbox.desktop
share/kde4/services/lostfoundcategory.desktop
share/kde4/services/mouse.desktop
@@ -1785,6 +1898,7 @@ share/kde4/services/opengl.desktop
share/kde4/services/plasma-animator-default.desktop
share/kde4/services/plasma-applet-activitybar.desktop
share/kde4/services/plasma-applet-analogclock.desktop
+share/kde4/services/plasma-applet-batterymonitor.desktop
share/kde4/services/plasma-applet-calendar.desktop
share/kde4/services/plasma-applet-currentappcontrol.desktop
share/kde4/services/plasma-applet-devicenotifier.desktop
@@ -1792,7 +1906,7 @@ share/kde4/services/plasma-applet-digitalclock.desktop
share/kde4/services/plasma-applet-icon.desktop
share/kde4/services/plasma-applet-launcher.desktop
share/kde4/services/plasma-applet-lockout.desktop
-share/kde4/services/plasma-applet-notifications.desktop
+share/kde4/services/plasma-applet-org.kde.notifications.desktop
share/kde4/services/plasma-applet-org.kde.showActivityManager.desktop
share/kde4/services/plasma-applet-panelspacer-internal.desktop
share/kde4/services/plasma-applet-quicklaunch.desktop
@@ -1800,6 +1914,7 @@ share/kde4/services/plasma-applet-searchbox.desktop
share/kde4/services/plasma-applet-simplelauncher.desktop
share/kde4/services/plasma-applet-sm_cpu.desktop
share/kde4/services/plasma-applet-sm_hdd.desktop
+share/kde4/services/plasma-applet-sm_hdd_activity.desktop
share/kde4/services/plasma-applet-sm_hwinfo.desktop
share/kde4/services/plasma-applet-sm_net.desktop
share/kde4/services/plasma-applet-sm_ram.desktop
@@ -1809,7 +1924,6 @@ share/kde4/services/plasma-applet-systemtray.desktop
share/kde4/services/plasma-applet-trash.desktop
share/kde4/services/plasma-applet-webbrowser.desktop
share/kde4/services/plasma-applet-windowlist.desktop
-share/kde4/services/plasma-battery-default.desktop
share/kde4/services/plasma-containment-desktop.desktop
share/kde4/services/plasma-containment-desktopdashboard.desktop
share/kde4/services/plasma-containment-netpanel.desktop
@@ -1835,6 +1949,7 @@ share/kde4/services/plasma-dataengine-geolocation.desktop
share/kde4/services/plasma-dataengine-hotplug.desktop
share/kde4/services/plasma-dataengine-keystate.desktop
share/kde4/services/plasma-dataengine-mouse.desktop
+share/kde4/services/plasma-dataengine-mpris2.desktop
share/kde4/services/plasma-dataengine-network.desktop
share/kde4/services/plasma-dataengine-notifications.desktop
share/kde4/services/plasma-dataengine-nowplaying.desktop
@@ -1966,10 +2081,12 @@ share/kde4/services/solidbackends/solid_wicd.desktop
share/kde4/services/standard_actions.desktop
share/kde4/services/style.desktop
share/kde4/services/workspaceoptions.desktop
-share/kde4/services/xinerama.desktop
share/kde4/services/xserver.desktop
share/kde4/servicetypes/kinfocentercategory.desktop
+share/kde4/servicetypes/kwindecoration.desktop
share/kde4/servicetypes/kwineffect.desktop
+share/kde4/servicetypes/kwinscript.desktop
+share/kde4/servicetypes/kwinwindowswitcher.desktop
share/kde4/servicetypes/plasma-geolocationprovider.desktop
share/kde4/servicetypes/plasma-layout-template.desktop
share/kde4/servicetypes/plasma-sal-menu.desktop
@@ -1979,6 +2096,7 @@ share/kde4/servicetypes/screensaver.desktop
share/kde4/servicetypes/solid-device-type.desktop
share/kde4/servicetypes/solidmodemmanager.desktop
share/kde4/servicetypes/solidnetworkmanager.desktop
+share/kde4/servicetypes/solidremotecontrolmanager.desktop
share/kde4/servicetypes/systemsettingscategory.desktop
share/kde4/servicetypes/systemsettingsexternalapp.desktop
share/kde4/servicetypes/systemsettingsview.desktop
diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo
index f3b3706a95a..cbae502663f 100644
--- a/x11/kde-workspace4/distinfo
+++ b/x11/kde-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/01/17 16:05:53 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/04/03 10:51:50 markd Exp $
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -9,16 +9,16 @@ Size (Daemon.png) = 15725 bytes
SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
Size (NetBSD-flag-1.0.png) = 4532 bytes
-SHA1 (kde-workspace-4.8.4.tar.xz) = a732ceacf34dfb79c8ab243f17cd5a70b9183212
-RMD160 (kde-workspace-4.8.4.tar.xz) = 3d7e1bf7dfd094dea8129681ac311db137b32710
-Size (kde-workspace-4.8.4.tar.xz) = 35841792 bytes
+SHA1 (kde-workspace-4.10.2.tar.xz) = 12b10e8bea44f3aafa0c8d776eadfee14d71c3f8
+RMD160 (kde-workspace-4.10.2.tar.xz) = 1584cee3c208fbbe6e56d25e75e5cd2c51e9bba2
+Size (kde-workspace-4.10.2.tar.xz) = 13564908 bytes
SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 12986752a1062199833df5aeba8163277ddb7361
SHA1 (patch-ksysguard_example_CMakeLists.txt) = bd10f03a308442b8febe8864010987fb504b2d21
-SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 42970c40f8e0e18f36570b504f708c7c100e96b8
+SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 716f1e75fb23f7d6ddf31092e9a60961f078845c
SHA1 (patch-ksysguard_ksysguard_FreeBSD_cpuinfo.c) = e827d09a853b479294a7771b47534d4ba71ef7cb
SHA1 (patch-ksysguard_ksysguard_FreeBSD_uptime.c) = 96169c0c846c7337b65986dc1ce0b1c1b386ff30
SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.c) = 05312793f0c66cacf1bb61c081a8b15e6e7a2619
@@ -31,6 +31,6 @@ SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eac
SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535
SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 9fa5c51c28537c4b242847d3d54c893d28ddcaf4
SHA1 (patch-mkpamserv) = 736fc439a34298f51c9fb09200b9dc8628eabc43
-SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = 75f8a7baf99151232e4f29c71da51be61efc6c4a
+SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = dd052f6c36fbd62dd5fecc0bcf162f22e500463c
SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e
-SHA1 (patch-startkde.cmake) = 415b06854b02d8dd0e2807d9c02a5cc754b59540
+SHA1 (patch-startkde.cmake) = bf651bde0a44520124453aa2f60fa956f237a6cf
diff --git a/x11/kde-workspace4/patches/patch-ksysguard_ksysguard_FreeBSD_ProcessList.c b/x11/kde-workspace4/patches/patch-ksysguard_ksysguard_FreeBSD_ProcessList.c
index 0e30feec30f..9e22cdbf6e3 100644
--- a/x11/kde-workspace4/patches/patch-ksysguard_ksysguard_FreeBSD_ProcessList.c
+++ b/x11/kde-workspace4/patches/patch-ksysguard_ksysguard_FreeBSD_ProcessList.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-ksysguard_ksysguard_FreeBSD_ProcessList.c,v 1.1 2012/03/31 06:39:20 marino Exp $
+$NetBSD: patch-ksysguard_ksysguard_FreeBSD_ProcessList.c,v 1.2 2013/04/03 10:51:50 markd Exp $
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig 2012-03-30 20:44:17.924143000 +0000
+--- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig 2013-03-01 06:32:24.000000000 +0000
+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c
@@ -54,6 +54,24 @@
@@ -70,8 +70,8 @@ $NetBSD: patch-ksysguard_ksysguard_FreeBSD_ProcessList.c,v 1.1 2012/03/31 06:39:
}
+#if defined(__DragonFly__)
-+ /* XXX */
-+ load = 0;
++ /* XXX */
++ load = 0;
+#else
if (last_ps != NULL)
load = (ps->ki_runtime - last_ps->ki_runtime) / 1000000.0 / scale;
@@ -80,4 +80,4 @@ $NetBSD: patch-ksysguard_ksysguard_FreeBSD_ProcessList.c,v 1.1 2012/03/31 06:39:
+#endif
if (!ps->ki_pid)
- // XXX: TODO: add support for displaying kernel process
+ /* XXX: TODO: add support for displaying kernel process */
diff --git a/x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp b/x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp
index 4d7b265dbfa..5d68deb70b7 100644
--- a/x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp
+++ b/x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp
@@ -1,15 +1,17 @@
-$NetBSD: patch-plasma_generic_applets_digital-clock_clock.cpp,v 1.1 2012/03/19 19:44:04 markd Exp $
+$NetBSD: patch-plasma_generic_applets_digital-clock_clock.cpp,v 1.2 2013/04/03 10:51:50 markd Exp $
avoid an infinite loop when starting plasma. (from Sverre Froyen)
---- plasma/generic/applets/digital-clock/clock.cpp.orig 2012-01-09 10:32:10.000000000 -0700
-+++ plasma/generic/applets/digital-clock/clock.cpp 2012-01-10 11:57:19.000000000 -0700
-@@ -687,23 +687,36 @@ void Clock::generatePixmap()
+--- plasma/generic/applets/digital-clock/clock.cpp.orig 2013-03-01 06:32:24.000000000 +0000
++++ plasma/generic/applets/digital-clock/clock.cpp
+@@ -678,32 +678,38 @@ void Clock::generatePixmap()
void Clock::expandFontToMax(QFont &font, const QString &text)
{
- bool first = true;
const QRect rect = contentsRect().toRect();
+ int oldWidth = 0;
+ int oldHeight = 0;
+ int tryMax = 10;
+ int trys = 0;
+ int pointSize = font.pointSize();
@@ -28,7 +30,8 @@ avoid an infinite loop when starting plasma. (from Sverre Froyen)
+ font.setPointSize(font.pointSize() + 1);
const QFontMetrics fm(font);
QRect fr = fm.boundingRect(rect, Qt::TextSingleLine, text);
-- if (fr.width() >= rect.width() || fr.height() >= rect.height()) {
+- if (oldWidth == fr.width() && oldHeight == fr.height()) {
+- // Largest font size reached.
- break;
+ if (fr.width() > width || fr.height() > height) {
+ width = fr.width();
@@ -40,11 +43,16 @@ avoid an infinite loop when starting plasma. (from Sverre Froyen)
+ pointSize = font.pointSize();
+ trys = 0;
}
-- } while (true);
+- oldWidth = fr.width();
+- oldHeight = fr.height();
+-
+- if (fr.width() >= rect.width() || fr.height() >= rect.height()) {
+- break;
+ else {
+ // Real point size did not change
+ trys++;
-+ }
+ }
+- } while (true);
+ } while (trys < tryMax);
+
+ font.setPointSize(pointSize);
diff --git a/x11/kde-workspace4/patches/patch-startkde.cmake b/x11/kde-workspace4/patches/patch-startkde.cmake
index f5aba28f43f..2e9a82e2628 100644
--- a/x11/kde-workspace4/patches/patch-startkde.cmake
+++ b/x11/kde-workspace4/patches/patch-startkde.cmake
@@ -1,8 +1,8 @@
-$NetBSD: patch-startkde.cmake,v 1.1 2012/03/19 19:44:04 markd Exp $
+$NetBSD: patch-startkde.cmake,v 1.2 2013/04/03 10:51:50 markd Exp $
---- startkde.cmake.orig 2007-11-29 02:29:24.000000000 +1300
+--- startkde.cmake.orig 2013-03-01 06:32:24.000000000 +0000
+++ startkde.cmake
-@@ -38,6 +38,12 @@ if [ -n "$bindir" ]; then
+@@ -32,6 +32,12 @@ if [ -n "$bindir" ]; then
esac
fi
@@ -12,10 +12,10 @@ $NetBSD: patch-startkde.cmake,v 1.1 2012/03/19 19:44:04 markd Exp $
+ *) PATH=$qtbindir:$PATH; export PATH;;
+esac
+
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -219,11 +225,11 @@ usr_fdir=$HOME/.fonts
+ # Check if a KDE session already is running and whether it's possible to connect to X
+ kcheckrunning
+ kcheckrunning_result=$?
+@@ -192,11 +198,11 @@ usr_fdir=$HOME/.fonts
if test -n "$KDEDIRS"; then
kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index fae5000756f..2a8ba534f84 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2013/02/16 11:19:50 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2013/04/03 10:51:44 markd Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 9
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
@@ -41,6 +40,7 @@ REPLACE_PERL+= \
kio/proxytype.pl \
kio/useragent.pl \
kio/misc/fileshareset \
+ kioslave/http/kcookiejar/kcookiescfg.pl \
kdeui/preparetips \
plasma/data/kconfig_updates/plasma_popupapplet_fix_groups.pl
@@ -58,7 +58,7 @@ SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g'
SUBST_CLASSES+= phononrelpath
SUBST_STAGE.phononrelpath= post-configure
SUBST_MESSAGE.phononrelpath= Fixing phonon RELWITHDEBINFO path
-SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-relwithdebinfo.cmake
+SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-${TARGET_NAME}.cmake
SUBST_SED.phononrelpath= -e 's:[^"]*/\.buildlink/lib/libphonon\.so::'
USE_TOOLS+= flex gmake
@@ -82,7 +82,7 @@ BUILDLINK_DEPMETHOD.qt4-tools= full
BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
BUILDLINK_API_DEPENDS.soprano+= soprano>=2.5.60
-BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.6.5
+BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.10.0
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index f16292925d5..65892343f5d 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/06/16 04:45:39 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2013/04/03 10:51:44 markd Exp $
bin/checkXML
bin/kbuildsycoca4
bin/kconfig_compiler
@@ -11,8 +11,10 @@ bin/kdeinit4_wrapper
bin/kfilemetadatareader
bin/kjs
bin/kjscmd
+bin/kmailservice
bin/kross
bin/kshell4
+bin/ktelnetservice
bin/kunittestmodrunner
bin/kwrapper4
bin/makekdewidgets
@@ -229,6 +231,7 @@ include/KDE/KAuth/ActionWatcher
include/KDE/KAuth/HelperSupport
include/KDE/KAuthorized
include/KDE/KAutoMount
+include/KDE/KAutoSaveFile
include/KDE/KAutoUnmount
include/KDE/KAutostart
include/KDE/KBookmark
@@ -244,6 +247,7 @@ include/KDE/KBookmarkImporterBase
include/KDE/KBookmarkManager
include/KDE/KBookmarkMenu
include/KDE/KBookmarkOwner
+include/KDE/KBreadcrumbSelectionModel
include/KDE/KBugReport
include/KDE/KBuildSycocaProgressDialog
include/KDE/KButtonGroup
@@ -255,6 +259,7 @@ include/KDE/KCModuleProxy
include/KDE/KCMultiDialog
include/KDE/KCalendarSystem
include/KDE/KCalendarSystemFactory
+include/KDE/KCapacityBar
include/KDE/KCategorizedSortFilterProxyModel
include/KDE/KCategorizedView
include/KDE/KCategoryDrawer
@@ -264,6 +269,7 @@ include/KDE/KCharsets
include/KDE/KCheckableProxyModel
include/KDE/KCmdLineArgs
include/KDE/KCmdLineOptions
+include/KDE/KCodecAction
include/KDE/KCodecs
include/KDE/KColor
include/KDE/KColorButton
@@ -299,6 +305,7 @@ include/KDE/KCurrencyCode
include/KDE/KCursor
include/KDE/KDBusServiceStarter
include/KDE/KDEDModule
+include/KDE/KDEPrintDialog
include/KDE/KDEsuClient
include/KDE/KDataTool
include/KDE/KDataToolAction
@@ -314,8 +321,10 @@ include/KDE/KDateWidget
include/KDE/KDebug
include/KDE/KDescendantsProxyModel
include/KDE/KDesktopFile
+include/KDE/KDeviceListModel
include/KDE/KDialog
include/KDE/KDialogButtonBox
+include/KDE/KDialogJobUiDelegate
include/KDE/KDirLister
include/KDE/KDirModel
include/KDE/KDirNotify
@@ -359,6 +368,7 @@ include/KDE/KFileSharePropsPlugin
include/KDE/KFileTreeBranch
include/KDE/KFileTreeView
include/KDE/KFileWidget
+include/KDE/KFileWritePlugin
include/KDE/KFilterBase
include/KDE/KFilterDev
include/KDE/KFilterProxySearchLine
@@ -377,6 +387,7 @@ include/KDE/KGenericFactoryBase
include/KDE/KGlobal
include/KDE/KGlobalAccel
include/KDE/KGlobalSettings
+include/KDE/KGlobalShortcutInfo
include/KDE/KGradientSelector
include/KDE/KGraphicsWebView
include/KDE/KGuiItem
@@ -440,6 +451,7 @@ include/KDE/KIconDialog
include/KDE/KIconEffect
include/KDE/KIconLoader
include/KDE/KIconTheme
+include/KDE/KIdentityProxyModel
include/KDE/KIdleTime
include/KDE/KImageCache
include/KDE/KImageFilePreview
@@ -449,6 +461,7 @@ include/KDE/KIntNumInput
include/KDE/KIntSpinBox
include/KDE/KIntValidator
include/KDE/KJob
+include/KDE/KJobTrackerInterface
include/KDE/KJobUiDelegate
include/KDE/KKeySequenceWidget
include/KDE/KLanguageButton
@@ -457,9 +470,11 @@ include/KDE/KLibFactory
include/KDE/KLibLoader
include/KDE/KLibrary
include/KDE/KLineEdit
+include/KDE/KLinkItemSelectionModel
include/KDE/KListWidget
include/KDE/KListWidgetSearchLine
include/KDE/KLocale
+include/KDE/KLocalizedDate
include/KDE/KLocalizedString
include/KDE/KLockFile
include/KDE/KMD5
@@ -481,7 +496,9 @@ include/KDE/KMimeTypeChooserDialog
include/KDE/KMimeTypeResolver
include/KDE/KMimeTypeTrader
include/KDE/KMimeTypeValidator
+include/KDE/KModelIndexProxyMapper
include/KDE/KModifierKeyInfo
+include/KDE/KMountPoint
include/KDE/KMozillaBookmarkImporterImpl
include/KDE/KMultiTabBar
include/KDE/KMultiTabBarButton
@@ -502,6 +519,7 @@ include/KDE/KNSBookmarkExporterImpl
include/KDE/KNSBookmarkImporter
include/KDE/KNSBookmarkImporterImpl
include/KDE/KNTLM
+include/KDE/KNameAndUrlInputDialog
include/KDE/KNetwork/KActiveSocketBase
include/KDE/KNetwork/KBufferedSocket
include/KDE/KNetwork/KClientSocketBase
@@ -524,6 +542,7 @@ include/KDE/KNetwork/KSocksSocketDevice
include/KDE/KNetwork/KStreamSocket
include/KDE/KNetwork/KUnixSocketAddress
include/KDE/KNewFileMenu
+include/KDE/KNewPasswordDialog
include/KDE/KNotification
include/KDE/KNotificationRestrictions
include/KDE/KNotifyConfigWidget
@@ -553,6 +572,7 @@ include/KDE/KParts/GenericFactory
include/KDE/KParts/GenericFactoryBase
include/KDE/KParts/HistoryProvider
include/KDE/KParts/HtmlExtension
+include/KDE/KParts/ListingExtension
include/KDE/KParts/LiveConnectExtension
include/KDE/KParts/MainWindow
include/KDE/KParts/OpenUrlEvent
@@ -600,10 +620,12 @@ include/KDE/KPtyProcess
include/KDE/KPushButton
include/KDE/KRandom
include/KDE/KRandomSequence
+include/KDE/KRatingPainter
include/KDE/KRatingWidget
include/KDE/KRecentDocument
include/KDE/KRecentFilesAction
include/KDE/KRecursiveFilterProxyModel
+include/KDE/KRegExpEditorInterface
include/KDE/KRemoteEncoding
include/KDE/KReplace
include/KDE/KReplaceDialog
@@ -623,6 +645,7 @@ include/KDE/KSelectionWatcher
include/KDE/KSelector
include/KDE/KSeparator
include/KDE/KService
+include/KDE/KServiceAction
include/KDE/KServiceGroup
include/KDE/KServiceType
include/KDE/KServiceTypeProfile
@@ -655,6 +678,8 @@ include/KDE/KStartupInfo
include/KDE/KStartupInfoData
include/KDE/KStartupInfoId
include/KDE/KStatusBar
+include/KDE/KStatusBarJobTracker
+include/KDE/KStatusBarOfflineIndicator
include/KDE/KStatusNotifierItem
include/KDE/KStringHandler
include/KDE/KStringListValidator
@@ -763,12 +788,14 @@ include/KDE/KUser
include/KDE/KUserGroup
include/KDE/KVBox
include/KDE/KViewStateMaintainer
+include/KDE/KViewStateSaver
include/KDE/KWallet/Wallet
include/KDE/KWebPage
include/KDE/KWebPluginFactory
include/KDE/KWebView
include/KDE/KWebWallet
include/KDE/KWidgetItemDelegate
+include/KDE/KWidgetJobTracker
include/KDE/KWindowInfo
include/KDE/KWindowSystem
include/KDE/KWordMacroExpander
@@ -1451,6 +1478,7 @@ include/kparts/genericfactory.h
include/kparts/historyprovider.h
include/kparts/htmlextension.h
include/kparts/kparts_export.h
+include/kparts/listingextension.h
include/kparts/mainwindow.h
include/kparts/part.h
include/kparts/partmanager.h
@@ -1908,7 +1936,7 @@ include/threadweaver/WeaverObserver.h
include/threadweaver/threadweaver_export.h
lib/cmake/KDeclarative/KDeclarativeConfig.cmake
lib/cmake/KDeclarative/KDeclarativeConfigVersion.cmake
-lib/cmake/KDeclarative/KDeclarativeLibraryTargets-relwithdebinfo.cmake
+lib/cmake/KDeclarative/KDeclarativeLibraryTargets-${TARGET}.cmake
lib/cmake/KDeclarative/KDeclarativeLibraryTargets.cmake
lib/kde4/emoticonstheme_adium.so
lib/kde4/emoticonstheme_kde.so
@@ -1945,10 +1973,8 @@ ${PLIST.kgrantpty}lib/kde4/libexec/kgrantpty
lib/kde4/libexec/kio_http_cache_cleaner
lib/kde4/libexec/kioslave
lib/kde4/libexec/klauncher
-lib/kde4/libexec/kmailservice
lib/kde4/libexec/kpac_dhcp_helper
lib/kde4/libexec/ksendbugmail
-lib/kde4/libexec/ktelnetservice
lib/kde4/libexec/lnusertemp
lib/kde4/libexec/start_kdeinit
lib/kde4/libexec/start_kdeinit_wrapper
@@ -1975,23 +2001,23 @@ lib/kde4/plugins/kauth/backend/kauth_backend_plugin.so
lib/kde4/plugins/kauth/helper/kauth_helper_plugin.so
lib/kde4/plugins/script/libkrossqtsplugin.so
lib/kde4/plugins/script/libkrossqtsplugin.so.4
-lib/kde4/plugins/script/libkrossqtsplugin.so.4.8.0
+lib/kde4/plugins/script/libkrossqtsplugin.so.${PKGVERSION}
lib/kde4/spellcheckplugin.so
lib/libkcmutils.so
lib/libkcmutils.so.4
-lib/libkcmutils.so.4.8.0
+lib/libkcmutils.so.${PKGVERSION}
lib/libkde3support.so
lib/libkde3support.so.4
-lib/libkde3support.so.4.8.0
+lib/libkde3support.so.${PKGVERSION}
lib/libkdeclarative.so
lib/libkdeclarative.so.5
-lib/libkdeclarative.so.5.8.0
+lib/libkdeclarative.so.5.10.2
lib/libkdecore.so
lib/libkdecore.so.5
-lib/libkdecore.so.5.8.0
+lib/libkdecore.so.5.10.2
lib/libkdefakes.so
lib/libkdefakes.so.5
-lib/libkdefakes.so.5.8.0
+lib/libkdefakes.so.5.10.2
lib/libkdeinit4_kbuildsycoca4.so
lib/libkdeinit4_kconf_update.so
lib/libkdeinit4_kded4.so
@@ -1999,103 +2025,103 @@ lib/libkdeinit4_kio_http_cache_cleaner.so
lib/libkdeinit4_klauncher.so
lib/libkdesu.so
lib/libkdesu.so.5
-lib/libkdesu.so.5.8.0
+lib/libkdesu.so.5.10.2
lib/libkdeui.so
lib/libkdeui.so.5
-lib/libkdeui.so.5.8.0
+lib/libkdeui.so.5.10.2
lib/libkdewebkit.so
lib/libkdewebkit.so.5
-lib/libkdewebkit.so.5.8.0
+lib/libkdewebkit.so.5.10.2
lib/libkdnssd.so
lib/libkdnssd.so.4
-lib/libkdnssd.so.4.8.0
+lib/libkdnssd.so.${PKGVERSION}
lib/libkemoticons.so
lib/libkemoticons.so.4
-lib/libkemoticons.so.4.8.0
+lib/libkemoticons.so.${PKGVERSION}
lib/libkfile.so
lib/libkfile.so.4
-lib/libkfile.so.4.8.0
+lib/libkfile.so.${PKGVERSION}
lib/libkhtml.so
lib/libkhtml.so.5
-lib/libkhtml.so.5.8.0
+lib/libkhtml.so.5.10.2
lib/libkidletime.so
lib/libkidletime.so.4
-lib/libkidletime.so.4.8.0
+lib/libkidletime.so.${PKGVERSION}
lib/libkimproxy.so
lib/libkimproxy.so.4
-lib/libkimproxy.so.4.8.0
+lib/libkimproxy.so.${PKGVERSION}
lib/libkio.so
lib/libkio.so.5
-lib/libkio.so.5.8.0
+lib/libkio.so.5.10.2
lib/libkjs.so
lib/libkjs.so.4
-lib/libkjs.so.4.8.0
+lib/libkjs.so.${PKGVERSION}
lib/libkjsapi.so
lib/libkjsapi.so.4
-lib/libkjsapi.so.4.8.0
+lib/libkjsapi.so.${PKGVERSION}
lib/libkjsembed.so
lib/libkjsembed.so.4
-lib/libkjsembed.so.4.8.0
+lib/libkjsembed.so.${PKGVERSION}
lib/libkmediaplayer.so
lib/libkmediaplayer.so.4
-lib/libkmediaplayer.so.4.8.0
+lib/libkmediaplayer.so.${PKGVERSION}
lib/libknewstuff2.so
lib/libknewstuff2.so.4
-lib/libknewstuff2.so.4.8.0
+lib/libknewstuff2.so.${PKGVERSION}
lib/libknewstuff3.so
lib/libknewstuff3.so.4
-lib/libknewstuff3.so.4.8.0
+lib/libknewstuff3.so.${PKGVERSION}
lib/libknotifyconfig.so
lib/libknotifyconfig.so.4
-lib/libknotifyconfig.so.4.8.0
+lib/libknotifyconfig.so.${PKGVERSION}
lib/libkntlm.so
lib/libkntlm.so.4
-lib/libkntlm.so.4.8.0
+lib/libkntlm.so.${PKGVERSION}
lib/libkparts.so
lib/libkparts.so.4
-lib/libkparts.so.4.8.0
+lib/libkparts.so.${PKGVERSION}
lib/libkprintutils.so
lib/libkprintutils.so.4
-lib/libkprintutils.so.4.8.0
+lib/libkprintutils.so.${PKGVERSION}
lib/libkpty.so
lib/libkpty.so.4
-lib/libkpty.so.4.8.0
+lib/libkpty.so.${PKGVERSION}
lib/libkrosscore.so
lib/libkrosscore.so.4
-lib/libkrosscore.so.4.8.0
+lib/libkrosscore.so.${PKGVERSION}
lib/libkrossui.so
lib/libkrossui.so.4
-lib/libkrossui.so.4.8.0
+lib/libkrossui.so.${PKGVERSION}
lib/libktexteditor.so
lib/libktexteditor.so.4
-lib/libktexteditor.so.4.8.0
+lib/libktexteditor.so.${PKGVERSION}
lib/libkunitconversion.so
lib/libkunitconversion.so.4
-lib/libkunitconversion.so.4.8.0
+lib/libkunitconversion.so.${PKGVERSION}
lib/libkunittest.so
lib/libkunittest.so.4
-lib/libkunittest.so.4.8.0
+lib/libkunittest.so.${PKGVERSION}
lib/libkutils.so
lib/libkutils.so.4
-lib/libkutils.so.4.8.0
+lib/libkutils.so.${PKGVERSION}
lib/libnepomuk.so
lib/libnepomuk.so.4
-lib/libnepomuk.so.4.8.0
+lib/libnepomuk.so.${PKGVERSION}
lib/libnepomukquery.so
lib/libnepomukquery.so.4
-lib/libnepomukquery.so.4.8.0
+lib/libnepomukquery.so.${PKGVERSION}
lib/libnepomukutils.so
lib/libnepomukutils.so.4
-lib/libnepomukutils.so.4.8.0
+lib/libnepomukutils.so.${PKGVERSION}
lib/libplasma.so
lib/libplasma.so.3
lib/libplasma.so.3.0.0
lib/libsolid.so
lib/libsolid.so.4
-lib/libsolid.so.4.8.0
+lib/libsolid.so.${PKGVERSION}
lib/libthreadweaver.so
lib/libthreadweaver.so.4
-lib/libthreadweaver.so.4.8.0
+lib/libthreadweaver.so.${PKGVERSION}
man/man1/checkXML.1
man/man1/kconfig_compiler.1
man/man1/kde4-config.1
@@ -2232,10 +2258,6 @@ share/kde/apps/LICENSES/LGPL_V2
share/kde/apps/LICENSES/LGPL_V3
share/kde/apps/LICENSES/QPL_V1.0
share/kde/apps/cmake/modules/BasicFindPackageVersion.cmake.in
-share/kde/apps/cmake/modules/CMakeParseArguments.cmake
-share/kde/apps/cmake/modules/CheckCXXSourceCompiles.cmake
-share/kde/apps/cmake/modules/CheckCXXSourceRuns.cmake
-share/kde/apps/cmake/modules/CheckCXXSymbolExists.cmake
share/kde/apps/cmake/modules/CheckPointerMember.cmake
share/kde/apps/cmake/modules/CheckPrototypeExists.cmake
share/kde/apps/cmake/modules/CheckStructMember.cmake
@@ -2248,7 +2270,6 @@ share/kde/apps/cmake/modules/FindAvahi.cmake
share/kde/apps/cmake/modules/FindBerkeleyDB.cmake
share/kde/apps/cmake/modules/FindBlitz.cmake
share/kde/apps/cmake/modules/FindBlueZ.cmake
-share/kde/apps/cmake/modules/FindBoost.cmake
share/kde/apps/cmake/modules/FindCarbon.cmake
share/kde/apps/cmake/modules/FindDBusMenuQt.cmake
share/kde/apps/cmake/modules/FindDNSSD.cmake
@@ -2261,8 +2282,6 @@ share/kde/apps/cmake/modules/FindFFmpeg.cmake
share/kde/apps/cmake/modules/FindFlac.cmake
share/kde/apps/cmake/modules/FindFlex.cmake
share/kde/apps/cmake/modules/FindFontconfig.cmake
-share/kde/apps/cmake/modules/FindFreetype.cmake
-share/kde/apps/cmake/modules/FindGIF.cmake
share/kde/apps/cmake/modules/FindGLIB2.cmake
share/kde/apps/cmake/modules/FindGMP.cmake
share/kde/apps/cmake/modules/FindGObject.cmake
@@ -2289,7 +2308,6 @@ share/kde/apps/cmake/modules/FindLibAttica.cmake
share/kde/apps/cmake/modules/FindLibKonq.cmake
share/kde/apps/cmake/modules/FindLibLZMA.cmake
share/kde/apps/cmake/modules/FindLibPython.py
-share/kde/apps/cmake/modules/FindLibXml2.cmake
share/kde/apps/cmake/modules/FindLibXslt.cmake
share/kde/apps/cmake/modules/FindLibintl.cmake
share/kde/apps/cmake/modules/FindLibraryWithDebug.cmake
@@ -2301,11 +2319,8 @@ share/kde/apps/cmake/modules/FindNepomuk.cmake
share/kde/apps/cmake/modules/FindNetworkManager.cmake
share/kde/apps/cmake/modules/FindOggVorbis.cmake
share/kde/apps/cmake/modules/FindOpenEXR.cmake
-share/kde/apps/cmake/modules/FindOpenSSL.cmake
share/kde/apps/cmake/modules/FindPCRE.cmake
-share/kde/apps/cmake/modules/FindPackageHandleStandardArgs.cmake
share/kde/apps/cmake/modules/FindPhonon.cmake
-share/kde/apps/cmake/modules/FindPkgConfig.cmake
share/kde/apps/cmake/modules/FindPlasma.cmake
share/kde/apps/cmake/modules/FindPopplerQt4.cmake
share/kde/apps/cmake/modules/FindPostgreSQL.cmake
@@ -2339,9 +2354,9 @@ share/kde/apps/cmake/modules/FindXmms.cmake
share/kde/apps/cmake/modules/HandleImportedTargetsInCMakeRequiredLibraries.cmake
share/kde/apps/cmake/modules/KDE4Defaults.cmake
share/kde/apps/cmake/modules/KDE4Macros.cmake
-share/kde/apps/cmake/modules/KDELibs4LibraryTargets-relwithdebinfo.cmake
+share/kde/apps/cmake/modules/KDELibs4LibraryTargets-${TARGET}.cmake
share/kde/apps/cmake/modules/KDELibs4LibraryTargets.cmake
-share/kde/apps/cmake/modules/KDELibs4ToolsTargets-relwithdebinfo.cmake
+share/kde/apps/cmake/modules/KDELibs4ToolsTargets-${TARGET}.cmake
share/kde/apps/cmake/modules/KDELibs4ToolsTargets.cmake
share/kde/apps/cmake/modules/KDELibsDependencies.cmake
share/kde/apps/cmake/modules/KDEPlatformProfile.cmake
@@ -2383,6 +2398,7 @@ share/kde/apps/kauth/dbus_service.stub
share/kde/apps/kcharselect/kcharselect-data
share/kde/apps/kcm_componentchooser/kcm_instantmessenger.desktop
share/kde/apps/kcm_componentchooser/kcm_ktexteditor.desktop
+share/kde/apps/kconf_update/kcookiescfg.pl
share/kde/apps/kconf_update/kcookiescfg.upd
share/kde/apps/kconf_update/kded.upd
share/kde/apps/kconf_update/kio_help.upd
@@ -2400,7 +2416,7 @@ share/kde/apps/kdeui/about/bar-middle-right.png
share/kde/apps/kdeui/about/bar-top-left.png
share/kde/apps/kdeui/about/bar-top-middle.png
share/kde/apps/kdeui/about/bar-top-right.png
-share/kde/apps/kdeui/about/body-background.jpg
+share/kde/apps/kdeui/about/body-background.png
share/kde/apps/kdeui/about/box-bottom-left.png
share/kde/apps/kdeui/about/box-bottom-middle.png
share/kde/apps/kdeui/about/box-bottom-right.png
@@ -3279,6 +3295,7 @@ share/kde/apps/ksgmltools2/customization/xh/user.entities
share/kde/apps/ksgmltools2/customization/xsl/README
share/kde/apps/ksgmltools2/customization/xsl/all-l10n.xml
share/kde/apps/ksgmltools2/customization/xsl/ca.xml
+share/kde/apps/ksgmltools2/customization/xsl/cs.xml
share/kde/apps/ksgmltools2/customization/xsl/de.xml
share/kde/apps/ksgmltools2/customization/xsl/el.xml
share/kde/apps/ksgmltools2/customization/xsl/en.xml
@@ -3286,6 +3303,7 @@ share/kde/apps/ksgmltools2/customization/xsl/es.xml
share/kde/apps/ksgmltools2/customization/xsl/et.xml
share/kde/apps/ksgmltools2/customization/xsl/fr.xml
share/kde/apps/ksgmltools2/customization/xsl/gl.xml
+share/kde/apps/ksgmltools2/customization/xsl/hu.xml
share/kde/apps/ksgmltools2/customization/xsl/it.xml
share/kde/apps/ksgmltools2/customization/xsl/lt.xml
share/kde/apps/ksgmltools2/customization/xsl/nds.xml
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 562ad12379d..339dd3b8c27 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.32 2012/11/11 22:24:01 joerg Exp $
+$NetBSD: distinfo,v 1.33 2013/04/03 10:51:44 markd Exp $
-SHA1 (kdelibs-4.8.4.tar.xz) = 35cd199a30d84eb37b2b213fed5ee3adf810ea49
-RMD160 (kdelibs-4.8.4.tar.xz) = dba94c16eb0df9d6a4fccefc8097f39f4b63e9ec
-Size (kdelibs-4.8.4.tar.xz) = 12182912 bytes
+SHA1 (kdelibs-4.10.2.tar.xz) = 2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85
+RMD160 (kdelibs-4.10.2.tar.xz) = b1cb62464e146c2f65cf4bb2487be7001ee4fc7b
+Size (kdelibs-4.10.2.tar.xz) = 11979652 bytes
SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
@@ -14,13 +14,10 @@ SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5
SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
+SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = 4b1e7a68fe6f3766deca6d557e80ceafb37a3ee3
SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
-SHA1 (patch-kdecore_CMakeLists.txt) = 1b517aa2d8c39988251c95bcd1daa012ea9bcfaa
SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
-SHA1 (patch-kparts_componentfactory.h) = e670cd8f35b5186bf76e0cc285da65cc8832b82f
SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8
-SHA1 (patch-nepomuk_core_nepomukmainmodel.cpp) = bba701025aa1d33b9d6ce4b6d1fec2a92b4f5552
-SHA1 (patch-nepomuk_core_resourcemanager.cpp) = 99a1e6c319f4798e5c929e77bd6717ffb2e3f571
diff --git a/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake b/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake
new file mode 100644
index 00000000000..00bf990e098
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake
@@ -0,0 +1,19 @@
+$NetBSD: patch-cmake_modules_FindKDE4Internal.cmake,v 1.1 2013/04/03 10:51:44 markd Exp $
+
+Dont pass -std=iso9899:1990 on NetBSD. Breaks ksysguardd at least.
+
+--- cmake/modules/FindKDE4Internal.cmake.orig 2013-03-01 06:26:13.000000000 +0000
++++ cmake/modules/FindKDE4Internal.cmake
+@@ -1204,7 +1204,11 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
+ set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
++ if (CMAKE_SYSTEM_NAME MATCHES NetBSD)
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
++ else (CMAKE_SYSTEM_NAME MATCHES NetBSD)
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
++ endif (CMAKE_SYSTEM_NAME MATCHES NetBSD)
+ # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common")
+
diff --git a/x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt b/x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt
deleted file mode 100644
index b4081d96660..00000000000
--- a/x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-kdecore_CMakeLists.txt,v 1.1 2012/07/05 18:48:33 joerg Exp $
-
---- kdecore/CMakeLists.txt.orig 2012-07-05 12:21:26.000000000 +0000
-+++ kdecore/CMakeLists.txt
-@@ -384,8 +384,9 @@ if(NOT WIN32)
- set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} util/kshareddatacache.cpp)
- set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
-
-- set_source_files_properties(util/kshareddatacache.cpp
-- PROPERTIES COMPILE_FLAGS ${KDE4_ENABLE_EXCEPTIONS})
-+ if (KDE4_ENABLE_EXCEPTIONS)
-+ set_source_files_properties(util/kshareddatacache.cpp PROPERTIES COMPILE_FLAGS ${KDE4_ENABLE_EXCEPTIONS})
-+ endif (KDE4_ENABLE_EXCEPTIONS)
- else(NOT WIN32)
- set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} util/kshareddatacache_win.cpp)
- set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} io/kdirwatch_win.cpp)
diff --git a/x11/kdelibs4/patches/patch-kparts_componentfactory.h b/x11/kdelibs4/patches/patch-kparts_componentfactory.h
deleted file mode 100644
index 3279e6981f3..00000000000
--- a/x11/kdelibs4/patches/patch-kparts_componentfactory.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-kparts_componentfactory.h,v 1.1 2012/11/11 22:24:01 joerg Exp $
-
---- kparts/componentfactory.h.orig 2012-06-06 20:49:52.000000000 +0000
-+++ kparts/componentfactory.h
-@@ -81,7 +81,7 @@ namespace KParts
- const QStringList &args = QStringList(),
- int *error = 0 )
- {
-- KLibrary *library = KLibLoader::self()->library( QString( libraryName ) ); // compatibility hack
-+ KLibrary *library = KLibLoader::self()->library( QString::fromAscii( libraryName ) ); // compatibility hack
- if ( !library )
- {
- if ( error )
diff --git a/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp b/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp
deleted file mode 100644
index 177635f110c..00000000000
--- a/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-nepomuk_core_nepomukmainmodel.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $
-
-ID: 76e0376d7582cfe5b898c56bf3779ca2279dace8
-Revert "Disconnect before re-connecting. Soprano does not do that for us."
-
---- nepomuk/core/nepomukmainmodel.cpp.orig 2012-06-06 20:49:52.000000000 +0000
-+++ nepomuk/core/nepomukmainmodel.cpp
-@@ -97,7 +97,6 @@ public:
- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
- delete localSocketModel;
- localSocketModel = 0;
-- localSocketClient.disconnect();
- QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
- kDebug() << "Connecting to local socket" << socketName;
- if ( localSocketClient.connect( socketName ) ) {
diff --git a/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp b/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp
deleted file mode 100644
index e36e50c6bd8..00000000000
--- a/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-nepomuk_core_resourcemanager.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $
-
-ID: 528144c444ea983470b1cff678d40b1967bce3d5
-Increase the ResourceManager cache size to 10000
-
---- nepomuk/core/resourcemanager.cpp.orig 2012-06-06 20:49:52.000000000 +0000
-+++ nepomuk/core/resourcemanager.cpp
-@@ -178,7 +178,7 @@ QList<Nepomuk::ResourceData*> Nepomuk::R
-
- bool Nepomuk::ResourceManagerPrivate::dataCacheFull() const
- {
-- return dataCnt >= 1000;
-+ return dataCnt >= 10000;
- }
-
-
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index 276bb9093f8..58085e0a6b7 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:25:20 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:51 markd Exp $
DISTNAME= konsole-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= x11
COMMENT= a terminal emulator for the K Desktop Environment
diff --git a/x11/konsole/PLIST b/x11/konsole/PLIST
index 2fce4d6596d..b8973326c06 100644
--- a/x11/konsole/PLIST
+++ b/x11/konsole/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/20 05:07:48 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:51 markd Exp $
bin/konsole
bin/konsoleprofile
lib/kde4/libkonsolepart.so
@@ -8,16 +8,22 @@ share/applications/kde4/konsole.desktop
share/doc/kde/HTML/en/konsole/common
share/doc/kde/HTML/en/konsole/index.cache.bz2
share/doc/kde/HTML/en/konsole/index.docbook
-share/kde/apps/konsole/BlackOnLightYellow.schema
+share/kde/apps/kconf_update/konsole-2.10.0-remove-menuindex-from-profiles.sh
+share/kde/apps/kconf_update/konsole-2.9.0-colorscheme-bold-key.sh
+share/kde/apps/kconf_update/konsole-2.9.0-global-options.sh
+share/kde/apps/kconf_update/konsole.upd
+share/kde/apps/konsole/BlackOnLightYellow.colorscheme
share/kde/apps/konsole/BlackOnRandomLight.colorscheme
-share/kde/apps/konsole/BlackOnWhite.schema
+share/kde/apps/konsole/BlackOnWhite.colorscheme
+share/kde/apps/konsole/BlueOnBlack.colorscheme
share/kde/apps/konsole/DarkPastels.colorscheme
share/kde/apps/konsole/GreenOnBlack.colorscheme
share/kde/apps/konsole/Linux.colorscheme
share/kde/apps/konsole/README.KeyTab
+share/kde/apps/konsole/RedOnBlack.colorscheme
share/kde/apps/konsole/Shell.profile
share/kde/apps/konsole/Solarized.colorscheme
-share/kde/apps/konsole/WhiteOnBlack.schema
+share/kde/apps/konsole/WhiteOnBlack.colorscheme
share/kde/apps/konsole/default.keytab
share/kde/apps/konsole/konsole.notifyrc
share/kde/apps/konsole/konsoleui.rc
diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo
index 939e216c06f..d9700a30709 100644
--- a/x11/konsole/distinfo
+++ b/x11/konsole/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:39 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:51 markd Exp $
-SHA1 (konsole-4.8.4.tar.xz) = a5900aa089a28fcaa69b45cfc7b46f556a38bd11
-RMD160 (konsole-4.8.4.tar.xz) = c4fa6494ea63cc7a8d7ad00f3987698f87dd509d
-Size (konsole-4.8.4.tar.xz) = 441968 bytes
-SHA1 (patch-src_ProcessInfo.cpp) = aa0c1d6bfa7462681b82bdee4609e0cf26211300
+SHA1 (konsole-4.10.2.tar.xz) = 171824f4d06c66a4373274da01cad84853bec821
+RMD160 (konsole-4.10.2.tar.xz) = 52c0b634ee9f40b9cb5add8eaa91e1c416a23644
+Size (konsole-4.10.2.tar.xz) = 447576 bytes
+SHA1 (patch-src_ProcessInfo.cpp) = 3a1e078e344bdb22c092f8ce9ee18a5e2a8c5eef
diff --git a/x11/konsole/patches/patch-src_ProcessInfo.cpp b/x11/konsole/patches/patch-src_ProcessInfo.cpp
index b9b1f4eb57b..baea8722af8 100644
--- a/x11/konsole/patches/patch-src_ProcessInfo.cpp
+++ b/x11/konsole/patches/patch-src_ProcessInfo.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_ProcessInfo.cpp,v 1.1.1.1 2012/03/20 05:07:49 markd Exp $
+$NetBSD: patch-src_ProcessInfo.cpp,v 1.2 2013/04/03 10:51:51 markd Exp $
---- src/ProcessInfo.cpp.orig 2010-03-26 17:26:32.000000000 +0000
+--- src/ProcessInfo.cpp.orig 2013-03-01 06:37:14.000000000 +0000
+++ src/ProcessInfo.cpp
-@@ -894,6 +894,171 @@ private:
+@@ -1030,6 +1030,171 @@ private:
}
- } ;
+ };
+class NetBSDProcessInfo : public UnixProcessInfo
+{
@@ -172,14 +172,14 @@ $NetBSD: patch-src_ProcessInfo.cpp,v 1.1.1.1 2012/03/20 05:07:49 markd Exp $
+} ;
+
SSHProcessInfo::SSHProcessInfo(const ProcessInfo& process)
- : _process(process)
+ : _process(process)
{
-@@ -1039,6 +1204,8 @@ ProcessInfo* ProcessInfo::newInstance(in
- return new LinuxProcessInfo(pid,enableEnvironmentRead);
+@@ -1184,6 +1349,8 @@ ProcessInfo* ProcessInfo::newInstance(in
+ return new LinuxProcessInfo(aPid, enableEnvironmentRead);
#elif defined(Q_OS_SOLARIS)
- return new SolarisProcessInfo(pid,enableEnvironmentRead);
+ return new SolarisProcessInfo(aPid, enableEnvironmentRead);
+#elif defined(Q_OS_NETBSD)
-+ return new NetBSDProcessInfo(pid,enableEnvironmentRead);
++ return new NetBSDProcessInfo(aPid, enableEnvironmentRead);
#elif defined(Q_OS_MAC)
- return new MacProcessInfo(pid,enableEnvironmentRead);
+ return new MacProcessInfo(aPid, enableEnvironmentRead);
#elif defined(Q_OS_FREEBSD)
diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile
index f7bf454b80c..7ae5b8da58d 100644
--- a/x11/py-kde4/Makefile
+++ b/x11/py-kde4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2013/02/16 11:25:23 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2013/04/03 10:52:21 markd Exp $
PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION}
DISTNAME= pykde4-${_KDE_VERSION}
-PKGREVISION= 11
CATEGORIES= misc
COMMENT= Python bindings for the KDE integrated X11 desktop
@@ -31,14 +30,15 @@ SUBST_SED.pykdeuic4= -e 's:/usr/bin/env python$$:${PYTHONBIN}:'
# ${CP} ${FILESDIR}/FindPolkitQt.cmake ${WRKSRC}/cmake/modules
# remove when file not patched any longer
-post-install:
- ${RM} -f ${DESTDIR}${PREFIX}/share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/typedefs.sip.orig
+#post-install:
+# ${RM} -f ${DESTDIR}${PREFIX}/share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/typedefs.sip.orig
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../misc/kdepimlibs4/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../security/polkit-qt/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.10
diff --git a/x11/py-kde4/PLIST b/x11/py-kde4/PLIST
index ad21513060c..249cd7875cb 100644
--- a/x11/py-kde4/PLIST
+++ b/x11/py-kde4/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:04 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:21 markd Exp $
bin/pykdeuic4
+bin/pykdeuic4-${PYVERSSUFFIX}
lib/kde4/kpythonpluginfactory.so
${PYSITELIB}/PyKDE4/__init__.py
${PYSITELIB}/PyKDE4/__init__.pyc
@@ -107,10 +108,12 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatistics.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsdelegate.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsmodel.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionutils_p.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionview.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/control.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/differencesalgorithminterface.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entity.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitydeletedattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitydisplayattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entityhiddenattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitylistview.sip
@@ -171,6 +174,10 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/statisticsproxymodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transactionjobs.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transactionsequence.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transportresourcebase.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashfilterproxymodel.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashjob.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashrestorejob.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashsettings.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/unlinkjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/dnssd/dnssdmod.sip
share/sip${PYVERSSUFFIX}/PyKDE4/dnssd/domainbrowser.sip
diff --git a/x11/py-kde4/distinfo b/x11/py-kde4/distinfo
index 1b2d7e906c8..883c9e5f801 100644
--- a/x11/py-kde4/distinfo
+++ b/x11/py-kde4/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2012/10/11 13:17:09 wiz Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:21 markd Exp $
-SHA1 (pykde4-4.8.4.tar.xz) = e629d7a1d7d1aa1d1dd24769dc5412a60b6ac256
-RMD160 (pykde4-4.8.4.tar.xz) = 563cca881a3f9c298be1c18979b6fcbc5eb8dcc0
-Size (pykde4-4.8.4.tar.xz) = 2111428 bytes
-SHA1 (patch-CMakeLists.txt) = 6981a91671511739e63568d7bc2ee8899d28f8a9
+SHA1 (pykde4-4.10.2.tar.xz) = a17d533fca8126970ec8886f55297f1005df3eb5
+RMD160 (pykde4-4.10.2.tar.xz) = a594a297b18ee4f22f87af3295bb889dd5a58a01
+Size (pykde4-4.10.2.tar.xz) = 2033256 bytes
+SHA1 (patch-CMakeLists.txt) = 605557b9bdbc1b726e32132a21e5b575db18d386
SHA1 (patch-__init__.py) = 721287a0ec82b79ea4a502526ed98ba44c6d979f
-SHA1 (patch-sip_kdecore_typedefs.sip) = 7e8332a4c0d661f564a4cfea800f4fcee945df4c
diff --git a/x11/py-kde4/patches/patch-CMakeLists.txt b/x11/py-kde4/patches/patch-CMakeLists.txt
index 2f490531917..99a2480fe54 100644
--- a/x11/py-kde4/patches/patch-CMakeLists.txt
+++ b/x11/py-kde4/patches/patch-CMakeLists.txt
@@ -1,13 +1,24 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2012/03/19 19:44:04 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2013/04/03 10:52:21 markd Exp $
---- CMakeLists.txt.orig 2010-11-02 12:51:11.000000000 +0000
+Retain the python version number in sip install directory
+
+--- CMakeLists.txt.orig 2013-03-01 06:38:30.000000000 +0000
+++ CMakeLists.txt
-@@ -15,6 +15,8 @@ endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMA
- # This module can be built independant from the rest of kdebindings.
- SET(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+@@ -20,6 +20,8 @@ option(PYKDEUIC4_ALTINSTALL "Enable para
+
+ set(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
+
- # Fix output file conflict with the Ruby bindings
- IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
- SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/pykde)
+ find_package(PythonLibrary)
+
+ set_package_properties(KDE4 PROPERTIES DESCRIPTION "The KDE libraries"
+@@ -241,7 +243,7 @@ endforeach (_X ${SIP_DISABLE_FEATURES})
+
+ get_filename_component(LIB_DIR ${KDE4_LIB_DIR} NAME)
+
+-set (SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
++set (SIP_FILES_INSTALL_DIR ${SIP_DEFAULT_SIP_DIR})
+
+ set(SIP_CONFIGURATION "
+ kde_version_parts = '${KDE_VERSION}'.split('.')
diff --git a/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip b/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip
deleted file mode 100644
index b81c977f993..00000000000
--- a/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-sip_kdecore_typedefs.sip,v 1.1 2012/10/11 13:17:09 wiz Exp $
-
-py-qt4 defines this itself since about 4.9.5; avoid conflict.
-
---- sip/kdecore/typedefs.sip.orig 2011-07-27 18:37:15.000000000 +0000
-+++ sip/kdecore/typedefs.sip
-@@ -951,77 +951,3 @@ template <TYPE1>
- %End
- };
-
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
-- // Create the list.
-- PyObject *l;
--
-- if ((l = PyList_New(sipCpp->size())) == NULL)
-- return NULL;
--
-- // Set the list elements.
-- for (int i = 0; i < sipCpp->size(); ++i)
-- {
-- int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3
-- PyObject *tobj = PyLong_FromLong(t);
--#else
-- PyObject *tobj = PyInt_FromLong(t);
--#endif
--
-- PyList_SET_ITEM(l, i, tobj);
-- }
--
-- return l;
--%End
--
--%ConvertToTypeCode
-- // Check the type if that is all that is required.
-- if (sipIsErr == NULL)
-- {
-- if (!PyList_Check(sipPy))
-- return 0;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
-- PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
-- if (!PyNumber_Check(tobj))
--#else
-- if (!PyInt_Check(tobj))
--#endif
-- return 0;
-- }
-- return 1;
-- }
--
-- QVector<int> *qv = new QVector<int>;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-- {
-- PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
-- int t = PyLong_AsLong (tobj);
--#else
-- int t = PyInt_AS_LONG (tobj);
--#endif
--
-- if (*sipIsErr)
-- {
-- delete qv;
-- return 0;
-- }
--
-- qv->append(t);
-- }
--
-- *sipCppPtr = qv;
--
-- return sipGetState(sipTransferObj);
--%End
--};