summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2012-03-19 19:44:01 +0000
committermarkd <markd@pkgsrc.org>2012-03-19 19:44:01 +0000
commitfd2016aa624c4b28a89f5c701d477656765c748a (patch)
tree82e0640b43ad37aeca70fc0e0a0799a6ce4c1bdc
parent02cec6f4e9d29fba4bcfe2d1d425378fe284699b (diff)
downloadpkgsrc-fd2016aa624c4b28a89f5c701d477656765c748a.tar.gz
Update to KDE SC 4.8.0
add kactivities rename kdebase4 -> kde-baseapps4 rename kdebase-runtime4 -> kde-runtime4 rename kdebase-workspace4 -> kde-workspace4 rename kdebindings4-python -> py-kde4
-rw-r--r--x11/kactivities/DESCR1
-rw-r--r--x11/kactivities/Makefile13
-rw-r--r--x11/kactivities/PLIST28
-rw-r--r--x11/kactivities/buildlink3.mk15
-rw-r--r--x11/kactivities/distinfo5
-rw-r--r--x11/kde-baseapps4/DESCR (renamed from x11/kdebase4/DESCR)2
-rw-r--r--x11/kde-baseapps4/Makefile35
-rw-r--r--x11/kde-baseapps4/PLIST (renamed from x11/kdebase4/PLIST)159
-rw-r--r--x11/kde-baseapps4/buildlink3.mk12
-rw-r--r--x11/kde-baseapps4/distinfo5
-rw-r--r--x11/kde-runtime4/DESCR (renamed from x11/kdebase-runtime4/DESCR)13
-rw-r--r--x11/kde-runtime4/Makefile (renamed from x11/kdebase-runtime4/Makefile)23
-rw-r--r--x11/kde-runtime4/PLIST (renamed from x11/kdebase-runtime4/PLIST)221
-rw-r--r--x11/kde-runtime4/buildlink3.mk15
-rw-r--r--x11/kde-runtime4/distinfo13
-rw-r--r--x11/kde-runtime4/options.mk (renamed from x11/kdebase-runtime4/options.mk)7
-rw-r--r--x11/kde-runtime4/patches/patch-ab (renamed from x11/kdebase-runtime4/patches/patch-ab)2
-rw-r--r--x11/kde-runtime4/patches/patch-ac (renamed from x11/kdebase-runtime4/patches/patch-ac)4
-rw-r--r--x11/kde-runtime4/patches/patch-ad (renamed from x11/kdebase-runtime4/patches/patch-ad)2
-rw-r--r--x11/kde-runtime4/patches/patch-ae (renamed from x11/kdebase-runtime4/patches/patch-ae)2
-rw-r--r--x11/kde-runtime4/patches/patch-af (renamed from x11/kdebase-runtime4/patches/patch-af)2
-rw-r--r--x11/kde-runtime4/patches/patch-ag (renamed from x11/kdebase-runtime4/patches/patch-ag)2
-rw-r--r--x11/kde-runtime4/patches/patch-ai (renamed from x11/kdebase-runtime4/patches/patch-ai)2
-rw-r--r--x11/kde-runtime4/patches/patch-ak (renamed from x11/kdebase-runtime4/patches/patch-ak)8
-rw-r--r--x11/kde-workspace4/DESCR (renamed from x11/kdebase-workspace4/DESCR)0
-rw-r--r--x11/kde-workspace4/Makefile (renamed from x11/kdebase-workspace4/Makefile)32
-rw-r--r--x11/kde-workspace4/PLIST (renamed from x11/kdebase-workspace4/PLIST)889
-rw-r--r--x11/kde-workspace4/PLIST.Linux6
-rw-r--r--x11/kde-workspace4/buildlink3.mk16
-rw-r--r--x11/kde-workspace4/distinfo30
-rw-r--r--x11/kde-workspace4/files/kdm.sh (renamed from x11/kdebase-workspace4/files/kdm.sh)2
-rw-r--r--x11/kde-workspace4/hacks.mk (renamed from x11/kdebase-workspace4/hacks.mk)6
-rw-r--r--x11/kde-workspace4/options.mk (renamed from x11/kdebase-workspace4/options.mk)4
-rw-r--r--x11/kde-workspace4/patches/patch-kcontrol_keyboard_xkb_rules.cpp (renamed from x11/kdebase-workspace4/patches/patch-ah)2
-rw-r--r--x11/kde-workspace4/patches/patch-kdm_config.def (renamed from x11/kdebase-workspace4/patches/patch-ad)2
-rw-r--r--x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp (renamed from x11/kdebase-workspace4/patches/patch-ac)8
-rw-r--r--x11/kde-workspace4/patches/patch-kdm_kfrontend_CMakeLists.txt (renamed from x11/kdebase-workspace4/patches/patch-ab)2
-rw-r--r--x11/kde-workspace4/patches/patch-ksysguard_example_CMakeLists.txt (renamed from x11/kdebase-workspace4/patches/patch-af)4
-rw-r--r--x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_CPU.c (renamed from x11/kdebase-workspace4/patches/patch-bc)6
-rw-r--r--x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_CPU.h (renamed from x11/kdebase-workspace4/patches/patch-bo)2
-rw-r--r--x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_Memory.c (renamed from x11/kdebase-workspace4/patches/patch-bd)2
-rw-r--r--x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_Memory.h (renamed from x11/kdebase-workspace4/patches/patch-be)2
-rw-r--r--x11/kde-workspace4/patches/patch-libs_ksysguard_ksgrd_SensorManager.cpp12
-rw-r--r--x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_CMakeLists.txt (renamed from x11/kdebase-workspace4/patches/patch-ca)2
-rw-r--r--x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_processes.cpp (renamed from x11/kdebase-workspace4/patches/patch-cb)2
-rw-r--r--x11/kde-workspace4/patches/patch-mkpamserv (renamed from x11/kdebase-workspace4/patches/patch-ae)2
-rw-r--r--x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp53
-rw-r--r--x11/kde-workspace4/patches/patch-plasma_generic_dataengines_rss_CMakeLists.txt (renamed from x11/kdebase-workspace4/patches/patch-plasma_generic_dataengines_rss_CMakeLists.txt)2
-rw-r--r--x11/kde-workspace4/patches/patch-startkde.cmake (renamed from x11/kdebase-workspace4/patches/patch-ag)2
-rw-r--r--x11/kdebase-runtime4/buildlink3.mk15
-rw-r--r--x11/kdebase-runtime4/distinfo15
-rw-r--r--x11/kdebase-runtime4/patches/patch-ah13
-rw-r--r--x11/kdebase-runtime4/patches/patch-kdesud18
-rw-r--r--x11/kdebase-workspace4/PLIST.Linux10
-rw-r--r--x11/kdebase-workspace4/buildlink3.mk16
-rw-r--r--x11/kdebase-workspace4/distinfo34
-rw-r--r--x11/kdebase-workspace4/patches/patch-aa97
-rw-r--r--x11/kdebase-workspace4/patches/patch-bb20
-rw-r--r--x11/kdebase-workspace4/patches/patch-cc16
-rw-r--r--x11/kdebase-workspace4/patches/patch-cd102
-rw-r--r--x11/kdebase-workspace4/patches/patch-ce272
-rw-r--r--x11/kdebase-workspace4/patches/patch-kcheckpass_checkpass_pam.c15
-rw-r--r--x11/kdebase4/Makefile27
-rw-r--r--x11/kdebase4/buildlink3.mk12
-rw-r--r--x11/kdebase4/distinfo6
-rw-r--r--x11/kdebase4/patches/patch-aa185
-rw-r--r--x11/kdebindings4-python/Makefile57
-rw-r--r--x11/kdebindings4-python/buildlink3.mk13
-rw-r--r--x11/kdebindings4-python/distinfo10
-rw-r--r--x11/kdebindings4-python/files/FindPolkitQt.cmake94
-rw-r--r--x11/kdebindings4-python/patches/patch-aa12
-rw-r--r--x11/kdebindings4-python/patches/patch-ac12
-rw-r--r--x11/kdebindings4-python/patches/patch-am160
-rw-r--r--x11/py-kde4/DESCR (renamed from x11/kdebindings4-python/DESCR)0
-rw-r--r--x11/py-kde4/Makefile44
-rw-r--r--x11/py-kde4/PLIST (renamed from x11/kdebindings4-python/PLIST)69
-rw-r--r--x11/py-kde4/buildlink3.mk13
-rw-r--r--x11/py-kde4/distinfo7
-rw-r--r--x11/py-kde4/patches/patch-CMakeLists.txt (renamed from x11/kdebindings4-python/patches/patch-python_pykde4_CMakeLists.txt)6
-rw-r--r--x11/py-kde4/patches/patch-__init__.py (renamed from x11/kdebindings4-python/patches/patch-ab)6
80 files changed, 1069 insertions, 1988 deletions
diff --git a/x11/kactivities/DESCR b/x11/kactivities/DESCR
new file mode 100644
index 00000000000..eb15cc00b15
--- /dev/null
+++ b/x11/kactivities/DESCR
@@ -0,0 +1 @@
+KDE Activity Manager
diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
new file mode 100644
index 00000000000..f4b4a7cf50d
--- /dev/null
+++ b/x11/kactivities/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2012/03/19 19:44:01 markd Exp $
+
+DISTNAME= kactivities-${_KDE_VERSION}
+CATEGORIES= x11
+COMMENT= KDE Activity Manager
+
+.include "../../meta-pkgs/kde4/Makefile.kde4"
+
+PKGCONFIG_OVERRIDE+= lib/libkactivities.pc.cmake
+
+.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kactivities/PLIST b/x11/kactivities/PLIST
new file mode 100644
index 00000000000..b49a0fe047c
--- /dev/null
+++ b/x11/kactivities/PLIST
@@ -0,0 +1,28 @@
+@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:01 markd Exp $
+bin/kactivitymanagerd
+include/KDE/KActivities/Consumer
+include/KDE/KActivities/Controller
+include/KDE/KActivities/Info
+include/KDE/KActivities/ResourceInstance
+include/kactivities/consumer.h
+include/kactivities/controller.h
+include/kactivities/info.h
+include/kactivities/kactivities_export.h
+include/kactivities/resourceinstance.h
+lib/cmake/KActivities/KActivitiesConfig.cmake
+lib/cmake/KActivities/KActivitiesConfigVersion.cmake
+lib/cmake/KActivities/KActivitiesLibraryTargets-relwithdebinfo.cmake
+lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
+lib/kde4/activitymanager_plugin_dummy.so
+lib/kde4/activitymanager_plugin_nepomuk.so
+lib/kde4/activitymanager_plugin_slc.so
+lib/libkactivities.so
+lib/libkactivities.so.6
+lib/libkactivities.so.6.0.0
+lib/pkgconfig/libkactivities.pc
+share/kde4/services/activitymanager-plugin-dummy.desktop
+share/kde4/services/activitymanager-plugin-nepomuk.desktop
+share/kde4/services/activitymanager-plugin-slc.desktop
+share/kde4/services/kactivitymanagerd.desktop
+share/kde4/services/kded/activitymanager.desktop
+share/kde4/servicetypes/activitymanager-plugin.desktop
diff --git a/x11/kactivities/buildlink3.mk b/x11/kactivities/buildlink3.mk
new file mode 100644
index 00000000000..18b92ca9b46
--- /dev/null
+++ b/x11/kactivities/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2012/03/19 19:44:01 markd Exp $
+
+BUILDLINK_TREE+= kactivities
+
+.if !defined(KACTIVITIES_BUILDLINK3_MK)
+KACTIVITIES_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.kactivities+= kactivities>=4.7.95
+BUILDLINK_ABI_DEPENDS.kactivities?= kactivities>=4.7.95
+BUILDLINK_PKGSRCDIR.kactivities?= ../../x11/kactivities
+
+.include "../../x11/kdelibs4/buildlink3.mk"
+.endif # KACTIVITIES_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -kactivities
diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo
new file mode 100644
index 00000000000..595ce191d69
--- /dev/null
+++ b/x11/kactivities/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2012/03/19 19:44:01 markd Exp $
+
+SHA1 (kactivities-4.8.0.tar.bz2) = ac64d13f767c06bfcf2040fcdf94a78410ad035d
+RMD160 (kactivities-4.8.0.tar.bz2) = 973a06b82980a19a36da3a17a4d5269322b8fd19
+Size (kactivities-4.8.0.tar.bz2) = 37583 bytes
diff --git a/x11/kdebase4/DESCR b/x11/kde-baseapps4/DESCR
index feefd31bb60..0c73d0ac217 100644
--- a/x11/kdebase4/DESCR
+++ b/x11/kde-baseapps4/DESCR
@@ -15,8 +15,6 @@ Environment.
File find utility (standalone and in Konqueror's file manager).
* konqueror
The file manager and web browser you get easily used to.
-* konsole
- A shell program similar to xterm.
* kdepasswd
A KDE frontend for passwd. Also contains the "Password & User
Information" KCM.
diff --git a/x11/kde-baseapps4/Makefile b/x11/kde-baseapps4/Makefile
new file mode 100644
index 00000000000..81a230adb2c
--- /dev/null
+++ b/x11/kde-baseapps4/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2012/03/19 19:44:03 markd Exp $
+
+DISTNAME= kde-baseapps-${_KDE_VERSION}
+PKGNAME= ${DISTNAME:S/-4/4-4/}
+CATEGORIES= x11
+COMMENT= Base modules for the KDE 4 integrated X11 desktop
+
+.include "../../meta-pkgs/kde4/Makefile.kde4"
+
+CONFLICTS= konq-plugins-[0-9]*
+
+# BUILD_MAKE_FLAGS+= VERBOSE=1
+
+REPLACE_RUBY+= dolphin/src/settings/services/servicemenuinstallation
+REPLACE_RUBY+= dolphin/src/settings/services/servicemenudeinstallation
+
+REPLACE_INTERPRETER+= xdg-open
+REPLACE.scheme.old= .*/bin/env xdg-open
+REPLACE.scheme.new= ${PREFIX}/bin/xdg-open
+REPLACE_FILES.scheme= lib/konq/Templates/Program.desktop
+
+.include "../../lang/ruby/replace.mk"
+
+.include "../../meta-pkgs/kde4/kde4.mk"
+
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/qimageblitz/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../x11/kde-runtime4/buildlink3.mk"
+.include "../../x11/kde-workspace4/buildlink3.mk"
+.include "../../lang/ruby/buildlink3.mk"
+.include "../../www/tidy/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase4/PLIST b/x11/kde-baseapps4/PLIST
index 4c483a8c409..43fb9d8901d 100644
--- a/x11/kdebase4/PLIST
+++ b/x11/kde-baseapps4/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2010/10/25 20:55:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:03 markd Exp $
bin/dolphin
+bin/fsview
bin/kbookmarkmerger
bin/kdepasswd
bin/kdialog
@@ -7,9 +8,6 @@ bin/keditbookmarks
bin/kfind
bin/kfmclient
bin/konqueror
-bin/konsole
-bin/konsoleprofile
-bin/kwrite
bin/nspluginscan
bin/nspluginviewer
bin/servicemenudeinstallation
@@ -28,8 +26,16 @@ include/konq_popupmenuplugin.h
include/konqmimedata.h
include/konqsidebarplugin.h
include/kversioncontrolplugin.h
+include/kversioncontrolplugin2.h
include/libkonq_export.h
+lib/kde4/adblock.so
+lib/kde4/akregatorkonqfeedicon.so
+lib/kde4/autorefresh.so
+lib/kde4/babelfishplugin.so
+lib/kde4/dirfilterplugin.so
lib/kde4/dolphinpart.so
+lib/kde4/domtreeviewerplugin.so
+lib/kde4/fsviewpart.so
lib/kde4/kcm_dolphingeneral.so
lib/kde4/kcm_dolphinnavigation.so
lib/kde4/kcm_dolphinservices.so
@@ -44,6 +50,9 @@ lib/kde4/kcm_useraccount.so
lib/kde4/kded_favicons.so
lib/kde4/kded_konqy_preloader.so
lib/kde4/khtmlkttsdplugin.so
+lib/kde4/khtmlsettingsplugin.so
+lib/kde4/kimgallery.so
+lib/kde4/kio_filenamesearch.so
lib/kde4/konq_aboutpage.so
lib/kde4/konq_shellcmdplugin.so
lib/kde4/konq_sidebar.so
@@ -55,31 +64,33 @@ lib/kde4/konqsidebar_places.so
lib/kde4/konqsidebar_tree.so
lib/kde4/konqsidebar_web.so
lib/kde4/libkcminit_nsplugins.so
-lib/kde4/libkonsolepart.so
lib/kde4/libnsplugin.so
+lib/kde4/minitoolsplugin.so
lib/kde4/plasma_applet_folderview.so
+lib/kde4/rellinksplugin.so
+lib/kde4/searchbarplugin.so
+lib/kde4/uachangerplugin.so
+lib/kde4/validatorsplugin.so
+lib/kde4/webarchiverplugin.so
+lib/kde4/webarchivethumbnail.so
lib/libdolphinprivate.so
lib/libdolphinprivate.so.4
-lib/libdolphinprivate.so.4.5.0
+lib/libdolphinprivate.so.4.8.0
lib/libkbookmarkmodel_private.so
lib/libkbookmarkmodel_private.so.4
-lib/libkbookmarkmodel_private.so.4.5.0
+lib/libkbookmarkmodel_private.so.4.8.0
lib/libkdeinit4_dolphin.so
lib/libkdeinit4_keditbookmarks.so
lib/libkdeinit4_kfmclient.so
lib/libkdeinit4_konqueror.so
-lib/libkdeinit4_konsole.so
-lib/libkdeinit4_kwrite.so
lib/libkonq.so
lib/libkonq.so.5
-lib/libkonq.so.5.5.0
+lib/libkonq.so.5.8.0
lib/libkonqsidebarplugin.so
lib/libkonqsidebarplugin.so.4
-lib/libkonqsidebarplugin.so.4.5.0
-lib/libkonquerorprivate.so
+lib/libkonqsidebarplugin.so.4.8.0
lib/libkonquerorprivate.so.4
-lib/libkonquerorprivate.so.4.5.0
-lib/libkonsoleprivate.so
+lib/libkonquerorprivate.so.4.8.0
man/man1/kbookmarkmerger.1
man/man1/kfind.1
share/applications/kde4/Home.desktop
@@ -93,8 +104,6 @@ share/applications/kde4/kfmclient_html.desktop
share/applications/kde4/kfmclient_war.desktop
share/applications/kde4/konqbrowser.desktop
share/applications/kde4/konquerorsu.desktop
-share/applications/kde4/konsole.desktop
-share/applications/kde4/kwrite.desktop
share/dbus-1/interfaces/org.kde.FavIcon.xml
share/dbus-1/interfaces/org.kde.Konqueror.Main.xml
share/dbus-1/interfaces/org.kde.Konqueror.MainWindow.xml
@@ -113,11 +122,13 @@ share/doc/kde/HTML/en/dolphin/locationbar-editable.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
+share/doc/kde/HTML/en/dolphin/preferences-services.png
share/doc/kde/HTML/en/dolphin/preferences-startup.png
share/doc/kde/HTML/en/dolphin/preferences-trash.png
share/doc/kde/HTML/en/dolphin/preferences-viewmodes-icons.png
share/doc/kde/HTML/en/dolphin/toolbar-navigation.png
share/doc/kde/HTML/en/dolphin/toolbar-view-appearance.png
+share/doc/kde/HTML/en/dolphin/toolbar.png
share/doc/kde/HTML/en/dolphin/viewproperties-dialog.png
share/doc/kde/HTML/en/kdepasswd/common
share/doc/kde/HTML/en/kdepasswd/index.cache.bz2
@@ -139,10 +150,14 @@ share/doc/kde/HTML/en/konqueror/dirtree.png
share/doc/kde/HTML/en/konqueror/dragdrop.png
share/doc/kde/HTML/en/konqueror/faq.docbook
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/index.cache.bz2
share/doc/kde/HTML/en/konqueror/index.docbook
share/doc/kde/HTML/en/konqueror/introduction.docbook
share/doc/kde/HTML/en/konqueror/konqorg.png
+share/doc/kde/HTML/en/konqueror/look.png
share/doc/kde/HTML/en/konqueror/man-kbookmarkmerger.1.docbook
share/doc/kde/HTML/en/konqueror/parts.png
share/doc/kde/HTML/en/konqueror/path-complete.docbook
@@ -152,17 +167,16 @@ share/doc/kde/HTML/en/konqueror/save-settings.docbook
share/doc/kde/HTML/en/konqueror/shortcut1.png
share/doc/kde/HTML/en/konqueror/shortcut2.png
share/doc/kde/HTML/en/konqueror/sidebar.docbook
-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/doc/kde/HTML/en/kwrite/common
-share/doc/kde/HTML/en/kwrite/index.cache.bz2
-share/doc/kde/HTML/en/kwrite/index.docbook
+share/doc/kde/HTML/en/konqueror/thumbnails.png
+share/doc/kde/HTML/en/konqueror/view-extensions.docbook
+share/doc/kde/HTML/en/konqueror/viewproperties-dialog.png
share/icons/hicolor/128x128/apps/konqueror.png
share/icons/hicolor/16x16/apps/kfind.png
share/icons/hicolor/16x16/apps/konqueror.png
+share/icons/hicolor/22x22/apps/fsview.png
share/icons/hicolor/22x22/apps/kfind.png
share/icons/hicolor/22x22/apps/konqueror.png
+share/icons/hicolor/32x32/apps/fsview.png
share/icons/hicolor/32x32/apps/kfind.png
share/icons/hicolor/32x32/apps/konqueror.png
share/icons/hicolor/48x48/apps/kfind.png
@@ -170,11 +184,37 @@ share/icons/hicolor/48x48/apps/konqueror.png
share/icons/hicolor/64x64/apps/kfind.png
share/icons/hicolor/64x64/apps/konqueror.png
share/icons/hicolor/scalable/apps/konqueror.svgz
-share/kde/apps/dolphin/dolphinsearchcommands.desktop
+share/icons/oxygen/16x16/actions/babelfish.png
+share/icons/oxygen/16x16/actions/cssvalidator.png
+share/icons/oxygen/16x16/actions/htmlvalidator.png
+share/icons/oxygen/16x16/actions/imagegallery.png
+share/icons/oxygen/16x16/actions/validators.png
+share/icons/oxygen/16x16/actions/webarchiver.png
+share/icons/oxygen/22x22/actions/babelfish.png
+share/icons/oxygen/22x22/actions/cssvalidator.png
+share/icons/oxygen/22x22/actions/htmlvalidator.png
+share/icons/oxygen/22x22/actions/imagegallery.png
+share/icons/oxygen/22x22/actions/validators.png
+share/icons/oxygen/22x22/actions/webarchiver.png
+share/icons/oxygen/32x32/actions/htmlvalidator.png
+share/icons/oxygen/32x32/actions/validators.png
+share/icons/oxygen/48x48/actions/htmlvalidator.png
+share/icons/oxygen/48x48/actions/validators.png
+share/icons/oxygen/64x64/actions/htmlvalidator.png
+share/icons/oxygen/64x64/actions/validators.png
+share/icons/oxygen/scalable/actions/htmlvalidator.svgz
+share/icons/oxygen/scalable/actions/validators.svgz
+share/kde/apps/akregator/pics/feed.png
share/kde/apps/dolphin/dolphinui.rc
share/kde/apps/dolphinpart/dolphinpart.rc
+share/kde/apps/dolphinpart/kpartplugins/dirfilterplugin.desktop
+share/kde/apps/dolphinpart/kpartplugins/dirfilterplugin.rc
+share/kde/apps/dolphinpart/kpartplugins/kimgalleryplugin.desktop
+share/kde/apps/dolphinpart/kpartplugins/kimgalleryplugin.rc
share/kde/apps/dolphinpart/kpartplugins/kshellcmdplugin.desktop
share/kde/apps/dolphinpart/kpartplugins/kshellcmdplugin.rc
+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
@@ -192,8 +232,30 @@ share/kde/apps/kdm/pics/users/TV.png
share/kde/apps/kdm/pics/users/bomb.png
share/kde/apps/keditbookmarks/keditbookmarks-genui.rc
share/kde/apps/keditbookmarks/keditbookmarksui.rc
+share/kde/apps/khtml/kpartplugins/akregator_konqfeedicon.desktop
+share/kde/apps/khtml/kpartplugins/akregator_konqfeedicon.rc
+share/kde/apps/khtml/kpartplugins/autorefresh.desktop
+share/kde/apps/khtml/kpartplugins/autorefresh.rc
share/kde/apps/khtml/kpartplugins/khtmlkttsd.desktop
share/kde/apps/khtml/kpartplugins/khtmlkttsd.rc
+share/kde/apps/khtml/kpartplugins/khtmlsettingsplugin.desktop
+share/kde/apps/khtml/kpartplugins/khtmlsettingsplugin.rc
+share/kde/apps/khtml/kpartplugins/minitoolsplugin.desktop
+share/kde/apps/khtml/kpartplugins/minitoolsplugin.rc
+share/kde/apps/khtml/kpartplugins/plugin_adblock.desktop
+share/kde/apps/khtml/kpartplugins/plugin_adblock.rc
+share/kde/apps/khtml/kpartplugins/plugin_babelfish.desktop
+share/kde/apps/khtml/kpartplugins/plugin_babelfish.rc
+share/kde/apps/khtml/kpartplugins/plugin_domtreeviewer.desktop
+share/kde/apps/khtml/kpartplugins/plugin_domtreeviewer.rc
+share/kde/apps/khtml/kpartplugins/plugin_rellinks.desktop
+share/kde/apps/khtml/kpartplugins/plugin_rellinks.rc
+share/kde/apps/khtml/kpartplugins/plugin_validators.desktop
+share/kde/apps/khtml/kpartplugins/plugin_validators.rc
+share/kde/apps/khtml/kpartplugins/plugin_webarchiver.desktop
+share/kde/apps/khtml/kpartplugins/plugin_webarchiver.rc
+share/kde/apps/khtml/kpartplugins/uachangerplugin.desktop
+share/kde/apps/khtml/kpartplugins/uachangerplugin.rc
share/kde/apps/konqsidebartng/dirtree/bookmarks_module.desktop
share/kde/apps/konqsidebartng/dirtree/dirtree_module.desktop
share/kde/apps/konqsidebartng/entries/bookmarks.desktop
@@ -227,7 +289,16 @@ share/kde/apps/konqueror/about/plugins_rtl.html
share/kde/apps/konqueror/about/specs.html
share/kde/apps/konqueror/about/tips.html
share/kde/apps/konqueror/about/top-left-konqueror.png
+share/kde/apps/konqueror/icons/oxygen/16x16/actions/google.png
+share/kde/apps/konqueror/icons/oxygen/22x22/actions/google.png
+share/kde/apps/konqueror/icons/oxygen/32x32/actions/google.png
+share/kde/apps/konqueror/icons/oxygen/48x48/actions/google.png
+share/kde/apps/konqueror/icons/oxygen/64x64/actions/google.png
+share/kde/apps/konqueror/icons/oxygen/scalable/actions/google.svgz
share/kde/apps/konqueror/konqueror.rc
+share/kde/apps/konqueror/kpartplugins/searchbar.desktop
+share/kde/apps/konqueror/kpartplugins/searchbar.rc
+share/kde/apps/konqueror/opensearch/google.xml
share/kde/apps/konqueror/pics/arrow_bottomleft.png
share/kde/apps/konqueror/pics/arrow_bottomright.png
share/kde/apps/konqueror/pics/arrow_topleft.png
@@ -241,26 +312,21 @@ share/kde/apps/konqueror/profiles/kde_devel
share/kde/apps/konqueror/profiles/midnightcommander
share/kde/apps/konqueror/profiles/tabbedbrowsing
share/kde/apps/konqueror/profiles/webbrowsing
-share/kde/apps/konsole/BlackOnLightYellow.schema
-share/kde/apps/konsole/BlackOnRandomLight.colorscheme
-share/kde/apps/konsole/BlackOnWhite.schema
-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/Shell.profile
-share/kde/apps/konsole/WhiteOnBlack.schema
-share/kde/apps/konsole/default.keytab
-share/kde/apps/konsole/konsole.notifyrc
-share/kde/apps/konsole/konsoleui.rc
-share/kde/apps/konsole/linux.keytab
-share/kde/apps/konsole/partui.rc
-share/kde/apps/konsole/sessionui.rc
-share/kde/apps/konsole/solaris.keytab
-share/kde/apps/kwrite/kwriteui.rc
-share/kde/apps/plugin/nspluginpart.rc
+share/kde/apps/kwebkitpart/kpartplugins/akregator_konqfeedicon.desktop
+share/kde/apps/kwebkitpart/kpartplugins/akregator_konqfeedicon.rc
+share/kde/apps/kwebkitpart/kpartplugins/autorefresh.desktop
+share/kde/apps/kwebkitpart/kpartplugins/autorefresh.rc
+share/kde/apps/kwebkitpart/kpartplugins/khtmlkttsd.desktop
+share/kde/apps/kwebkitpart/kpartplugins/khtmlkttsd.rc
+share/kde/apps/kwebkitpart/kpartplugins/plugin_babelfish.desktop
+share/kde/apps/kwebkitpart/kpartplugins/plugin_babelfish.rc
+share/kde/apps/kwebkitpart/kpartplugins/plugin_validators.desktop
+share/kde/apps/kwebkitpart/kpartplugins/plugin_validators.rc
+share/kde/apps/kwebkitpart/kpartplugins/uachangerplugin.desktop
+share/kde/apps/kwebkitpart/kpartplugins/uachangerplugin.rc
+share/kde/apps/nsplugin/nspluginpart.rc
share/kde/autostart/konqy_preload.desktop
-share/kde/config.kcfg/dolphin_columnmodesettings.kcfg
+share/kde/config.kcfg/dolphin_compactmodesettings.kcfg
share/kde/config.kcfg/dolphin_detailsmodesettings.kcfg
share/kde/config.kcfg/dolphin_directoryviewpropertysettings.kcfg
share/kde/config.kcfg/dolphin_generalsettings.kcfg
@@ -270,8 +336,10 @@ share/kde/config.kcfg/kcm_useraccount.kcfg
share/kde/config.kcfg/kcm_useraccount_pass.kcfg
share/kde/config.kcfg/keditbookmarks.kcfg
share/kde/config.kcfg/konqueror.kcfg
+share/kde/config.kcfg/validators.kcfg
share/kde/config/konqsidebartngrc
share/kde/config/servicemenu.knsrc
+share/kde/config/translaterc
share/kde/templates/.source/CAMERA-Device.desktop
share/kde/templates/.source/CDROM-Device.desktop
share/kde/templates/.source/CDWRITER-Device.desktop
@@ -300,13 +368,15 @@ share/kde/templates/linkPath.desktop
share/kde/templates/linkProgram.desktop
share/kde/templates/linkURL.desktop
share/kde/templates/linkZIP.desktop
-share/kde4/services/ServiceMenus/konsolehere.desktop
+share/kde4/services/ServiceMenus/imageconverter.desktop
share/kde4/services/bookmarks.desktop
share/kde4/services/cache.desktop
share/kde4/services/cookies.desktop
share/kde4/services/dolphinpart.desktop
share/kde4/services/ebrowsing.desktop
share/kde4/services/filebehavior.desktop
+share/kde4/services/filenamesearch.protocol
+share/kde4/services/fsview_part.desktop
share/kde4/services/kcm_useraccount.desktop
share/kde4/services/kcmdolphingeneral.desktop
share/kde4/services/kcmdolphinnavigation.desktop
@@ -326,7 +396,6 @@ share/kde4/services/khtml_plugins.desktop
share/kde4/services/konq_aboutpage.desktop
share/kde4/services/konq_sidebartng.desktop
share/kde4/services/konqueror.desktop
-share/kde4/services/konsolepart.desktop
share/kde4/services/netpref.desktop
share/kde4/services/plasma-applet-folderview.desktop
share/kde4/services/proxy.desktop
@@ -361,9 +430,9 @@ share/kde4/services/useragentstrings/safari32.desktop
share/kde4/services/useragentstrings/safari40.desktop
share/kde4/services/useragentstrings/w3moncurrent.desktop
share/kde4/services/useragentstrings/wgetoncurrent.desktop
+share/kde4/services/webarchivethumbnail.desktop
share/kde4/servicetypes/fileviewversioncontrolplugin.desktop
share/kde4/servicetypes/konqaboutpage.desktop
share/kde4/servicetypes/konqdndpopupmenuplugin.desktop
share/kde4/servicetypes/konqpopupmenuplugin.desktop
-share/kde4/servicetypes/terminalemulator.desktop
share/kde4/servicetypes/uasprovider.desktop
diff --git a/x11/kde-baseapps4/buildlink3.mk b/x11/kde-baseapps4/buildlink3.mk
new file mode 100644
index 00000000000..1662aea56b2
--- /dev/null
+++ b/x11/kde-baseapps4/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2012/03/19 19:44:03 markd Exp $
+
+BUILDLINK_TREE+= kde-baseapps4
+
+.if !defined(KDE_BASEAPPS4_BUILDLINK3_MK)
+KDE_BASEAPPS4_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.kde-baseapps4+= kde-baseapps4>=4.1.85
+BUILDLINK_PKGSRCDIR.kde-baseapps4?= ../../x11/kde-baseapps4
+.endif # KDE_BASEAPPS4_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -kde-baseapps4
diff --git a/x11/kde-baseapps4/distinfo b/x11/kde-baseapps4/distinfo
new file mode 100644
index 00000000000..79604c16c73
--- /dev/null
+++ b/x11/kde-baseapps4/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2012/03/19 19:44:03 markd Exp $
+
+SHA1 (kde-baseapps-4.8.0.tar.bz2) = 25151b551793164c5eb1cb303d3031e63a6122e3
+RMD160 (kde-baseapps-4.8.0.tar.bz2) = cac3dd1200a6a56ecc1641bf79793a3944074222
+Size (kde-baseapps-4.8.0.tar.bz2) = 2820730 bytes
diff --git a/x11/kdebase-runtime4/DESCR b/x11/kde-runtime4/DESCR
index d99ff0424fb..d9783cff793 100644
--- a/x11/kdebase-runtime4/DESCR
+++ b/x11/kde-runtime4/DESCR
@@ -1,11 +1,9 @@
-The kdebase-runtime package is the second mandatory package (besides kdelibs)
+The kde-runtime package is the second mandatory package (besides kdelibs)
for the K Desktop Environment. Here we have various applications and
infrastructure files and libraries. Here is an overview of the directories:
* drkonqi
- If ever an app crashes (heaven forbid!) then Dr.Konqi will be so kind
- and make a stack trace. This is a great help for the developers to fix
- the bug.
+ Produces a stack trace for developers if an app crashes.
* kcontrol
The KDE Control Center allows you to tweak the KDE settings.
* kdebugdialog
@@ -17,13 +15,10 @@ infrastructure files and libraries. Here is an overview of the directories:
* kfind
File find utility (standalone and in Konqueror's file manager).
* khelpcenter
- Used to to read all great documentation about KDE, unix man pages,
- info pages etc.
+ Used to to read all great documentation about KDE, unix man pages, etc
* kioslave
Infrastructure that helps make every application internet enabled
- e.g. to directly save a file to ftp://place.org/dir/file.txt
* kreadconfig
A tool for shell scripts to get info from KDE's config files.
* kstart
- Launches applications with special window properties such as iconified,
- etc.
+ Launches applications with special window properties such as iconified, etc.
diff --git a/x11/kdebase-runtime4/Makefile b/x11/kde-runtime4/Makefile
index dd981e86999..e9af2bbe3e0 100644
--- a/x11/kdebase-runtime4/Makefile
+++ b/x11/kde-runtime4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2012/03/03 00:12:33 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/19 19:44:03 markd Exp $
-DISTNAME= kdebase-runtime-${_KDE_VERSION}
-PKGREVISION= 7
+DISTNAME= kde-runtime-${_KDE_VERSION}
+PKGNAME= ${DISTNAME:S/-4/4-4/}
CATEGORIES= x11
COMMENT= Runtime requirements for the KDE integrated X11 desktop
@@ -19,12 +19,13 @@ USE_TOOLS+= gmake
.include "options.mk"
-SUBST_CLASSES+= htdig paths
+SUBST_CLASSES+= htdig
SUBST_STAGE.htdig= post-patch
SUBST_MESSAGE.htdig= Fix htdig paths.
SUBST_FILES.htdig= khelpcenter/searchhandlers/khc_htsearch.pl
SUBST_SED.htdig= -e s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
+SUBST_CLASSES+= paths
SUBST_FILES.paths= kioslave/info/kde-info2html.conf
SUBST_SED.paths= -e 's,@LOCALBASE@,${LOCALBASE},g'
SUBST_STAGE.paths= post-patch
@@ -36,7 +37,10 @@ REPLACE_PERL+= \
khelpcenter/searchhandlers/khc_mansearch.pl \
kioslave/info/kde-info2html
-CONF_FILES+= ${PREFIX}/share/examples/kdebase-runtime4/kde-information.menu \
+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 \
${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
@@ -45,6 +49,13 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1
.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../lang/python/application.mk"
+# not the libssh the package wants
+#.include "../../security/libssh/buildlink3.mk"
+.include "../../security/qca2/buildlink3.mk"
+.include "../../multmedia/phonon/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
.include "../../graphics/exiv2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -53,6 +64,8 @@ BUILDLINK_ABI_DEPENDS.attica?= attica>=0.1.4
.include "../../multimedia/xine-lib/buildlink3.mk"
.include "../../net/openslp/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+BUILDLINK_ABI_DEPENDS.soprano?= soprano>=2.6.50
+.include "../../textproc/soprano/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase-runtime4/PLIST b/x11/kde-runtime4/PLIST
index 61e32747c04..a48b5d2dcb3 100644
--- a/x11/kdebase-runtime4/PLIST
+++ b/x11/kde-runtime4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/11/03 20:08:45 markd Exp $
+@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:03 markd Exp $
bin/kcmshell4
bin/kde-cp
bin/kde-mv
@@ -25,10 +25,26 @@ 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
@@ -39,6 +55,58 @@ lib/kde4/exrthumbnail.so
lib/kde4/fixhosturifilter.so
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/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/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/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/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/qmldir
+lib/kde4/imports/org/kde/plasma/core/libcorebindingsplugin.so
+lib/kde4/imports/org/kde/plasma/core/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/jpegthumbnail.so
lib/kde4/kcm_attica.so
lib/kde4/kcm_cgi.so
@@ -56,12 +124,12 @@ lib/kde4/kcm_phonon.so
lib/kde4/kcm_phononxine.so
lib/kde4/kcm_trash.so
lib/kde4/kcmspellchecking.so
-lib/kde4/kded_activitymanager.so
lib/kde4/kded_desktopnotifier.so
lib/kde4/kded_device_automounter.so
lib/kde4/kded_kpasswdserver.so
lib/kde4/kded_ktimezoned.so
lib/kde4/kded_nepomuksearchmodule.so
+lib/kde4/kded_networkstatus.so
lib/kde4/kded_networkwatcher.so
lib/kde4/kded_phononserver.so
lib/kde4/kded_remotedirnotify.so
@@ -104,23 +172,70 @@ lib/kde4/libexec/khc_htsearch.pl
lib/kde4/libexec/khc_indexbuilder
lib/kde4/libexec/khc_mansearch.pl
lib/kde4/libexec/kioexec
-lib/kde4/libexec/klocaldomainurifilterhelper
lib/kde4/libexec/knetattach
lib/kde4/libkmanpart.so
lib/kde4/librenaudioplugin.so
lib/kde4/librenimageplugin.so
lib/kde4/localdomainurifilter.so
-lib/kde4/nepomukactivitiesservice.so
+lib/kde4/nepomukbackupsync.so
+lib/kde4/nepomukfileindexer.so
lib/kde4/nepomukfilewatch.so
-lib/kde4/nepomukmigration1.so
-lib/kde4/nepomukontologyloader.so
lib/kde4/nepomukqueryservice.so
-lib/kde4/nepomukremovablestorageservice.so
lib/kde4/nepomukstorage.so
-lib/kde4/nepomukstrigiservice.so
+lib/kde4/plasma-kpart.so
+lib/kde4/plasma_appletscript_declarative.so
lib/kde4/plasma_appletscript_simple_javascript.so
+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/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/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
+lib/kde4/platformimports/touch/org/kde/plasma/components/TextFieldFocus.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/ToolBar.qml
+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/qmldir
lib/kde4/plugins/phonon_platform/kde.so
lib/kde4/svgthumbnail.so
lib/kde4/textthumbnail.so
@@ -132,30 +247,42 @@ 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.5.0
+lib/libkwalletbackend.so.4.8.0
lib/libmolletnetwork.so
lib/libmolletnetwork.so.4
-lib/libmolletnetwork.so.4.5.0
-lib/strigi/strigiindex_nepomukbackend.so
+lib/libmolletnetwork.so.4.8.0
+lib/libnepomukcommon.so
+lib/libnepomukdatamanagement.so
+lib/libnepomuksync.so
+lib/libnepomuksync.so.4
+lib/libnepomuksync.so.4.8.0
man/man1/kdesu.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.RemovableStorage.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.Strigi.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
@@ -432,8 +559,8 @@ share/emoticons/kde4/unhappy.png
share/emoticons/kde4/unlove.png
share/emoticons/kde4/wilted_rose.png
share/emoticons/kde4/wink.png
+share/examples/kde-runtime4/kde-information.menu
share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf
-share/examples/kdebase-runtime4/kde-information.menu
share/icons/default.kde4
share/icons/hicolor/128x128/apps/knetattach.png
share/icons/hicolor/16x16/apps/knetattach.png
@@ -444,19 +571,32 @@ share/icons/hicolor/64x64/apps/knetattach.png
share/icons/hicolor/scalable/apps/knetattach.svgz
share/kde/apps/cmake/modules/FindCLucene.cmake
share/kde/apps/cmake/modules/FindSLP.cmake
+share/kde/apps/desktoptheme/appdashboard/metadata.desktop
+share/kde/apps/desktoptheme/appdashboard/widgets/background.svgz
+share/kde/apps/desktoptheme/appdashboard/widgets/newspaper-background.svgz
share/kde/apps/desktoptheme/default/colors
share/kde/apps/desktoptheme/default/dialogs/background.svgz
share/kde/apps/desktoptheme/default/dialogs/kickoff.svgz
share/kde/apps/desktoptheme/default/dialogs/krunner.svgz
share/kde/apps/desktoptheme/default/dialogs/shutdowndialog.svgz
+share/kde/apps/desktoptheme/default/icons/amarok.svgz
share/kde/apps/desktoptheme/default/icons/audio.svgz
share/kde/apps/desktoptheme/default/icons/battery.svgz
share/kde/apps/desktoptheme/default/icons/device.svgz
+share/kde/apps/desktoptheme/default/icons/kget.svgz
share/kde/apps/desktoptheme/default/icons/klipper.svgz
+share/kde/apps/desktoptheme/default/icons/konv_message.svgz
+share/kde/apps/desktoptheme/default/icons/konversation.svgz
+share/kde/apps/desktoptheme/default/icons/kopete.svgz
+share/kde/apps/desktoptheme/default/icons/korgac.svgz
+share/kde/apps/desktoptheme/default/icons/kpackagekit.svgz
+share/kde/apps/desktoptheme/default/icons/ktorrent.svgz
share/kde/apps/desktoptheme/default/icons/nepomuk.svgz
share/kde/apps/desktoptheme/default/icons/network.svgz
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/wallet.svgz
share/kde/apps/desktoptheme/default/metadata.desktop
share/kde/apps/desktoptheme/default/opaque/dialogs/background.svgz
@@ -467,9 +607,11 @@ share/kde/apps/desktoptheme/default/opaque/widgets/panel-background.svgz
share/kde/apps/desktoptheme/default/opaque/widgets/tooltip.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
share/kde/apps/desktoptheme/default/translucent/widgets/panel-background.svgz
share/kde/apps/desktoptheme/default/translucent/widgets/tooltip.svgz
share/kde/apps/desktoptheme/default/widgets/action-overlays.svgz
+share/kde/apps/desktoptheme/default/widgets/actionbutton.svgz
share/kde/apps/desktoptheme/default/widgets/analog_meter.svgz
share/kde/apps/desktoptheme/default/widgets/arrows.svgz
share/kde/apps/desktoptheme/default/widgets/background.svgz
@@ -479,6 +621,7 @@ share/kde/apps/desktoptheme/default/widgets/branding.svgz
share/kde/apps/desktoptheme/default/widgets/busywidget.svgz
share/kde/apps/desktoptheme/default/widgets/button.svgz
share/kde/apps/desktoptheme/default/widgets/calendar.svgz
+share/kde/apps/desktoptheme/default/widgets/checkmarks.svgz
share/kde/apps/desktoptheme/default/widgets/clock.svgz
share/kde/apps/desktoptheme/default/widgets/configuration-icons.svgz
share/kde/apps/desktoptheme/default/widgets/containment-controls.svgz
@@ -488,8 +631,12 @@ share/kde/apps/desktoptheme/default/widgets/extender-dragger.svgz
share/kde/apps/desktoptheme/default/widgets/frame.svgz
share/kde/apps/desktoptheme/default/widgets/glowbar.svgz
share/kde/apps/desktoptheme/default/widgets/identiconshapes.svgz
+share/kde/apps/desktoptheme/default/widgets/identicontheme.svgz
+share/kde/apps/desktoptheme/default/widgets/labeltexture.svgz
share/kde/apps/desktoptheme/default/widgets/line.svgz
share/kde/apps/desktoptheme/default/widgets/lineedit.svgz
+share/kde/apps/desktoptheme/default/widgets/listitem.svgz
+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
@@ -499,6 +646,7 @@ share/kde/apps/desktoptheme/default/widgets/scrollwidget.svgz
share/kde/apps/desktoptheme/default/widgets/slider.svgz
share/kde/apps/desktoptheme/default/widgets/systemtray.svgz
share/kde/apps/desktoptheme/default/widgets/tasks.svgz
+share/kde/apps/desktoptheme/default/widgets/toolbar.svgz
share/kde/apps/desktoptheme/default/widgets/toolbox.svgz
share/kde/apps/desktoptheme/default/widgets/tooltip.svgz
share/kde/apps/desktoptheme/default/widgets/translucentbackground.svgz
@@ -517,6 +665,7 @@ share/kde/apps/desktoptheme/oxygen/opaque/widgets/extender-background.svgz
share/kde/apps/desktoptheme/oxygen/opaque/widgets/panel-background.svgz
share/kde/apps/desktoptheme/oxygen/opaque/widgets/tooltip.svgz
share/kde/apps/desktoptheme/oxygen/widgets/action-overlays.svgz
+share/kde/apps/desktoptheme/oxygen/widgets/actionbutton.svgz
share/kde/apps/desktoptheme/oxygen/widgets/analog_meter.svgz
share/kde/apps/desktoptheme/oxygen/widgets/arrows.svgz
share/kde/apps/desktoptheme/oxygen/widgets/background.svgz
@@ -552,9 +701,12 @@ share/kde/apps/desktoptheme/oxygen/widgets/translucentbackground.svgz
share/kde/apps/desktoptheme/oxygen/widgets/viewitem.svgz
share/kde/apps/drkonqi/debuggers/external/gdbrc
share/kde/apps/drkonqi/debuggers/external/kdbgrc
+share/kde/apps/drkonqi/debuggers/internal/dbxrc
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
@@ -581,8 +733,6 @@ share/kde/apps/khelpcenter/plugins/Manpages/man5.desktop
share/kde/apps/khelpcenter/plugins/Manpages/man6.desktop
share/kde/apps/khelpcenter/plugins/Manpages/man7.desktop
share/kde/apps/khelpcenter/plugins/Manpages/man8.desktop
-share/kde/apps/khelpcenter/plugins/Manpages/man9.desktop
-share/kde/apps/khelpcenter/plugins/Manpages/mann.desktop
share/kde/apps/khelpcenter/plugins/Scrollkeeper/.directory
share/kde/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop
share/kde/apps/khelpcenter/plugins/info.desktop
@@ -613,12 +763,14 @@ 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/nepomukstrigiservice/nepomukstrigiservice.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
share/kde/config/icons.knsrc
@@ -662,12 +814,12 @@ share/kde4/services/kcmcgi.desktop
share/kde4/services/kcmkded.desktop
share/kde4/services/kcmnotify.desktop
share/kde4/services/kcmtrash.desktop
-share/kde4/services/kded/activitymanager.desktop
share/kde4/services/kded/desktopnotifier.desktop
share/kde4/services/kded/device_automounter.desktop
share/kde4/services/kded/kpasswdserver.desktop
share/kde4/services/kded/ktimezoned.desktop
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/remotedirnotify.desktop
@@ -688,8 +840,9 @@ 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/nepomukmigration1.desktop
share/kde4/services/nepomukontologyloader.desktop
share/kde4/services/nepomukqueryservice.desktop
share/kde4/services/nepomukremovablestorageservice.desktop
@@ -698,6 +851,10 @@ 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
+share/kde4/services/plasma-kpart.desktop
+share/kde4/services/plasma-packagestructure-javascript-addon.desktop
+share/kde4/services/plasma-scriptengine-applet-declarative.desktop
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
@@ -713,7 +870,9 @@ share/kde4/services/searchproviders/amazon_mp3.desktop
share/kde4/services/searchproviders/amg.desktop
share/kde4/services/searchproviders/austronaut.desktop
share/kde4/services/searchproviders/backports.desktop
+share/kde4/services/searchproviders/baidu.desktop
share/kde4/services/searchproviders/beolingus.desktop
+share/kde4/services/searchproviders/bing.desktop
share/kde4/services/searchproviders/blip.desktop
share/kde4/services/searchproviders/bugft.desktop
share/kde4/services/searchproviders/bugno.desktop
@@ -841,8 +1000,10 @@ share/kde4/services/windowsexethumbnail.desktop
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
share/kde4/servicetypes/thumbcreator.desktop
share/locale/currency/adf.desktop
@@ -1009,6 +1170,7 @@ share/locale/currency/sll.desktop
share/locale/currency/sos.desktop
share/locale/currency/srd.desktop
share/locale/currency/srg.desktop
+share/locale/currency/ssp.desktop
share/locale/currency/std.desktop
share/locale/currency/svc.desktop
share/locale/currency/syp.desktop
@@ -1050,7 +1212,6 @@ share/locale/currency/zar.desktop
share/locale/currency/zmk.desktop
share/locale/currency/zwd.desktop
share/locale/currency/zwl.desktop
-share/locale/en_US/entry.desktop
share/locale/l10n/C/entry.desktop
share/locale/l10n/C/flag.png
share/locale/l10n/ad/entry.desktop
@@ -1103,6 +1264,8 @@ share/locale/l10n/bi/entry.desktop
share/locale/l10n/bi/flag.png
share/locale/l10n/bj/entry.desktop
share/locale/l10n/bj/flag.png
+share/locale/l10n/bl/entry.desktop
+share/locale/l10n/bl/flag.png
share/locale/l10n/bm/entry.desktop
share/locale/l10n/bm/flag.png
share/locale/l10n/bn/entry.desktop
@@ -1213,6 +1376,8 @@ share/locale/l10n/ge/entry.desktop
share/locale/l10n/ge/flag.png
share/locale/l10n/gf/entry.desktop
share/locale/l10n/gf/flag.png
+share/locale/l10n/gg/entry.desktop
+share/locale/l10n/gg/flag.png
share/locale/l10n/gh/entry.desktop
share/locale/l10n/gh/flag.png
share/locale/l10n/gi/entry.desktop
@@ -1253,6 +1418,8 @@ share/locale/l10n/ie/entry.desktop
share/locale/l10n/ie/flag.png
share/locale/l10n/il/entry.desktop
share/locale/l10n/il/flag.png
+share/locale/l10n/im/entry.desktop
+share/locale/l10n/im/flag.png
share/locale/l10n/in/entry.desktop
share/locale/l10n/in/flag.png
share/locale/l10n/iq/entry.desktop
@@ -1263,6 +1430,8 @@ share/locale/l10n/is/entry.desktop
share/locale/l10n/is/flag.png
share/locale/l10n/it/entry.desktop
share/locale/l10n/it/flag.png
+share/locale/l10n/je/entry.desktop
+share/locale/l10n/je/flag.png
share/locale/l10n/jm/entry.desktop
share/locale/l10n/jm/flag.png
share/locale/l10n/jo/entry.desktop
@@ -1321,6 +1490,8 @@ share/locale/l10n/md/entry.desktop
share/locale/l10n/md/flag.png
share/locale/l10n/me/entry.desktop
share/locale/l10n/me/flag.png
+share/locale/l10n/mf/entry.desktop
+share/locale/l10n/mf/flag.png
share/locale/l10n/mg/entry.desktop
share/locale/l10n/mg/flag.png
share/locale/l10n/mh/entry.desktop
@@ -1336,6 +1507,8 @@ share/locale/l10n/mn/entry.desktop
share/locale/l10n/mn/flag.png
share/locale/l10n/mo/entry.desktop
share/locale/l10n/mo/flag.png
+share/locale/l10n/mp/entry.desktop
+share/locale/l10n/mp/flag.png
share/locale/l10n/mq/entry.desktop
share/locale/l10n/mq/flag.png
share/locale/l10n/mr/entry.desktop
@@ -1459,6 +1632,8 @@ share/locale/l10n/southeastasia.desktop
share/locale/l10n/southeurope.desktop
share/locale/l10n/sr/entry.desktop
share/locale/l10n/sr/flag.png
+share/locale/l10n/ss/entry.desktop
+share/locale/l10n/ss/flag.png
share/locale/l10n/st/entry.desktop
share/locale/l10n/st/flag.png
share/locale/l10n/sv/entry.desktop
@@ -1540,6 +1715,12 @@ 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/buildlink3.mk b/x11/kde-runtime4/buildlink3.mk
new file mode 100644
index 00000000000..be706c7ddcc
--- /dev/null
+++ b/x11/kde-runtime4/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2012/03/19 19:44:03 markd Exp $
+
+BUILDLINK_TREE+= kde-runtime
+
+.if !defined(KDE_RUNTIME_BUILDLINK3_MK)
+KDE_RUNTIME_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.kde-runtime+= kde-runtime4>=4.0.0
+BUILDLINK_ABI_DEPENDS.kde-runtime?= kde-runtime4>=4.5.4nb1
+BUILDLINK_PKGSRCDIR.kde-runtime?= ../../x11/kde-runtime4
+
+.include "../../x11/kdelibs4/buildlink3.mk"
+.endif # KDE_RUNTIME_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -kde-runtime
diff --git a/x11/kde-runtime4/distinfo b/x11/kde-runtime4/distinfo
new file mode 100644
index 00000000000..7512fe7f781
--- /dev/null
+++ b/x11/kde-runtime4/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1 2012/03/19 19:44:03 markd Exp $
+
+SHA1 (kde-runtime-4.8.0.tar.bz2) = 5e1e98535529a67f8d20e8c76d051c81604d7064
+RMD160 (kde-runtime-4.8.0.tar.bz2) = accba23895645f5c4c02696f9cb1916d5eea4b83
+Size (kde-runtime-4.8.0.tar.bz2) = 6159026 bytes
+SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
+SHA1 (patch-ac) = fadc0c0d3b7c8f893a9249724f26e2fc2c7f0f1e
+SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
+SHA1 (patch-ae) = b2728696f413b146831db62e422adcf73b132126
+SHA1 (patch-af) = 1a8f15ac1c8dadd59fe00ca7ca304ba41521f896
+SHA1 (patch-ag) = 5ca9064552379792c32577875d07562d3f736ab7
+SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a
+SHA1 (patch-ak) = 4fee3877613afddf179a7a8376586a6391b53c89
diff --git a/x11/kdebase-runtime4/options.mk b/x11/kde-runtime4/options.mk
index ebc1086ed67..1cc58b6ab09 100644
--- a/x11/kdebase-runtime4/options.mk
+++ b/x11/kde-runtime4/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2011/02/25 20:37:56 markd Exp $
+# $NetBSD: options.mk,v 1.1 2012/03/19 19:44:03 markd Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase-runtime4
-PKG_SUPPORTED_OPTIONS= samba alsa
+PKG_OPTIONS_VAR= PKG_OPTIONS.kde-runtime4
+PKG_SUPPORTED_OPTIONS= samba alsa
+PKG_DEFAULT_OPTIONS= samba alsa
.include "../../mk/bsd.options.mk"
diff --git a/x11/kdebase-runtime4/patches/patch-ab b/x11/kde-runtime4/patches/patch-ab
index 4005fbaf24a..4ea2d23023f 100644
--- a/x11/kdebase-runtime4/patches/patch-ab
+++ b/x11/kde-runtime4/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
+$NetBSD: patch-ab,v 1.1 2012/03/19 19:44:03 markd Exp $
dont install hicolor/index.theme as hicolor-icon-theme pkg will
diff --git a/x11/kdebase-runtime4/patches/patch-ac b/x11/kde-runtime4/patches/patch-ac
index d03d2615a11..dcef65d1612 100644
--- a/x11/kdebase-runtime4/patches/patch-ac
+++ b/x11/kde-runtime4/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
+$NetBSD: patch-ac,v 1.1 2012/03/19 19:44:03 markd Exp $
--- kcontrol/menus/CMakeLists.txt.orig 2008-12-11 05:13:10.000000000 +1300
+++ kcontrol/menus/CMakeLists.txt
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
install( FILES kde-information.menu DESTINATION ${SHARE_INSTALL_DIR}/xdg/menus/)
else (WIN32)
-install( FILES kde-information.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus/)
-+install( FILES kde-information.menu DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/kdebase-runtime4/)
++install( FILES kde-information.menu DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/kde-runtime4/)
endif (WIN32)
install( FILES kde-information.directory DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} )
diff --git a/x11/kdebase-runtime4/patches/patch-ad b/x11/kde-runtime4/patches/patch-ad
index 2b024ce1d52..37275a486c5 100644
--- a/x11/kdebase-runtime4/patches/patch-ad
+++ b/x11/kde-runtime4/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
+$NetBSD: patch-ad,v 1.1 2012/03/19 19:44:03 markd Exp $
--- kioslave/info/kde-info2html.conf.orig 2007-10-26 01:21:54.000000000 +1300
+++ kioslave/info/kde-info2html.conf
diff --git a/x11/kdebase-runtime4/patches/patch-ae b/x11/kde-runtime4/patches/patch-ae
index b84a3e7f356..b417e45c071 100644
--- a/x11/kdebase-runtime4/patches/patch-ae
+++ b/x11/kde-runtime4/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
+$NetBSD: patch-ae,v 1.1 2012/03/19 19:44:03 markd Exp $
--- khelpcenter/searchhandlers/khc_mansearch.pl.orig 2007-12-07 01:20:24.000000000 +1300
+++ khelpcenter/searchhandlers/khc_mansearch.pl
diff --git a/x11/kdebase-runtime4/patches/patch-af b/x11/kde-runtime4/patches/patch-af
index d898ee06256..600d5c9ab49 100644
--- a/x11/kdebase-runtime4/patches/patch-af
+++ b/x11/kde-runtime4/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2010/04/10 02:45:04 markd Exp $
+$NetBSD: patch-af,v 1.1 2012/03/19 19:44:03 markd Exp $
--- khelpcenter/searchhandlers/khc_docbookdig.pl.cmake.orig 2009-09-23 19:21:09.000000000 +0000
+++ khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
diff --git a/x11/kdebase-runtime4/patches/patch-ag b/x11/kde-runtime4/patches/patch-ag
index 584990dacad..e674ee0f272 100644
--- a/x11/kdebase-runtime4/patches/patch-ag
+++ b/x11/kde-runtime4/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
+$NetBSD: patch-ag,v 1.1 2012/03/19 19:44:03 markd Exp $
--- khelpcenter/searchhandlers/khc_htdig.pl.cmake.orig 2008-01-31 12:51:37.000000000 +1300
+++ khelpcenter/searchhandlers/khc_htdig.pl.cmake
diff --git a/x11/kdebase-runtime4/patches/patch-ai b/x11/kde-runtime4/patches/patch-ai
index f79c2a9ace5..6c054c2b763 100644
--- a/x11/kdebase-runtime4/patches/patch-ai
+++ b/x11/kde-runtime4/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
+$NetBSD: patch-ai,v 1.1 2012/03/19 19:44:03 markd Exp $
--- kdeeject/kdeeject.orig 2007-12-24 08:03:03.000000000 +1300
+++ kdeeject/kdeeject
diff --git a/x11/kdebase-runtime4/patches/patch-ak b/x11/kde-runtime4/patches/patch-ak
index c62c5525d95..caf374c3135 100644
--- a/x11/kdebase-runtime4/patches/patch-ak
+++ b/x11/kde-runtime4/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2010/10/27 05:36:26 markd Exp $
+$NetBSD: patch-ak,v 1.1 2012/03/19 19:44:03 markd Exp $
To pull in strsignal() on NetBSD<5.99
---- drkonqi/crashedapplication.cpp.orig 2010-10-26 11:07:28.000000000 +0000
+--- drkonqi/crashedapplication.cpp.orig 2011-02-25 21:54:12.000000000 +0000
+++ drkonqi/crashedapplication.cpp
@@ -23,6 +23,7 @@
# include <clocale>
@@ -10,5 +10,5 @@ To pull in strsignal() on NetBSD<5.99
# include <cstdlib>
+# include <unistd.h>
#else
- # include <signal.h>
- #endif
+ # if defined(Q_OS_UNIX)
+ # include <signal.h>
diff --git a/x11/kdebase-workspace4/DESCR b/x11/kde-workspace4/DESCR
index 253ef27c037..253ef27c037 100644
--- a/x11/kdebase-workspace4/DESCR
+++ b/x11/kde-workspace4/DESCR
diff --git a/x11/kdebase-workspace4/Makefile b/x11/kde-workspace4/Makefile
index dc9a21a612e..b1edd785b40 100644
--- a/x11/kdebase-workspace4/Makefile
+++ b/x11/kde-workspace4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2012/03/15 11:53:45 obache Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/19 19:44:03 markd Exp $
-DISTNAME= kdebase-workspace-${_KDE_VERSION}
-PKGREVISION= 11
+DISTNAME= kde-workspace-${_KDE_VERSION}
+PKGNAME= ${DISTNAME:S/-4/4-4/}
CATEGORIES= x11
-COMMENT= base workspace for the KDE 4 integrated X11 desktop
+COMMENT= Base workspace for the KDE 4 integrated X11 desktop
.include "../../meta-pkgs/kde4/Makefile.kde4"
@@ -29,7 +29,7 @@ CONF_FILES= ${PREFIX}/share/kde/config/kdm/kdmrc \
${PKG_SYSCONFDIR}/kdm/kdmrc
OWN_DIRS= ${PKG_SYSCONFDIR}/kdm
-CONF_FILES+= ${PREFIX}/share/examples/kdebase-workspace4/ksysguarddrc \
+CONF_FILES+= ${PREFIX}/share/examples/kde-workspace4/ksysguarddrc \
${PKG_SYSCONFDIR}/ksysguarddrc
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.ksysguard.processlisthelper.conf \
${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
@@ -37,6 +37,10 @@ CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.fontinst.conf \
${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.fontinst.conf
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmclock.conf \
${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
+CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmkdm.conf \
+ ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
+CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf \
+ ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
SPECIAL_PERMS+= ${PREFIX}/lib/kde4/libexec/kcheckpass \
${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 6555
@@ -51,15 +55,24 @@ PY_PATCHPLIST= yes
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-SUBST_CLASSES+= paths qtpath isocodes
-SUBST_FILES.paths= kcontrol/kdm/main.cpp
+PLIST_VARS+= utempter noutempter
+.if ${OPSYS} == "Linux"
+PLIST.utempter= yes
+.else
+PLIST.noutempter= yes
+.endif
+
+SUBST_CLASSES+= paths
+SUBST_FILES.paths= kdm/kcm/main.cpp
SUBST_SED.paths= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
SUBST_STAGE.paths= post-patch
+SUBST_CLASSES+= qtpath
SUBST_FILES.qtpath= startkde.cmake
SUBST_VARS.qtpath= QTDIR
SUBST_STAGE.qtpath= post-patch
+SUBST_CLASSES+= isocodes
SUBST_FILES.isocodes= kcontrol/keyboard/iso_codes.h
SUBST_SED.isocodes= -e 's,/usr/share/xml/iso-codes,${BUILDLINK_PREFIX.iso-codes}/share/xml/iso-codes,g'
SUBST_STAGE.isocodes= post-patch
@@ -109,9 +122,12 @@ PYTHON_VERSIONS_ACCEPTED= 27 26 25 # because kdebindings4-python
# not yet - causes kdm logins to fail, presumably because
# I don't know how consolekit works
#.include "../../sysutils/consolekit/buildlink3.mk"
+.include "../../sysutils/pciutils/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
-.include "../../x11/kdebindings4-python/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"
diff --git a/x11/kdebase-workspace4/PLIST b/x11/kde-workspace4/PLIST
index 38ef2e7f0b0..c8cec33ba5c 100644
--- a/x11/kdebase-workspace4/PLIST
+++ b/x11/kde-workspace4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2010/12/06 11:43:42 markd Exp $
+@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:03 markd Exp $
bin/genkdmconf
bin/kaccess
bin/kapplymousetheme
@@ -15,10 +15,12 @@ bin/kinfocenter
bin/klipper
bin/kmenuedit
bin/krandom.kss
+bin/krandrstartup
bin/krandrtray
bin/krdb
bin/krunner
bin/ksmserver
+bin/ksplashqml
bin/ksplashsimple
bin/ksplashx
bin/ksplashx_scale
@@ -27,9 +29,10 @@ bin/ksysguard
bin/ksysguardd
bin/ksystraycmd
bin/kwin
-bin/kwrited
+${PLIST.noutempter}bin/kwrited
bin/oxygen-demo
bin/oxygen-settings
+bin/oxygen-shadow-demo
bin/plasma-desktop
bin/plasma-netbook
bin/plasma-overlay
@@ -37,12 +40,11 @@ bin/plasma-windowed
bin/plasmaengineexplorer
bin/plasmawallpaperviewer
bin/plasmoidviewer
-bin/polkit-kde-authorization
+bin/remote-widgets-browser
bin/solid-action-desktop-gen
bin/startkde
bin/systemsettings
include/KDE/Plasma/Weather/Ion
-include/KDE/Plasma/Weather/WeatherUtils
include/kcommondecoration.h
include/kdecoration.h
include/kdecorationbridge.h
@@ -63,48 +65,58 @@ include/ksysguard/ksysguardprocesslist.h
include/ksysguard/lsof.h
include/ksysguard/process.h
include/ksysguard/processes.h
+include/kwinanimationeffect.h
include/kwinconfig.h
include/kwineffects.h
include/kwinglobals.h
+include/kwinglplatform.h
+include/kwingltexture.h
include/kwinglutils.h
include/kwinglutils_funcs.h
-include/kwinshadereffect.h
include/kwinxrenderutils.h
-include/kworkspace/kactivityconsumer.h
-include/kworkspace/kactivitycontroller.h
-include/kworkspace/kactivityinfo.h
include/kworkspace/kdisplaymanager.h
include/kworkspace/kwindowlistmenu.h
include/kworkspace/kworkspace.h
+include/kworkspace/kworkspace_export.h
include/plasma/geolocation/geolocation_export.h
include/plasma/geolocation/geolocationprovider.h
include/plasma/weather/ion.h
include/plasma/weather/ion_export.h
-include/plasma/weather/weatherutils.h
include/plasmaclock/calendar.h
include/plasmaclock/calendartable.h
include/plasmaclock/clockapplet.h
include/plasmaclock/plasmaclock_export.h
-include/solid/control/bluetoothinputdevice.h
-include/solid/control/bluetoothinterface.h
-include/solid/control/bluetoothmanager.h
-include/solid/control/bluetoothremotedevice.h
-include/solid/control/bluetoothsecurity.h
-include/solid/control/ifaces/bluetoothinputdevice.h
-include/solid/control/ifaces/bluetoothinterface.h
-include/solid/control/ifaces/bluetoothmanager.h
-include/solid/control/ifaces/bluetoothremotedevice.h
+include/solid/control/ifaces/modemcdmainterface.h
+include/solid/control/ifaces/modemgsmcardinterface.h
+include/solid/control/ifaces/modemgsmcontactsinterface.h
+include/solid/control/ifaces/modemgsmhsointerface.h
+include/solid/control/ifaces/modemgsmnetworkinterface.h
+include/solid/control/ifaces/modemgsmsmsinterface.h
+include/solid/control/ifaces/modemgsmussdinterface.h
+include/solid/control/ifaces/modeminterface.h
+include/solid/control/ifaces/modemlocationinterface.h
+include/solid/control/ifaces/modemmanager.h
+include/solid/control/ifaces/networkbtinterface.h
include/solid/control/ifaces/networkcdmainterface.h
include/solid/control/ifaces/networkgsminterface.h
include/solid/control/ifaces/networkinterface.h
include/solid/control/ifaces/networkmanager.h
include/solid/control/ifaces/networkserialinterface.h
-include/solid/control/ifaces/powermanager.h
-include/solid/control/ifaces/remotecontrol.h
-include/solid/control/ifaces/remotecontrolmanager.h
include/solid/control/ifaces/wirednetworkinterface.h
include/solid/control/ifaces/wirelessaccesspoint.h
include/solid/control/ifaces/wirelessnetworkinterface.h
+include/solid/control/modemcdmainterface.h
+include/solid/control/modemgsmcardinterface.h
+include/solid/control/modemgsmcontactsinterface.h
+include/solid/control/modemgsmhsointerface.h
+include/solid/control/modemgsmnetworkinterface.h
+include/solid/control/modemgsmsmsinterface.h
+include/solid/control/modemgsmussdinterface.h
+include/solid/control/modeminterface.h
+include/solid/control/modemlocationinterface.h
+include/solid/control/modemmanager.h
+include/solid/control/modemmanagerinterface.h
+include/solid/control/networkbtinterface.h
include/solid/control/networkcdmainterface.h
include/solid/control/networkgsminterface.h
include/solid/control/networking.h
@@ -112,10 +124,6 @@ include/solid/control/networkinterface.h
include/solid/control/networkipv4config.h
include/solid/control/networkmanager.h
include/solid/control/networkserialinterface.h
-include/solid/control/powermanager.h
-include/solid/control/remotecontrol.h
-include/solid/control/remotecontrolbutton.h
-include/solid/control/remotecontrolmanager.h
include/solid/control/singletondefs.h
include/solid/control/solid_control_export.h
include/solid/control/wirednetworkinterface.h
@@ -132,6 +140,7 @@ include/taskmanager/abstractgroupableitem.h
include/taskmanager/abstractgroupingstrategy.h
include/taskmanager/abstractsortingstrategy.h
include/taskmanager/groupmanager.h
+include/taskmanager/launcheritem.h
include/taskmanager/startup.h
include/taskmanager/task.h
include/taskmanager/taskactions.h
@@ -139,12 +148,13 @@ include/taskmanager/taskgroup.h
include/taskmanager/taskitem.h
include/taskmanager/taskmanager.h
include/taskmanager/taskmanager_export.h
-lib/cmake/KDE4Workspace-${PKGVERSION}/KDE4WorkspaceConfig.cmake
-lib/cmake/KDE4Workspace-${PKGVERSION}/KDE4WorkspaceConfigVersion.cmake
-lib/cmake/KDE4Workspace-${PKGVERSION}/KDE4WorkspaceLibraryTargets-relwithdebinfo.cmake
-lib/cmake/KDE4Workspace-${PKGVERSION}/KDE4WorkspaceLibraryTargets.cmake
+lib/cmake/KDE4Workspace/KDE4WorkspaceConfig.cmake
+lib/cmake/KDE4Workspace/KDE4WorkspaceConfigVersion.cmake
+lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets-relwithdebinfo.cmake
+lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets.cmake
lib/kconf_update_bin/krdb_clearlibrarypath
lib/kconf_update_bin/kwin_update_default_rules
+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/plasma-add-shortcut-to-menu
@@ -154,6 +164,7 @@ lib/kde4/devinfo.so
lib/kde4/fontthumbnail.so
lib/kde4/icon_mode.so
lib/kde4/ion_bbcukmet.so
+lib/kde4/ion_debianweather.so
lib/kde4/ion_envcan.so
lib/kde4/ion_noaa.so
lib/kde4/ion_wettercom.so
@@ -162,6 +173,7 @@ lib/kde4/kcm_autostart.so
lib/kde4/kcm_bell.so
lib/kde4/kcm_clock.so
lib/kde4/kcm_colors.so
+lib/kde4/kcm_cursortheme.so
lib/kde4/kcm_desktoppaths.so
lib/kde4/kcm_desktoptheme.so
lib/kde4/kcm_display.so
@@ -189,8 +201,9 @@ lib/kde4/kcm_memory.so
lib/kde4/kcm_nic.so
lib/kde4/kcm_opengl.so
lib/kde4/kcm_pci.so
-lib/kde4/kcm_pkk_authorization.so
-lib/kde4/kcm_powerdevilconfig.so
+lib/kde4/kcm_powerdevilactivitiesconfig.so
+lib/kde4/kcm_powerdevilglobalconfig.so
+lib/kde4/kcm_powerdevilprofilesconfig.so
lib/kde4/kcm_randr.so
lib/kde4/kcm_samba.so
lib/kde4/kcm_screensaver.so
@@ -206,6 +219,7 @@ 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_powerdevil.so
lib/kde4/kded_randrmonitor.so
lib/kde4/kded_statusnotifierwatcher.so
@@ -215,6 +229,7 @@ lib/kde4/kgreet_classic.so
lib/kde4/kgreet_generic.so
lib/kde4/kgreet_winbind.so
lib/kde4/kio_fonts.so
+lib/kde4/krunner_activities.so
lib/kde4/krunner_bookmarksrunner.so
lib/kde4/krunner_calculatorrunner.so
lib/kde4/krunner_kill.so
@@ -231,29 +246,19 @@ lib/kde4/krunner_solid.so
lib/kde4/krunner_webshortcuts.so
lib/kde4/krunner_windowedwidgets.so
lib/kde4/krunner_windows.so
-lib/kde4/kstyle_keramik_config.so
lib/kde4/kstyle_oxygen_config.so
lib/kde4/kwin3_aurorae.so
lib/kde4/kwin3_b2.so
-lib/kde4/kwin3_kde2.so
-lib/kde4/kwin3_keramik.so
lib/kde4/kwin3_laptop.so
-lib/kde4/kwin3_modernsys.so
lib/kde4/kwin3_oxygen.so
lib/kde4/kwin3_plastik.so
-lib/kde4/kwin3_quartz.so
-lib/kde4/kwin3_redmond.so
lib/kde4/kwin3_tabstrip.so
-lib/kde4/kwin3_web.so
lib/kde4/kwin4_effect_builtins.so
lib/kde4/kwin_b2_config.so
-lib/kde4/kwin_kde2_config.so
-lib/kde4/kwin_keramik_config.so
-lib/kde4/kwin_modernsys_config.so
lib/kde4/kwin_oxygen_config.so
lib/kde4/kwin_plastik_config.so
-lib/kde4/kwin_quartz_config.so
lib/kde4/kwin_tabstrip_config.so
+lib/kde4/libexec/backlighthelper
lib/kde4/libexec/fontinst
lib/kde4/libexec/fontinst_helper
lib/kde4/libexec/fontinst_x11
@@ -269,7 +274,6 @@ 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/polkit-kde-manager
lib/kde4/libexec/test_kcm_xinerama
lib/kde4/plasma-geolocation-ip.so
lib/kde4/plasma_animator_default.so
@@ -278,7 +282,6 @@ lib/kde4/plasma_applet_battery.so
lib/kde4/plasma_applet_calendar.so
lib/kde4/plasma_applet_clock.so
lib/kde4/plasma_applet_currentappcontrol.so
-lib/kde4/plasma_applet_devicenotifier.so
lib/kde4/plasma_applet_dig_clock.so
lib/kde4/plasma_applet_icon.so
lib/kde4/plasma_applet_keyboard.so
@@ -289,6 +292,7 @@ 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
@@ -306,7 +310,6 @@ lib/kde4/plasma_appletscriptengine_dashboard.so
lib/kde4/plasma_appletscriptengine_webapplet.so
lib/kde4/plasma_containment_desktop.so
lib/kde4/plasma_containment_netpanel.so
-lib/kde4/plasma_containment_newspaper.so
lib/kde4/plasma_containment_panel.so
lib/kde4/plasma_containment_sal.so
lib/kde4/plasma_containment_saverdesktop.so
@@ -317,6 +320,7 @@ lib/kde4/plasma_containmentactions_paste.so
lib/kde4/plasma_containmentactions_switchactivity.so
lib/kde4/plasma_containmentactions_switchdesktop.so
lib/kde4/plasma_containmentactions_switchwindow.so
+lib/kde4/plasma_engine_activities.so
lib/kde4/plasma_engine_akonadi.so
lib/kde4/plasma_engine_applicationjobs.so
lib/kde4/plasma_engine_apps.so
@@ -338,6 +342,7 @@ lib/kde4/plasma_engine_places.so
lib/kde4/plasma_engine_powermanagement.so
lib/kde4/plasma_engine_rss.so
lib/kde4/plasma_engine_searchlaunch.so
+lib/kde4/plasma_engine_share.so
lib/kde4/plasma_engine_soliddevice.so
lib/kde4/plasma_engine_statusnotifieritem.so
lib/kde4/plasma_engine_systemmonitor.so
@@ -345,7 +350,11 @@ lib/kde4/plasma_engine_tasks.so
lib/kde4/plasma_engine_time.so
lib/kde4/plasma_engine_weather.so
lib/kde4/plasma_packagestructure_dashboard.so
+lib/kde4/plasma_packagestructure_share.so
lib/kde4/plasma_packagestructure_web.so
+lib/kde4/plasma_toolbox_desktoptoolbox.so
+lib/kde4/plasma_toolbox_nettoolbox.so
+lib/kde4/plasma_toolbox_paneltoolbox.so
lib/kde4/plasma_wallpaper_color.so
lib/kde4/plasma_wallpaper_image.so
lib/kde4/plugins/designer/ksignalplotterwidgets.so
@@ -353,12 +362,18 @@ lib/kde4/plugins/designer/ksysguardlsofwidgets.so
lib/kde4/plugins/designer/ksysguardwidgets.so
lib/kde4/plugins/gui_platform/libkde.so
lib/kde4/plugins/styles/oxygen.so
+lib/kde4/powerdevilbrightnesscontrolaction_config.so
+lib/kde4/powerdevildimdisplayaction_config.so
+lib/kde4/powerdevildpmsaction.so
+lib/kde4/powerdevildpmsaction_config.so
+lib/kde4/powerdevilhandlebuttoneventsaction_config.so
+lib/kde4/powerdevilrunscriptaction_config.so
+lib/kde4/powerdevilsuspendsessionaction_config.so
lib/kde4/solid_fakenet.so
-lib/kde4/solid_lirc.so
lib/kde4/solid_wicd.so
lib/libkdecorations.so
lib/libkdecorations.so.4
-lib/libkdecorations.so.4.5.0
+lib/libkdecorations.so.4.8.0
lib/libkdeinit4_kaccess.so
lib/libkdeinit4_kcminit.so
lib/libkdeinit4_kcminit_startup.so
@@ -374,75 +389,86 @@ lib/libkdeinit4_plasma-netbook.so
lib/libkdeinit4_plasma-windowed.so
lib/libkephal.so
lib/libkephal.so.4
-lib/libkephal.so.4.5.0
+lib/libkephal.so.4.8.0
lib/libkfontinst.so
lib/libkfontinst.so.4
-lib/libkfontinst.so.4.5.0
+lib/libkfontinst.so.4.8.0
lib/libkfontinstui.so
lib/libkfontinstui.so.4
-lib/libkfontinstui.so.4.5.0
+lib/libkfontinstui.so.4.8.0
lib/libkhotkeysprivate.so.4
-lib/libkhotkeysprivate.so.4.5.0
+lib/libkhotkeysprivate.so.4.8.0
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.5.0
+lib/libksgrd.so.4.8.0
lib/libksignalplotter.so
lib/libksignalplotter.so.4
-lib/libksignalplotter.so.4.5.0
+lib/libksignalplotter.so.4.8.0
lib/libkwineffects.so
lib/libkwineffects.so.1
lib/libkwineffects.so.1.0.0
-lib/libkwinnvidiahack.so
+lib/libkwinglutils.so
+lib/libkwinglutils.so.1
+lib/libkwinglutils.so.1.0.0
lib/libkwinnvidiahack.so.4
-lib/libkwinnvidiahack.so.4.5.0
+lib/libkwinnvidiahack.so.4.8.0
lib/libkworkspace.so
lib/libkworkspace.so.4
-lib/libkworkspace.so.4.5.0
+lib/libkworkspace.so.4.8.0
lib/liblsofui.so
lib/liblsofui.so.4
-lib/liblsofui.so.4.5.0
+lib/liblsofui.so.4.8.0
lib/liboxygenstyle.so
lib/liboxygenstyle.so.4
-lib/liboxygenstyle.so.4.5.0
+lib/liboxygenstyle.so.4.8.0
+lib/liboxygenstyleconfig.so
+lib/liboxygenstyleconfig.so.4
+lib/liboxygenstyleconfig.so.4.8.0
lib/libplasma-geolocation-interface.so
lib/libplasma-geolocation-interface.so.4
-lib/libplasma-geolocation-interface.so.4.5.0
+lib/libplasma-geolocation-interface.so.4.8.0
lib/libplasma_applet-system-monitor.so
lib/libplasma_applet-system-monitor.so.4
-lib/libplasma_applet-system-monitor.so.4.5.0
+lib/libplasma_applet-system-monitor.so.4.8.0
lib/libplasmaclock.so
lib/libplasmaclock.so.4
-lib/libplasmaclock.so.4.5.0
+lib/libplasmaclock.so.4.8.0
lib/libplasmagenericshell.so
lib/libplasmagenericshell.so.4
-lib/libplasmagenericshell.so.4.5.0
-lib/libpolkitkdeprivate.so
-lib/libpolkitkdeprivate.so.4
-lib/libpolkitkdeprivate.so.4.5.0
+lib/libplasmagenericshell.so.4.8.0
+lib/libpowerdevilconfigcommonprivate.so
+lib/libpowerdevilconfigcommonprivate.so.4
+lib/libpowerdevilconfigcommonprivate.so.4.8.0
+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/libprocesscore.so
lib/libprocesscore.so.4
-lib/libprocesscore.so.4.5.0
+lib/libprocesscore.so.4.8.0
lib/libprocessui.so
lib/libprocessui.so.4
-lib/libprocessui.so.4.5.0
+lib/libprocessui.so.4.8.0
lib/libsolidcontrol.so
lib/libsolidcontrol.so.4
-lib/libsolidcontrol.so.4.5.0
+lib/libsolidcontrol.so.4.8.0
lib/libsolidcontrolifaces.so
lib/libsolidcontrolifaces.so.4
-lib/libsolidcontrolifaces.so.4.5.0
+lib/libsolidcontrolifaces.so.4.8.0
lib/libsystemsettingsview.so
lib/libsystemsettingsview.so.2
lib/libtaskmanager.so
lib/libtaskmanager.so.4
-lib/libtaskmanager.so.4.5.0
+lib/libtaskmanager.so.4.8.0
lib/libweather_ion.so
-lib/libweather_ion.so.5
-lib/libweather_ion.so.5.0.0
+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
@@ -453,6 +479,8 @@ share/PolicyKit/policy/org.kde.fontinst.policy
share/PolicyKit/policy/org.kde.kcontrol.kcmclock.policy
share/PolicyKit/policy/org.kde.kcontrol.kcmkdm.policy
share/PolicyKit/policy/org.kde.ksysguard.processlisthelper.policy
+share/PolicyKit/policy/org.kde.powerdevil.backlighthelper.policy
+share/applications/kde4/kdesystemsettings.desktop
share/applications/kde4/kfontview.desktop
share/applications/kde4/kinfocenter.desktop
share/applications/kde4/klipper.desktop
@@ -463,33 +491,16 @@ share/applications/kde4/systemsettings.desktop
share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml
share/dbus-1/interfaces/org.kde.KSMServerInterface.xml
share/dbus-1/interfaces/org.kde.KWin.xml
-share/dbus-1/interfaces/org.kde.PowerDevil.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/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
-share/dbus-1/services/org.kde.PolicyKit.service
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
share/dbus-1/system-services/org.kde.kcontrol.kcmclock.service
share/dbus-1/system-services/org.kde.kcontrol.kcmkdm.service
share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
-share/doc/kde/HTML/en/PolicyKit-kde/authdialog_1.png
-share/doc/kde/HTML/en/PolicyKit-kde/authdialog_2.png
-share/doc/kde/HTML/en/PolicyKit-kde/authdialog_3.png
-share/doc/kde/HTML/en/PolicyKit-kde/authdialog_4.png
-share/doc/kde/HTML/en/PolicyKit-kde/authdialog_5.png
-share/doc/kde/HTML/en/PolicyKit-kde/authdialog_6.png
-share/doc/kde/HTML/en/PolicyKit-kde/authorization.docbook
-share/doc/kde/HTML/en/PolicyKit-kde/authorization_1.png
-share/doc/kde/HTML/en/PolicyKit-kde/authorization_2.png
-share/doc/kde/HTML/en/PolicyKit-kde/authorizationagent.docbook
-share/doc/kde/HTML/en/PolicyKit-kde/common
-share/doc/kde/HTML/en/PolicyKit-kde/howitworks.docbook
-share/doc/kde/HTML/en/PolicyKit-kde/index.cache.bz2
-share/doc/kde/HTML/en/PolicyKit-kde/index.docbook
-share/doc/kde/HTML/en/PolicyKit-kde/introduction.docbook
+share/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service
share/doc/kde/HTML/en/kcontrol/autostart/common
share/doc/kde/HTML/en/kcontrol/autostart/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/autostart/index.docbook
@@ -502,6 +513,9 @@ share/doc/kde/HTML/en/kcontrol/clock/index.docbook
share/doc/kde/HTML/en/kcontrol/colors/common
share/doc/kde/HTML/en/kcontrol/colors/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/colors/index.docbook
+share/doc/kde/HTML/en/kcontrol/cursortheme/common
+share/doc/kde/HTML/en/kcontrol/cursortheme/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/cursortheme/index.docbook
share/doc/kde/HTML/en/kcontrol/desktop/common
share/doc/kde/HTML/en/kcontrol/desktop/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/desktop/index.docbook
@@ -625,17 +639,24 @@ share/doc/kde/HTML/en/ksysguard/index.cache.bz2
share/doc/kde/HTML/en/ksysguard/index.docbook
share/doc/kde/HTML/en/plasma-desktop/add-widgets.png
share/doc/kde/HTML/en/plasma-desktop/common
+share/doc/kde/HTML/en/plasma-desktop/desktop-settings.png
+share/doc/kde/HTML/en/plasma-desktop/device_notifier_widget.png
+share/doc/kde/HTML/en/plasma-desktop/device_notifier_widget_actions.png
share/doc/kde/HTML/en/plasma-desktop/index.cache.bz2
share/doc/kde/HTML/en/plasma-desktop/index.docbook
+share/doc/kde/HTML/en/plasma-desktop/panel-settings.png
+share/doc/kde/HTML/en/plasma-desktop/system-tray-settings.png
+share/doc/kde/HTML/en/plasma-desktop/system-tray-up-arrow.png
share/doc/kde/HTML/en/plasma-desktop/taskbar-settings.png
share/doc/kde/HTML/en/systemsettings/common
share/doc/kde/HTML/en/systemsettings/index.cache.bz2
share/doc/kde/HTML/en/systemsettings/index.docbook
+share/examples/kde-workspace4/ksysguarddrc
share/examples/kde4-dbus/org.kde.fontinst.conf
share/examples/kde4-dbus/org.kde.kcontrol.kcmclock.conf
share/examples/kde4-dbus/org.kde.kcontrol.kcmkdm.conf
share/examples/kde4-dbus/org.kde.ksysguard.processlisthelper.conf
-share/examples/kdebase-workspace4/ksysguarddrc
+share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf
share/examples/rc.d/kdm
share/icons/Daemon.png
share/icons/NetBSD-flag.png
@@ -714,81 +735,6 @@ share/icons/Oxygen_Black/cursors/watch
share/icons/Oxygen_Black/cursors/whats_this
share/icons/Oxygen_Black/cursors/xterm
share/icons/Oxygen_Black/index.theme
-share/icons/Oxygen_Black_Big/cursors/00000000000000020006000e7e9ffc3f
-share/icons/Oxygen_Black_Big/cursors/00008160000006810000408080010102
-share/icons/Oxygen_Black_Big/cursors/03b6e0fcb3499374a867c041f52298f0
-share/icons/Oxygen_Black_Big/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-share/icons/Oxygen_Black_Big/cursors/1081e37283d90000800003c07f3ef6bf
-share/icons/Oxygen_Black_Big/cursors/3085a0e285430894940527032f8b26df
-share/icons/Oxygen_Black_Big/cursors/3ecb610c1bf2410f44200f48c40d3599
-share/icons/Oxygen_Black_Big/cursors/4498f0e0c1937ffe01fd06f973665830
-share/icons/Oxygen_Black_Big/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408
-share/icons/Oxygen_Black_Big/cursors/6407b0e94181790501fd1e167b474872
-share/icons/Oxygen_Black_Big/cursors/640fb0e74195791501fd1ed57b41487f
-share/icons/Oxygen_Black_Big/cursors/9081237383d90e509aa00f00170e968f
-share/icons/Oxygen_Black_Big/cursors/9d800788f1b08800ae810202380a0822
-share/icons/Oxygen_Black_Big/cursors/X_cursor
-share/icons/Oxygen_Black_Big/cursors/a2a266d0498c3104214a47bd64ab0fc8
-share/icons/Oxygen_Black_Big/cursors/alias
-share/icons/Oxygen_Black_Big/cursors/all-scroll
-share/icons/Oxygen_Black_Big/cursors/b66166c04f8c3109214a4fbd64a50fc8
-share/icons/Oxygen_Black_Big/cursors/circle
-share/icons/Oxygen_Black_Big/cursors/closedhand
-share/icons/Oxygen_Black_Big/cursors/col-resize
-share/icons/Oxygen_Black_Big/cursors/color-picker
-share/icons/Oxygen_Black_Big/cursors/copy
-share/icons/Oxygen_Black_Big/cursors/cross
-share/icons/Oxygen_Black_Big/cursors/crossed_circle
-share/icons/Oxygen_Black_Big/cursors/d9ce0ab605698f320427677b458ad60b
-share/icons/Oxygen_Black_Big/cursors/dnd-copy
-share/icons/Oxygen_Black_Big/cursors/dnd-link
-share/icons/Oxygen_Black_Big/cursors/dnd-move
-share/icons/Oxygen_Black_Big/cursors/dnd-no-drop
-share/icons/Oxygen_Black_Big/cursors/dnd-none
-share/icons/Oxygen_Black_Big/cursors/e-resize
-share/icons/Oxygen_Black_Big/cursors/e29285e634086352946a0e7090d73106
-share/icons/Oxygen_Black_Big/cursors/fcf21c00b30f7e3f83fe0dfd12e71cff
-share/icons/Oxygen_Black_Big/cursors/fleur
-share/icons/Oxygen_Black_Big/cursors/forbidden
-share/icons/Oxygen_Black_Big/cursors/half-busy
-share/icons/Oxygen_Black_Big/cursors/hand1
-share/icons/Oxygen_Black_Big/cursors/hand2
-share/icons/Oxygen_Black_Big/cursors/help
-share/icons/Oxygen_Black_Big/cursors/ibeam
-share/icons/Oxygen_Black_Big/cursors/left_ptr
-share/icons/Oxygen_Black_Big/cursors/left_ptr_watch
-share/icons/Oxygen_Black_Big/cursors/link
-share/icons/Oxygen_Black_Big/cursors/move
-share/icons/Oxygen_Black_Big/cursors/n-resize
-share/icons/Oxygen_Black_Big/cursors/not-allowed
-share/icons/Oxygen_Black_Big/cursors/openhand
-share/icons/Oxygen_Black_Big/cursors/pencil
-share/icons/Oxygen_Black_Big/cursors/pirate
-share/icons/Oxygen_Black_Big/cursors/plus
-share/icons/Oxygen_Black_Big/cursors/pointer
-share/icons/Oxygen_Black_Big/cursors/pointing_hand
-share/icons/Oxygen_Black_Big/cursors/progress
-share/icons/Oxygen_Black_Big/cursors/question_arrow
-share/icons/Oxygen_Black_Big/cursors/row-resize
-share/icons/Oxygen_Black_Big/cursors/s-resize
-share/icons/Oxygen_Black_Big/cursors/sb_h_double_arrow
-share/icons/Oxygen_Black_Big/cursors/sb_v_double_arrow
-share/icons/Oxygen_Black_Big/cursors/size_all
-share/icons/Oxygen_Black_Big/cursors/size_bdiag
-share/icons/Oxygen_Black_Big/cursors/size_fdiag
-share/icons/Oxygen_Black_Big/cursors/size_hor
-share/icons/Oxygen_Black_Big/cursors/size_ver
-share/icons/Oxygen_Black_Big/cursors/split_h
-share/icons/Oxygen_Black_Big/cursors/split_v
-share/icons/Oxygen_Black_Big/cursors/text
-share/icons/Oxygen_Black_Big/cursors/up_arrow
-share/icons/Oxygen_Black_Big/cursors/v_double_arrow
-share/icons/Oxygen_Black_Big/cursors/w-resize
-share/icons/Oxygen_Black_Big/cursors/wait
-share/icons/Oxygen_Black_Big/cursors/watch
-share/icons/Oxygen_Black_Big/cursors/whats_this
-share/icons/Oxygen_Black_Big/cursors/xterm
-share/icons/Oxygen_Black_Big/index.theme
share/icons/Oxygen_Blue/cursors/00000000000000020006000e7e9ffc3f
share/icons/Oxygen_Blue/cursors/00008160000006810000408080010102
share/icons/Oxygen_Blue/cursors/03b6e0fcb3499374a867c041f52298f0
@@ -864,81 +810,6 @@ share/icons/Oxygen_Blue/cursors/watch
share/icons/Oxygen_Blue/cursors/whats_this
share/icons/Oxygen_Blue/cursors/xterm
share/icons/Oxygen_Blue/index.theme
-share/icons/Oxygen_Blue_Big/cursors/00000000000000020006000e7e9ffc3f
-share/icons/Oxygen_Blue_Big/cursors/00008160000006810000408080010102
-share/icons/Oxygen_Blue_Big/cursors/03b6e0fcb3499374a867c041f52298f0
-share/icons/Oxygen_Blue_Big/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-share/icons/Oxygen_Blue_Big/cursors/1081e37283d90000800003c07f3ef6bf
-share/icons/Oxygen_Blue_Big/cursors/3085a0e285430894940527032f8b26df
-share/icons/Oxygen_Blue_Big/cursors/3ecb610c1bf2410f44200f48c40d3599
-share/icons/Oxygen_Blue_Big/cursors/4498f0e0c1937ffe01fd06f973665830
-share/icons/Oxygen_Blue_Big/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408
-share/icons/Oxygen_Blue_Big/cursors/6407b0e94181790501fd1e167b474872
-share/icons/Oxygen_Blue_Big/cursors/640fb0e74195791501fd1ed57b41487f
-share/icons/Oxygen_Blue_Big/cursors/9081237383d90e509aa00f00170e968f
-share/icons/Oxygen_Blue_Big/cursors/9d800788f1b08800ae810202380a0822
-share/icons/Oxygen_Blue_Big/cursors/X_cursor
-share/icons/Oxygen_Blue_Big/cursors/a2a266d0498c3104214a47bd64ab0fc8
-share/icons/Oxygen_Blue_Big/cursors/alias
-share/icons/Oxygen_Blue_Big/cursors/all-scroll
-share/icons/Oxygen_Blue_Big/cursors/b66166c04f8c3109214a4fbd64a50fc8
-share/icons/Oxygen_Blue_Big/cursors/circle
-share/icons/Oxygen_Blue_Big/cursors/closedhand
-share/icons/Oxygen_Blue_Big/cursors/col-resize
-share/icons/Oxygen_Blue_Big/cursors/color-picker
-share/icons/Oxygen_Blue_Big/cursors/copy
-share/icons/Oxygen_Blue_Big/cursors/cross
-share/icons/Oxygen_Blue_Big/cursors/crossed_circle
-share/icons/Oxygen_Blue_Big/cursors/d9ce0ab605698f320427677b458ad60b
-share/icons/Oxygen_Blue_Big/cursors/dnd-copy
-share/icons/Oxygen_Blue_Big/cursors/dnd-link
-share/icons/Oxygen_Blue_Big/cursors/dnd-move
-share/icons/Oxygen_Blue_Big/cursors/dnd-no-drop
-share/icons/Oxygen_Blue_Big/cursors/dnd-none
-share/icons/Oxygen_Blue_Big/cursors/e-resize
-share/icons/Oxygen_Blue_Big/cursors/e29285e634086352946a0e7090d73106
-share/icons/Oxygen_Blue_Big/cursors/fcf21c00b30f7e3f83fe0dfd12e71cff
-share/icons/Oxygen_Blue_Big/cursors/fleur
-share/icons/Oxygen_Blue_Big/cursors/forbidden
-share/icons/Oxygen_Blue_Big/cursors/half-busy
-share/icons/Oxygen_Blue_Big/cursors/hand1
-share/icons/Oxygen_Blue_Big/cursors/hand2
-share/icons/Oxygen_Blue_Big/cursors/help
-share/icons/Oxygen_Blue_Big/cursors/ibeam
-share/icons/Oxygen_Blue_Big/cursors/left_ptr
-share/icons/Oxygen_Blue_Big/cursors/left_ptr_watch
-share/icons/Oxygen_Blue_Big/cursors/link
-share/icons/Oxygen_Blue_Big/cursors/move
-share/icons/Oxygen_Blue_Big/cursors/n-resize
-share/icons/Oxygen_Blue_Big/cursors/not-allowed
-share/icons/Oxygen_Blue_Big/cursors/openhand
-share/icons/Oxygen_Blue_Big/cursors/pencil
-share/icons/Oxygen_Blue_Big/cursors/pirate
-share/icons/Oxygen_Blue_Big/cursors/plus
-share/icons/Oxygen_Blue_Big/cursors/pointer
-share/icons/Oxygen_Blue_Big/cursors/pointing_hand
-share/icons/Oxygen_Blue_Big/cursors/progress
-share/icons/Oxygen_Blue_Big/cursors/question_arrow
-share/icons/Oxygen_Blue_Big/cursors/row-resize
-share/icons/Oxygen_Blue_Big/cursors/s-resize
-share/icons/Oxygen_Blue_Big/cursors/sb_h_double_arrow
-share/icons/Oxygen_Blue_Big/cursors/sb_v_double_arrow
-share/icons/Oxygen_Blue_Big/cursors/size_all
-share/icons/Oxygen_Blue_Big/cursors/size_bdiag
-share/icons/Oxygen_Blue_Big/cursors/size_fdiag
-share/icons/Oxygen_Blue_Big/cursors/size_hor
-share/icons/Oxygen_Blue_Big/cursors/size_ver
-share/icons/Oxygen_Blue_Big/cursors/split_h
-share/icons/Oxygen_Blue_Big/cursors/split_v
-share/icons/Oxygen_Blue_Big/cursors/text
-share/icons/Oxygen_Blue_Big/cursors/up_arrow
-share/icons/Oxygen_Blue_Big/cursors/v_double_arrow
-share/icons/Oxygen_Blue_Big/cursors/w-resize
-share/icons/Oxygen_Blue_Big/cursors/wait
-share/icons/Oxygen_Blue_Big/cursors/watch
-share/icons/Oxygen_Blue_Big/cursors/whats_this
-share/icons/Oxygen_Blue_Big/cursors/xterm
-share/icons/Oxygen_Blue_Big/index.theme
share/icons/Oxygen_White/cursors/00000000000000020006000e7e9ffc3f
share/icons/Oxygen_White/cursors/00008160000006810000408080010102
share/icons/Oxygen_White/cursors/03b6e0fcb3499374a867c041f52298f0
@@ -1014,81 +885,6 @@ share/icons/Oxygen_White/cursors/watch
share/icons/Oxygen_White/cursors/whats_this
share/icons/Oxygen_White/cursors/xterm
share/icons/Oxygen_White/index.theme
-share/icons/Oxygen_White_Big/cursors/00000000000000020006000e7e9ffc3f
-share/icons/Oxygen_White_Big/cursors/00008160000006810000408080010102
-share/icons/Oxygen_White_Big/cursors/03b6e0fcb3499374a867c041f52298f0
-share/icons/Oxygen_White_Big/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-share/icons/Oxygen_White_Big/cursors/1081e37283d90000800003c07f3ef6bf
-share/icons/Oxygen_White_Big/cursors/3085a0e285430894940527032f8b26df
-share/icons/Oxygen_White_Big/cursors/3ecb610c1bf2410f44200f48c40d3599
-share/icons/Oxygen_White_Big/cursors/4498f0e0c1937ffe01fd06f973665830
-share/icons/Oxygen_White_Big/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408
-share/icons/Oxygen_White_Big/cursors/6407b0e94181790501fd1e167b474872
-share/icons/Oxygen_White_Big/cursors/640fb0e74195791501fd1ed57b41487f
-share/icons/Oxygen_White_Big/cursors/9081237383d90e509aa00f00170e968f
-share/icons/Oxygen_White_Big/cursors/9d800788f1b08800ae810202380a0822
-share/icons/Oxygen_White_Big/cursors/X_cursor
-share/icons/Oxygen_White_Big/cursors/a2a266d0498c3104214a47bd64ab0fc8
-share/icons/Oxygen_White_Big/cursors/alias
-share/icons/Oxygen_White_Big/cursors/all-scroll
-share/icons/Oxygen_White_Big/cursors/b66166c04f8c3109214a4fbd64a50fc8
-share/icons/Oxygen_White_Big/cursors/circle
-share/icons/Oxygen_White_Big/cursors/closedhand
-share/icons/Oxygen_White_Big/cursors/col-resize
-share/icons/Oxygen_White_Big/cursors/color-picker
-share/icons/Oxygen_White_Big/cursors/copy
-share/icons/Oxygen_White_Big/cursors/cross
-share/icons/Oxygen_White_Big/cursors/crossed_circle
-share/icons/Oxygen_White_Big/cursors/d9ce0ab605698f320427677b458ad60b
-share/icons/Oxygen_White_Big/cursors/dnd-copy
-share/icons/Oxygen_White_Big/cursors/dnd-link
-share/icons/Oxygen_White_Big/cursors/dnd-move
-share/icons/Oxygen_White_Big/cursors/dnd-no-drop
-share/icons/Oxygen_White_Big/cursors/dnd-none
-share/icons/Oxygen_White_Big/cursors/e-resize
-share/icons/Oxygen_White_Big/cursors/e29285e634086352946a0e7090d73106
-share/icons/Oxygen_White_Big/cursors/fcf21c00b30f7e3f83fe0dfd12e71cff
-share/icons/Oxygen_White_Big/cursors/fleur
-share/icons/Oxygen_White_Big/cursors/forbidden
-share/icons/Oxygen_White_Big/cursors/half-busy
-share/icons/Oxygen_White_Big/cursors/hand1
-share/icons/Oxygen_White_Big/cursors/hand2
-share/icons/Oxygen_White_Big/cursors/help
-share/icons/Oxygen_White_Big/cursors/ibeam
-share/icons/Oxygen_White_Big/cursors/left_ptr
-share/icons/Oxygen_White_Big/cursors/left_ptr_watch
-share/icons/Oxygen_White_Big/cursors/link
-share/icons/Oxygen_White_Big/cursors/move
-share/icons/Oxygen_White_Big/cursors/n-resize
-share/icons/Oxygen_White_Big/cursors/not-allowed
-share/icons/Oxygen_White_Big/cursors/openhand
-share/icons/Oxygen_White_Big/cursors/pencil
-share/icons/Oxygen_White_Big/cursors/pirate
-share/icons/Oxygen_White_Big/cursors/plus
-share/icons/Oxygen_White_Big/cursors/pointer
-share/icons/Oxygen_White_Big/cursors/pointing_hand
-share/icons/Oxygen_White_Big/cursors/progress
-share/icons/Oxygen_White_Big/cursors/question_arrow
-share/icons/Oxygen_White_Big/cursors/row-resize
-share/icons/Oxygen_White_Big/cursors/s-resize
-share/icons/Oxygen_White_Big/cursors/sb_h_double_arrow
-share/icons/Oxygen_White_Big/cursors/sb_v_double_arrow
-share/icons/Oxygen_White_Big/cursors/size_all
-share/icons/Oxygen_White_Big/cursors/size_bdiag
-share/icons/Oxygen_White_Big/cursors/size_fdiag
-share/icons/Oxygen_White_Big/cursors/size_hor
-share/icons/Oxygen_White_Big/cursors/size_ver
-share/icons/Oxygen_White_Big/cursors/split_h
-share/icons/Oxygen_White_Big/cursors/split_v
-share/icons/Oxygen_White_Big/cursors/text
-share/icons/Oxygen_White_Big/cursors/up_arrow
-share/icons/Oxygen_White_Big/cursors/v_double_arrow
-share/icons/Oxygen_White_Big/cursors/w-resize
-share/icons/Oxygen_White_Big/cursors/wait
-share/icons/Oxygen_White_Big/cursors/watch
-share/icons/Oxygen_White_Big/cursors/whats_this
-share/icons/Oxygen_White_Big/cursors/xterm
-share/icons/Oxygen_White_Big/index.theme
share/icons/Oxygen_Yellow/cursors/00000000000000020006000e7e9ffc3f
share/icons/Oxygen_Yellow/cursors/00008160000006810000408080010102
share/icons/Oxygen_Yellow/cursors/03b6e0fcb3499374a867c041f52298f0
@@ -1164,81 +960,6 @@ share/icons/Oxygen_Yellow/cursors/watch
share/icons/Oxygen_Yellow/cursors/whats_this
share/icons/Oxygen_Yellow/cursors/xterm
share/icons/Oxygen_Yellow/index.theme
-share/icons/Oxygen_Yellow_Big/cursors/00000000000000020006000e7e9ffc3f
-share/icons/Oxygen_Yellow_Big/cursors/00008160000006810000408080010102
-share/icons/Oxygen_Yellow_Big/cursors/03b6e0fcb3499374a867c041f52298f0
-share/icons/Oxygen_Yellow_Big/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-share/icons/Oxygen_Yellow_Big/cursors/1081e37283d90000800003c07f3ef6bf
-share/icons/Oxygen_Yellow_Big/cursors/3085a0e285430894940527032f8b26df
-share/icons/Oxygen_Yellow_Big/cursors/3ecb610c1bf2410f44200f48c40d3599
-share/icons/Oxygen_Yellow_Big/cursors/4498f0e0c1937ffe01fd06f973665830
-share/icons/Oxygen_Yellow_Big/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408
-share/icons/Oxygen_Yellow_Big/cursors/6407b0e94181790501fd1e167b474872
-share/icons/Oxygen_Yellow_Big/cursors/640fb0e74195791501fd1ed57b41487f
-share/icons/Oxygen_Yellow_Big/cursors/9081237383d90e509aa00f00170e968f
-share/icons/Oxygen_Yellow_Big/cursors/9d800788f1b08800ae810202380a0822
-share/icons/Oxygen_Yellow_Big/cursors/X_cursor
-share/icons/Oxygen_Yellow_Big/cursors/a2a266d0498c3104214a47bd64ab0fc8
-share/icons/Oxygen_Yellow_Big/cursors/alias
-share/icons/Oxygen_Yellow_Big/cursors/all-scroll
-share/icons/Oxygen_Yellow_Big/cursors/b66166c04f8c3109214a4fbd64a50fc8
-share/icons/Oxygen_Yellow_Big/cursors/circle
-share/icons/Oxygen_Yellow_Big/cursors/closedhand
-share/icons/Oxygen_Yellow_Big/cursors/col-resize
-share/icons/Oxygen_Yellow_Big/cursors/color-picker
-share/icons/Oxygen_Yellow_Big/cursors/copy
-share/icons/Oxygen_Yellow_Big/cursors/cross
-share/icons/Oxygen_Yellow_Big/cursors/crossed_circle
-share/icons/Oxygen_Yellow_Big/cursors/d9ce0ab605698f320427677b458ad60b
-share/icons/Oxygen_Yellow_Big/cursors/dnd-copy
-share/icons/Oxygen_Yellow_Big/cursors/dnd-link
-share/icons/Oxygen_Yellow_Big/cursors/dnd-move
-share/icons/Oxygen_Yellow_Big/cursors/dnd-no-drop
-share/icons/Oxygen_Yellow_Big/cursors/dnd-none
-share/icons/Oxygen_Yellow_Big/cursors/e-resize
-share/icons/Oxygen_Yellow_Big/cursors/e29285e634086352946a0e7090d73106
-share/icons/Oxygen_Yellow_Big/cursors/fcf21c00b30f7e3f83fe0dfd12e71cff
-share/icons/Oxygen_Yellow_Big/cursors/fleur
-share/icons/Oxygen_Yellow_Big/cursors/forbidden
-share/icons/Oxygen_Yellow_Big/cursors/half-busy
-share/icons/Oxygen_Yellow_Big/cursors/hand1
-share/icons/Oxygen_Yellow_Big/cursors/hand2
-share/icons/Oxygen_Yellow_Big/cursors/help
-share/icons/Oxygen_Yellow_Big/cursors/ibeam
-share/icons/Oxygen_Yellow_Big/cursors/left_ptr
-share/icons/Oxygen_Yellow_Big/cursors/left_ptr_watch
-share/icons/Oxygen_Yellow_Big/cursors/link
-share/icons/Oxygen_Yellow_Big/cursors/move
-share/icons/Oxygen_Yellow_Big/cursors/n-resize
-share/icons/Oxygen_Yellow_Big/cursors/not-allowed
-share/icons/Oxygen_Yellow_Big/cursors/openhand
-share/icons/Oxygen_Yellow_Big/cursors/pencil
-share/icons/Oxygen_Yellow_Big/cursors/pirate
-share/icons/Oxygen_Yellow_Big/cursors/plus
-share/icons/Oxygen_Yellow_Big/cursors/pointer
-share/icons/Oxygen_Yellow_Big/cursors/pointing_hand
-share/icons/Oxygen_Yellow_Big/cursors/progress
-share/icons/Oxygen_Yellow_Big/cursors/question_arrow
-share/icons/Oxygen_Yellow_Big/cursors/row-resize
-share/icons/Oxygen_Yellow_Big/cursors/s-resize
-share/icons/Oxygen_Yellow_Big/cursors/sb_h_double_arrow
-share/icons/Oxygen_Yellow_Big/cursors/sb_v_double_arrow
-share/icons/Oxygen_Yellow_Big/cursors/size_all
-share/icons/Oxygen_Yellow_Big/cursors/size_bdiag
-share/icons/Oxygen_Yellow_Big/cursors/size_fdiag
-share/icons/Oxygen_Yellow_Big/cursors/size_hor
-share/icons/Oxygen_Yellow_Big/cursors/size_ver
-share/icons/Oxygen_Yellow_Big/cursors/split_h
-share/icons/Oxygen_Yellow_Big/cursors/split_v
-share/icons/Oxygen_Yellow_Big/cursors/text
-share/icons/Oxygen_Yellow_Big/cursors/up_arrow
-share/icons/Oxygen_Yellow_Big/cursors/v_double_arrow
-share/icons/Oxygen_Yellow_Big/cursors/w-resize
-share/icons/Oxygen_Yellow_Big/cursors/wait
-share/icons/Oxygen_Yellow_Big/cursors/watch
-share/icons/Oxygen_Yellow_Big/cursors/whats_this
-share/icons/Oxygen_Yellow_Big/cursors/xterm
-share/icons/Oxygen_Yellow_Big/index.theme
share/icons/Oxygen_Zion/cursors/00000000000000020006000e7e9ffc3f
share/icons/Oxygen_Zion/cursors/00008160000006810000408080010102
share/icons/Oxygen_Zion/cursors/03b6e0fcb3499374a867c041f52298f0
@@ -1314,81 +1035,6 @@ share/icons/Oxygen_Zion/cursors/watch
share/icons/Oxygen_Zion/cursors/whats_this
share/icons/Oxygen_Zion/cursors/xterm
share/icons/Oxygen_Zion/index.theme
-share/icons/Oxygen_Zion_Big/cursors/00000000000000020006000e7e9ffc3f
-share/icons/Oxygen_Zion_Big/cursors/00008160000006810000408080010102
-share/icons/Oxygen_Zion_Big/cursors/03b6e0fcb3499374a867c041f52298f0
-share/icons/Oxygen_Zion_Big/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-share/icons/Oxygen_Zion_Big/cursors/1081e37283d90000800003c07f3ef6bf
-share/icons/Oxygen_Zion_Big/cursors/3085a0e285430894940527032f8b26df
-share/icons/Oxygen_Zion_Big/cursors/3ecb610c1bf2410f44200f48c40d3599
-share/icons/Oxygen_Zion_Big/cursors/4498f0e0c1937ffe01fd06f973665830
-share/icons/Oxygen_Zion_Big/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408
-share/icons/Oxygen_Zion_Big/cursors/6407b0e94181790501fd1e167b474872
-share/icons/Oxygen_Zion_Big/cursors/640fb0e74195791501fd1ed57b41487f
-share/icons/Oxygen_Zion_Big/cursors/9081237383d90e509aa00f00170e968f
-share/icons/Oxygen_Zion_Big/cursors/9d800788f1b08800ae810202380a0822
-share/icons/Oxygen_Zion_Big/cursors/X_cursor
-share/icons/Oxygen_Zion_Big/cursors/a2a266d0498c3104214a47bd64ab0fc8
-share/icons/Oxygen_Zion_Big/cursors/alias
-share/icons/Oxygen_Zion_Big/cursors/all-scroll
-share/icons/Oxygen_Zion_Big/cursors/b66166c04f8c3109214a4fbd64a50fc8
-share/icons/Oxygen_Zion_Big/cursors/circle
-share/icons/Oxygen_Zion_Big/cursors/closedhand
-share/icons/Oxygen_Zion_Big/cursors/col-resize
-share/icons/Oxygen_Zion_Big/cursors/color-picker
-share/icons/Oxygen_Zion_Big/cursors/copy
-share/icons/Oxygen_Zion_Big/cursors/cross
-share/icons/Oxygen_Zion_Big/cursors/crossed_circle
-share/icons/Oxygen_Zion_Big/cursors/d9ce0ab605698f320427677b458ad60b
-share/icons/Oxygen_Zion_Big/cursors/dnd-copy
-share/icons/Oxygen_Zion_Big/cursors/dnd-link
-share/icons/Oxygen_Zion_Big/cursors/dnd-move
-share/icons/Oxygen_Zion_Big/cursors/dnd-no-drop
-share/icons/Oxygen_Zion_Big/cursors/dnd-none
-share/icons/Oxygen_Zion_Big/cursors/e-resize
-share/icons/Oxygen_Zion_Big/cursors/e29285e634086352946a0e7090d73106
-share/icons/Oxygen_Zion_Big/cursors/fcf21c00b30f7e3f83fe0dfd12e71cff
-share/icons/Oxygen_Zion_Big/cursors/fleur
-share/icons/Oxygen_Zion_Big/cursors/forbidden
-share/icons/Oxygen_Zion_Big/cursors/half-busy
-share/icons/Oxygen_Zion_Big/cursors/hand1
-share/icons/Oxygen_Zion_Big/cursors/hand2
-share/icons/Oxygen_Zion_Big/cursors/help
-share/icons/Oxygen_Zion_Big/cursors/ibeam
-share/icons/Oxygen_Zion_Big/cursors/left_ptr
-share/icons/Oxygen_Zion_Big/cursors/left_ptr_watch
-share/icons/Oxygen_Zion_Big/cursors/link
-share/icons/Oxygen_Zion_Big/cursors/move
-share/icons/Oxygen_Zion_Big/cursors/n-resize
-share/icons/Oxygen_Zion_Big/cursors/not-allowed
-share/icons/Oxygen_Zion_Big/cursors/openhand
-share/icons/Oxygen_Zion_Big/cursors/pencil
-share/icons/Oxygen_Zion_Big/cursors/pirate
-share/icons/Oxygen_Zion_Big/cursors/plus
-share/icons/Oxygen_Zion_Big/cursors/pointer
-share/icons/Oxygen_Zion_Big/cursors/pointing_hand
-share/icons/Oxygen_Zion_Big/cursors/progress
-share/icons/Oxygen_Zion_Big/cursors/question_arrow
-share/icons/Oxygen_Zion_Big/cursors/row-resize
-share/icons/Oxygen_Zion_Big/cursors/s-resize
-share/icons/Oxygen_Zion_Big/cursors/sb_h_double_arrow
-share/icons/Oxygen_Zion_Big/cursors/sb_v_double_arrow
-share/icons/Oxygen_Zion_Big/cursors/size_all
-share/icons/Oxygen_Zion_Big/cursors/size_bdiag
-share/icons/Oxygen_Zion_Big/cursors/size_fdiag
-share/icons/Oxygen_Zion_Big/cursors/size_hor
-share/icons/Oxygen_Zion_Big/cursors/size_ver
-share/icons/Oxygen_Zion_Big/cursors/split_h
-share/icons/Oxygen_Zion_Big/cursors/split_v
-share/icons/Oxygen_Zion_Big/cursors/text
-share/icons/Oxygen_Zion_Big/cursors/up_arrow
-share/icons/Oxygen_Zion_Big/cursors/v_double_arrow
-share/icons/Oxygen_Zion_Big/cursors/w-resize
-share/icons/Oxygen_Zion_Big/cursors/wait
-share/icons/Oxygen_Zion_Big/cursors/watch
-share/icons/Oxygen_Zion_Big/cursors/whats_this
-share/icons/Oxygen_Zion_Big/cursors/xterm
-share/icons/Oxygen_Zion_Big/index.theme
share/icons/hicolor/128x128/apps/ksplash.png
share/icons/hicolor/16x16/apps/kmenuedit.png
share/icons/hicolor/16x16/apps/ksplash.png
@@ -1438,8 +1084,8 @@ share/kde/apps/cmake/modules/FindDBus.cmake
share/kde/apps/cmake/modules/FindGooglegadgets.cmake
share/kde/apps/cmake/modules/FindKephal.cmake
share/kde/apps/cmake/modules/FindLibXKlavier.cmake
+share/kde/apps/cmake/modules/FindOpenGLES.cmake
share/kde/apps/cmake/modules/FindPAM.cmake
-share/kde/apps/cmake/modules/FindQEdje.cmake
share/kde/apps/cmake/modules/FindSensors.cmake
share/kde/apps/cmake/modules/PkgConfigGetVar.cmake
share/kde/apps/cmake/modules/UnixAuth.cmake
@@ -1450,12 +1096,15 @@ share/kde/apps/color-schemes/Oxygen.colors
share/kde/apps/color-schemes/OxygenCold.colors
share/kde/apps/color-schemes/Steel.colors
share/kde/apps/color-schemes/WontonSoup.colors
+share/kde/apps/color-schemes/Zion.colors
+share/kde/apps/color-schemes/ZionReversed.colors
share/kde/apps/desktoptheme/air-netbook/colors
share/kde/apps/desktoptheme/air-netbook/metadata.desktop
share/kde/apps/desktoptheme/air-netbook/widgets/background.svgz
share/kde/apps/desktoptheme/air-netbook/widgets/panel-background.svgz
share/kde/apps/desktoptheme/default/calendar/mini-calendar.svgz
share/kde/apps/desktoptheme/default/system-monitor/hdd_panel.svgz
+share/kde/apps/desktoptheme/default/widgets/activities.svgz
share/kde/apps/desktoptheme/default/widgets/battery-oxygen.svgz
share/kde/apps/doc/kdm/README
share/kde/apps/doc/kdm/greeter.dtd
@@ -1467,6 +1116,7 @@ share/kde/apps/kcminput/cursor_large_white.pcf.gz
share/kde/apps/kcminput/cursor_small_white.pcf.gz
share/kde/apps/kcminput/pics/mouse_lh.png
share/kde/apps/kcminput/pics/mouse_rh.png
+share/kde/apps/kcmkeyboard/pics/epo.png
share/kde/apps/kcmkeys/kde3.kksrc
share/kde/apps/kcmkeys/kde4.kksrc
share/kde/apps/kcmkeys/mac4.kksrc
@@ -1480,20 +1130,22 @@ 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.upd
+share/kde/apps/kconf_update/krdb_libpathwipe.upd
share/kde/apps/kconf_update/ksmserver.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_blacklist.sh
-share/kde/apps/kconf_update/kwin_blacklist.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_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
@@ -1578,8 +1230,8 @@ share/kde/apps/kdm/sessions/gnome.desktop
share/kde/apps/kdm/sessions/golem.desktop
share/kde/apps/kdm/sessions/icewm.desktop
share/kde/apps/kdm/sessions/ion.desktop
-share/kde/apps/kdm/sessions/kde-safe.desktop
-share/kde/apps/kdm/sessions/kde.desktop
+share/kde/apps/kdm/sessions/kde-plasma-safe.desktop
+share/kde/apps/kdm/sessions/kde-plasma.desktop
share/kde/apps/kdm/sessions/larswm.desktop
share/kde/apps/kdm/sessions/lwm.desktop
share/kde/apps/kdm/sessions/matchbox.desktop
@@ -1604,6 +1256,20 @@ share/kde/apps/kdm/sessions/wm2.desktop
share/kde/apps/kdm/sessions/wmaker.desktop
share/kde/apps/kdm/sessions/xfce.desktop
share/kde/apps/kdm/sessions/xfce4.desktop
+share/kde/apps/kdm/themes/ariya/KdmGreeterTheme.desktop
+share/kde/apps/kdm/themes/ariya/ariya.xml
+share/kde/apps/kdm/themes/ariya/lineedit_active.png
+share/kde/apps/kdm/themes/ariya/lineedit_normal.png
+share/kde/apps/kdm/themes/ariya/lock.png
+share/kde/apps/kdm/themes/ariya/login_active.png
+share/kde/apps/kdm/themes/ariya/login_normal.png
+share/kde/apps/kdm/themes/ariya/pw_icon.png
+share/kde/apps/kdm/themes/ariya/rectangle.png
+share/kde/apps/kdm/themes/ariya/rectangle_overlay.png
+share/kde/apps/kdm/themes/ariya/screenshot.png
+share/kde/apps/kdm/themes/ariya/session_normal.png
+share/kde/apps/kdm/themes/ariya/system_normal.png
+share/kde/apps/kdm/themes/ariya/user_icon.png
share/kde/apps/kdm/themes/circles/KdmGreeterTheme.desktop
share/kde/apps/kdm/themes/circles/background.svg
share/kde/apps/kdm/themes/circles/circles.xml
@@ -1611,20 +1277,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/ethais/KdmGreeterTheme.desktop
-share/kde/apps/kdm/themes/ethais/ethais.xml
-share/kde/apps/kdm/themes/ethais/lineedit_active.png
-share/kde/apps/kdm/themes/ethais/lineedit_normal.png
-share/kde/apps/kdm/themes/ethais/lock.png
-share/kde/apps/kdm/themes/ethais/login_active.png
-share/kde/apps/kdm/themes/ethais/login_normal.png
-share/kde/apps/kdm/themes/ethais/pw_icon.png
-share/kde/apps/kdm/themes/ethais/rectangle.png
-share/kde/apps/kdm/themes/ethais/rectangle_overlay.png
-share/kde/apps/kdm/themes/ethais/screenshot.png
-share/kde/apps/kdm/themes/ethais/session_normal.png
-share/kde/apps/kdm/themes/ethais/system_normal.png
-share/kde/apps/kdm/themes/ethais/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
+share/kde/apps/kdm/themes/horos/lineedit_normal.png
+share/kde/apps/kdm/themes/horos/lock.png
+share/kde/apps/kdm/themes/horos/login_active.png
+share/kde/apps/kdm/themes/horos/login_normal.png
+share/kde/apps/kdm/themes/horos/pw_icon.png
+share/kde/apps/kdm/themes/horos/rectangle.png
+share/kde/apps/kdm/themes/horos/rectangle_overlay.png
+share/kde/apps/kdm/themes/horos/screenshot.png
+share/kde/apps/kdm/themes/horos/session_normal.png
+share/kde/apps/kdm/themes/horos/system_normal.png
+share/kde/apps/kdm/themes/horos/user_icon.png
share/kde/apps/kdm/themes/oxygen-air/KdmGreeterTheme.desktop
share/kde/apps/kdm/themes/oxygen-air/caps.png
share/kde/apps/kdm/themes/oxygen-air/icon-kde.png
@@ -1687,11 +1353,20 @@ 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/ksplash/Themes/Minimalistic/Preview.png
+share/kde/apps/ksplash/Themes/Minimalistic/Theme.rc
+share/kde/apps/ksplash/Themes/Minimalistic/images/kdegear.png
+share/kde/apps/ksplash/Themes/Minimalistic/images/kdeletter.png
+share/kde/apps/ksplash/Themes/Minimalistic/images/kdelogo-contrast.png
+share/kde/apps/ksplash/Themes/Minimalistic/images/kdelogo.png
+share/kde/apps/ksplash/Themes/Minimalistic/images/kdemask.png
+share/kde/apps/ksplash/Themes/Minimalistic/main.qml
share/kde/apps/ksplash/Themes/None/Theme.rc
share/kde/apps/ksplash/Themes/Simple/Preview.png
share/kde/apps/ksplash/Themes/Simple/Theme.rc
@@ -1742,8 +1417,10 @@ share/kde/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
share/kde/apps/kwin/DefaultTabBoxLayouts.xml
share/kde/apps/kwin/aurorae.desktop
share/kde/apps/kwin/b2.desktop
-share/kde/apps/kwin/circle-edgy.png
-share/kde/apps/kwin/circle.png
+share/kde/apps/kwin/blinking-startup-fragment.glsl
+share/kde/apps/kwin/coverswitch-reflection.glsl
+share/kde/apps/kwin/cube-cap.glsl
+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
@@ -1752,33 +1429,32 @@ share/kde/apps/kwin/default_rules/plasma_desktop_containment.kwinrules
share/kde/apps/kwin/explosion-end.png
share/kde/apps/kwin/explosion-start.png
share/kde/apps/kwin/explosion.frag
-share/kde/apps/kwin/explosion.vert
share/kde/apps/kwin/invert.frag
-share/kde/apps/kwin/invert.vert
-share/kde/apps/kwin/kde2.desktop
-share/kde/apps/kwin/keramik.desktop
+share/kde/apps/kwin/kcm_kwintabbox/dolphin.png
+share/kde/apps/kwin/kcm_kwintabbox/kmail.png
+share/kde/apps/kwin/kcm_kwintabbox/konqueror.png
+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/lookingglass.frag
-share/kde/apps/kwin/lookingglass.vert
-share/kde/apps/kwin/modernsystem.desktop
share/kde/apps/kwin/oxygenclient.desktop
share/kde/apps/kwin/plastik.desktop
-share/kde/apps/kwin/quartz.desktop
-share/kde/apps/kwin/redmond.desktop
-share/kde/apps/kwin/shadow-texture.png
-share/kde/apps/kwin/sharpen.frag
-share/kde/apps/kwin/sharpen.vert
-share/kde/apps/kwin/snow.frag
-share/kde/apps/kwin/snow.vert
-share/kde/apps/kwin/snowflake.png
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/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/web.desktop
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/systray-to-notifications-widget.js
share/kde/apps/plasma-netbook/init/00-defaultLayout.js
share/kde/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
@@ -1788,22 +1464,63 @@ share/kde/apps/plasma/dashboard/AppleClasses/AppleScrollArea.js
share/kde/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js
share/kde/apps/plasma/dashboard/AppleClasses/AppleSlider.js
share/kde/apps/plasma/dashboard/button/genericButton.js
+share/kde/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL/contents/layout.js
+share/kde/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL/metadata.desktop
share/kde/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js
share/kde/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/metadata.desktop
+share/kde/apps/plasma/layout-templates/org.kde.plasma-desktop.desktopIcons/contents/layout.js
+share/kde/apps/plasma/layout-templates/org.kde.plasma-desktop.desktopIcons/metadata.desktop
+share/kde/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets/contents/layout.js
+share/kde/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets/metadata.desktop
+share/kde/apps/plasma/layout-templates/org.kde.plasma-desktop.photoActivity/contents/layout.js
+share/kde/apps/plasma/layout-templates/org.kde.plasma-desktop.photoActivity/metadata.desktop
share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/contents/layout.js
share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/metadata.desktop
share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents/layout.js
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/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
+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/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/notifications.operations
share/kde/apps/plasma/services/nowplaying.operations
+share/kde/apps/plasma/services/org.kde.places.operations
+share/kde/apps/plasma/services/powermanagementservice.operations
share/kde/apps/plasma/services/searchlaunch.operations
+share/kde/apps/plasma/services/share.operations
+share/kde/apps/plasma/services/soliddevice.operations
share/kde/apps/plasma/services/statusnotifieritem.operations
share/kde/apps/plasma/services/tasks.operations
+share/kde/apps/plasma/shareprovider/imgsusepasteorg/contents/code/main.js
+share/kde/apps/plasma/shareprovider/imgsusepasteorg/metadata.desktop
+share/kde/apps/plasma/shareprovider/imgur/contents/code/main.js
+share/kde/apps/plasma/shareprovider/imgur/metadata.desktop
+share/kde/apps/plasma/shareprovider/kde/contents/code/main.js
+share/kde/apps/plasma/shareprovider/kde/metadata.desktop
+share/kde/apps/plasma/shareprovider/pastebincom/contents/code/main.js
+share/kde/apps/plasma/shareprovider/pastebincom/metadata.desktop
+share/kde/apps/plasma/shareprovider/pasteopensuseorg/contents/code/main.js
+share/kde/apps/plasma/shareprovider/pasteopensuseorg/metadata.desktop
+share/kde/apps/plasma/shareprovider/pasteubuntucom/contents/code/main.js
+share/kde/apps/plasma/shareprovider/pasteubuntucom/metadata.desktop
+share/kde/apps/plasma/shareprovider/privatepastecom/contents/code/main.js
+share/kde/apps/plasma/shareprovider/privatepastecom/metadata.desktop
+share/kde/apps/plasma/shareprovider/simplestimagehosting/contents/code/main.js
+share/kde/apps/plasma/shareprovider/simplestimagehosting/metadata.desktop
+share/kde/apps/plasma/shareprovider/wklej/contents/code/main.js
+share/kde/apps/plasma/shareprovider/wklej/metadata.desktop
+share/kde/apps/plasma/shareprovider/wstaw/contents/code/main.js
+share/kde/apps/plasma/shareprovider/wstaw/metadata.desktop
share/kde/apps/plasma_scriptengine_python/plasma_importer.py
share/kde/apps/plasma_scriptengine_python/plasma_importer.pyc
share/kde/apps/plasma_scriptengine_python/pyappletscript.py
@@ -1816,7 +1533,6 @@ share/kde/apps/plasma_scriptengine_python/pywallpaper.py
share/kde/apps/plasma_scriptengine_python/pywallpaper.pyc
share/kde/apps/plasma_scriptengine_ruby/applet.rb
share/kde/apps/plasma_scriptengine_ruby/data_engine.rb
-share/kde/apps/powerdevil/default.powerdevilprofiles
share/kde/apps/powerdevil/powerdevil.notifyrc
share/kde/apps/solid/actions/test-predicate-openinwindow.desktop
share/kde/apps/solid/devices/solid-device-AcAdapter.desktop
@@ -1844,7 +1560,7 @@ share/kde/apps/systemsettings/systemsettings.kcfg
share/kde/apps/systemsettings/systemsettingsui.rc
share/kde/autostart/klipper.desktop
share/kde/autostart/krunner.desktop
-share/kde/autostart/kwrited-autostart.desktop
+${PLIST.noutempter}share/kde/autostart/kwrited-autostart.desktop
share/kde/autostart/plasma-desktop.desktop
share/kde/autostart/plasma.desktop
share/kde/config.kcfg/freespacenotifier.kcfg
@@ -1852,6 +1568,7 @@ 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
share/kde/config/aurorae.knsrc
share/kde/config/background.knsrc
share/kde/config/colorschemes.knsrc
@@ -1865,110 +1582,13 @@ share/kde/config/kdm/Xstartup
share/kde/config/kdm/Xwilling
share/kde/config/kdm/backgroundrc
share/kde/config/kdm/kdmrc
+share/kde/config/kfontinst.knsrc
share/kde/config/ksplash.knsrc
share/kde/config/ksysguard.knsrc
share/kde/config/plasma-overlayrc
share/kde/config/plasma-themes.knsrc
share/kde/config/wallpaper.knsrc
-share/kde/wallpapers/Aghi/contents/images/1024x768.jpg
-share/kde/wallpapers/Aghi/contents/images/1280x1024.jpg
-share/kde/wallpapers/Aghi/contents/images/1280x800.jpg
-share/kde/wallpapers/Aghi/contents/images/1440x900.jpg
-share/kde/wallpapers/Aghi/contents/images/1600x1200.jpg
-share/kde/wallpapers/Aghi/contents/images/1920x1080.jpg
-share/kde/wallpapers/Aghi/contents/images/1920x1200.jpg
-share/kde/wallpapers/Aghi/contents/images/800x600.jpg
-share/kde/wallpapers/Aghi/contents/screenshot.jpg
-share/kde/wallpapers/Aghi/metadata.desktop
-share/kde/wallpapers/Air/contents/images/1280x1024.jpg
-share/kde/wallpapers/Air/contents/images/1600x1200.jpg
-share/kde/wallpapers/Air/contents/images/1920x1080.jpg
-share/kde/wallpapers/Air/contents/images/1920x1200.jpg
-share/kde/wallpapers/Air/contents/screenshot.png
-share/kde/wallpapers/Air/metadata.desktop
-share/kde/wallpapers/Autumn/contents/images/1280x1024.jpg
-share/kde/wallpapers/Autumn/contents/images/1600x1200.jpg
-share/kde/wallpapers/Autumn/contents/images/1920x1080.jpg
-share/kde/wallpapers/Autumn/contents/images/1920x1200.jpg
-share/kde/wallpapers/Autumn/contents/screenshot.png
-share/kde/wallpapers/Autumn/metadata.desktop
-share/kde/wallpapers/Blue_Wood/contents/images/1280x1024.jpg
-share/kde/wallpapers/Blue_Wood/contents/images/1600x1200.jpg
-share/kde/wallpapers/Blue_Wood/contents/images/1920x1080.jpg
-share/kde/wallpapers/Blue_Wood/contents/images/1920x1200.jpg
-share/kde/wallpapers/Blue_Wood/contents/screenshot.png
-share/kde/wallpapers/Blue_Wood/metadata.desktop
-share/kde/wallpapers/Ethais/contents/images/1280x1024.png
-share/kde/wallpapers/Ethais/contents/images/1280x800.png
-share/kde/wallpapers/Ethais/contents/images/1366x768.png
-share/kde/wallpapers/Ethais/contents/images/1440x900.png
-share/kde/wallpapers/Ethais/contents/images/1600x1200.png
-share/kde/wallpapers/Ethais/contents/images/1920x1080.png
-share/kde/wallpapers/Ethais/contents/images/1920x1200.png
-share/kde/wallpapers/Ethais/contents/screenshot.png
-share/kde/wallpapers/Ethais/metadata.desktop
-share/kde/wallpapers/Evening/contents/images/1280x1024.jpg
-share/kde/wallpapers/Evening/contents/images/1600x1200.jpg
-share/kde/wallpapers/Evening/contents/images/1920x1080.jpg
-share/kde/wallpapers/Evening/contents/images/1920x1200.jpg
-share/kde/wallpapers/Evening/contents/screnshot.jpg
-share/kde/wallpapers/Evening/metadata.desktop
-share/kde/wallpapers/Fields_of_Peace/contents/images/1280x1024.JPG
-share/kde/wallpapers/Fields_of_Peace/contents/images/1600x1200.JPG
-share/kde/wallpapers/Fields_of_Peace/contents/images/1920x1200.JPG
-share/kde/wallpapers/Fields_of_Peace/contents/screenshot.png
-share/kde/wallpapers/Fields_of_Peace/metadata.desktop
-share/kde/wallpapers/Finally_Summer_in_Germany/contents/images/1280x1024.jpg
-share/kde/wallpapers/Finally_Summer_in_Germany/contents/images/1600x1200.jpg
-share/kde/wallpapers/Finally_Summer_in_Germany/contents/images/1920x1200.jpg
-share/kde/wallpapers/Finally_Summer_in_Germany/contents/screenshot.png
-share/kde/wallpapers/Finally_Summer_in_Germany/metadata.desktop
-share/kde/wallpapers/Fresh_Morning/contents/images/1280x1024.jpg
-share/kde/wallpapers/Fresh_Morning/contents/images/1600x1200.jpg
-share/kde/wallpapers/Fresh_Morning/contents/images/1920x1200.jpg
-share/kde/wallpapers/Fresh_Morning/contents/screenshot.png
-share/kde/wallpapers/Fresh_Morning/metadata.desktop
-share/kde/wallpapers/Grass/contents/images/1280x1024.jpg
-share/kde/wallpapers/Grass/contents/images/1600x1200.jpg
-share/kde/wallpapers/Grass/contents/images/1920x1080.jpg
-share/kde/wallpapers/Grass/contents/images/1920x1200.jpg
-share/kde/wallpapers/Grass/contents/screenshot.png
-share/kde/wallpapers/Grass/metadata.desktop
-share/kde/wallpapers/Hanami/contents/images/1280x1024.jpg
-share/kde/wallpapers/Hanami/contents/images/1600x1200.jpg
-share/kde/wallpapers/Hanami/contents/images/1920x1080.jpg
-share/kde/wallpapers/Hanami/contents/images/1920x1200.jpg
-share/kde/wallpapers/Hanami/contents/screenshot.png
-share/kde/wallpapers/Hanami/metadata.desktop
-share/kde/wallpapers/Media_Life/contents/images/1280x1024.jpg
-share/kde/wallpapers/Media_Life/contents/images/1280x800.jpg
-share/kde/wallpapers/Media_Life/contents/images/1440x900.jpg
-share/kde/wallpapers/Media_Life/contents/images/1480x925.jpg
-share/kde/wallpapers/Media_Life/contents/images/1600x1200.jpg
-share/kde/wallpapers/Media_Life/contents/images/1680x1050.jpg
-share/kde/wallpapers/Media_Life/contents/images/1920x1200.jpg
-share/kde/wallpapers/Media_Life/contents/screenshot.png
-share/kde/wallpapers/Media_Life/metadata.desktop
-share/kde/wallpapers/Plasmalicious/contents/images/1280x1024.jpg
-share/kde/wallpapers/Plasmalicious/contents/images/1600x1200.jpg
-share/kde/wallpapers/Plasmalicious/contents/images/1920x1200.jpg
-share/kde/wallpapers/Plasmalicious/contents/screenshot.png
-share/kde/wallpapers/Plasmalicious/metadata.desktop
-share/kde/wallpapers/Quadros/contents/images/1024x768.jpg
-share/kde/wallpapers/Quadros/contents/images/1280x1024.jpg
-share/kde/wallpapers/Quadros/contents/images/1280x800.jpg
-share/kde/wallpapers/Quadros/contents/images/1440x900.jpg
-share/kde/wallpapers/Quadros/contents/images/1600x1200.jpg
-share/kde/wallpapers/Quadros/contents/images/1920x1080.jpg
-share/kde/wallpapers/Quadros/contents/images/1920x1200.jpg
-share/kde/wallpapers/Quadros/contents/images/800x600.jpg
-share/kde/wallpapers/Quadros/contents/screenshot.png
-share/kde/wallpapers/Quadros/metadata.desktop
-share/kde/wallpapers/Red_Leaf/contents/images/1280x1024.jpg
-share/kde/wallpapers/Red_Leaf/contents/images/1600x1200.jpg
-share/kde/wallpapers/Red_Leaf/contents/images/1920x1200.jpg
-share/kde/wallpapers/Red_Leaf/contents/screenshot.png
-share/kde/wallpapers/Red_Leaf/metadata.desktop
+share/kde/config/xcursor.knsrc
share/kde/wallpapers/stripes.png
share/kde/wallpapers/stripes.png.desktop
share/kde4/services/ScreenSavers/kblank.desktop
@@ -1978,6 +1598,7 @@ share/kde4/services/autostart.desktop
share/kde4/services/bell.desktop
share/kde4/services/clock.desktop
share/kde4/services/colors.desktop
+share/kde4/services/cursortheme.desktop
share/kde4/services/desktop.desktop
share/kde4/services/desktoppath.desktop
share/kde4/services/desktoptheme.desktop
@@ -1992,6 +1613,7 @@ share/kde4/services/fontthumbnail.desktop
share/kde4/services/graphicalinfocategory.desktop
share/kde4/services/interrupts.desktop
share/kde4/services/ion-bbcukmet.desktop
+share/kde4/services/ion-debianweather.desktop
share/kde4/services/ion-envcan.desktop
share/kde4/services/ion-noaa.desktop
share/kde4/services/ion-wettercom.desktop
@@ -2001,7 +1623,6 @@ share/kde4/services/kcm_infosummary.desktop
share/kde4/services/kcm_keyboard.desktop
share/kde4/services/kcm_memory.desktop
share/kde4/services/kcm_pci.desktop
-share/kde4/services/kcm_pkk_authorization.desktop
share/kde4/services/kcm_solid.desktop
share/kde4/services/kcmaccess.desktop
share/kde4/services/kcmlaunch.desktop
@@ -2011,6 +1632,7 @@ 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/powerdevil.desktop
share/kde4/services/kded/randrmonitor.desktop
share/kde4/services/kded/statusnotifierwatcher.desktop
@@ -2029,6 +1651,8 @@ share/kde4/services/kwin/cube.desktop
share/kde4/services/kwin/cube_config.desktop
share/kde4/services/kwin/cubeslide.desktop
share/kde4/services/kwin/cubeslide_config.desktop
+share/kde4/services/kwin/dashboard.desktop
+share/kde4/services/kwin/dashboard_config.desktop
share/kde4/services/kwin/desktopgrid.desktop
share/kde4/services/kwin/desktopgrid_config.desktop
share/kde4/services/kwin/dialogparent.desktop
@@ -2047,6 +1671,7 @@ share/kde4/services/kwin/highlightwindow.desktop
share/kde4/services/kwin/invert.desktop
share/kde4/services/kwin/invert_config.desktop
share/kde4/services/kwin/login.desktop
+share/kde4/services/kwin/login_config.desktop
share/kde4/services/kwin/logout.desktop
share/kde4/services/kwin/lookingglass.desktop
share/kde4/services/kwin/lookingglass_config.desktop
@@ -2057,14 +1682,13 @@ share/kde4/services/kwin/magnifier_config.desktop
share/kde4/services/kwin/minimizeanimation.desktop
share/kde4/services/kwin/mousemark.desktop
share/kde4/services/kwin/mousemark_config.desktop
+share/kde4/services/kwin/outline.desktop
share/kde4/services/kwin/presentwindows.desktop
share/kde4/services/kwin/presentwindows_config.desktop
share/kde4/services/kwin/resize.desktop
+share/kde4/services/kwin/resize_config.desktop
share/kde4/services/kwin/scalein.desktop
-share/kde4/services/kwin/shadow.desktop
-share/kde4/services/kwin/shadow_config.desktop
-share/kde4/services/kwin/sharpen.desktop
-share/kde4/services/kwin/sharpen_config.desktop
+share/kde4/services/kwin/screenshot.desktop
share/kde4/services/kwin/sheet.desktop
share/kde4/services/kwin/showfps.desktop
share/kde4/services/kwin/showfps_config.desktop
@@ -2073,8 +1697,7 @@ share/kde4/services/kwin/slide.desktop
share/kde4/services/kwin/slideback.desktop
share/kde4/services/kwin/slidingpopups.desktop
share/kde4/services/kwin/snaphelper.desktop
-share/kde4/services/kwin/snow.desktop
-share/kde4/services/kwin/snow_config.desktop
+share/kde4/services/kwin/startupfeedback.desktop
share/kde4/services/kwin/taskbarthumbnail.desktop
share/kde4/services/kwin/thumbnailaside.desktop
share/kde4/services/kwin/thumbnailaside_config.desktop
@@ -2082,6 +1705,8 @@ share/kde4/services/kwin/trackmouse.desktop
share/kde4/services/kwin/trackmouse_config.desktop
share/kde4/services/kwin/translucency.desktop
share/kde4/services/kwin/translucency_config.desktop
+share/kde4/services/kwin/windowgeometry.desktop
+share/kde4/services/kwin/windowgeometry_config.desktop
share/kde4/services/kwin/wobblywindows.desktop
share/kde4/services/kwin/wobblywindows_config.desktop
share/kde4/services/kwin/zoom.desktop
@@ -2112,6 +1737,7 @@ 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.showActivityManager.desktop
share/kde4/services/plasma-applet-panelspacer-internal.desktop
share/kde4/services/plasma-applet-quicklaunch.desktop
share/kde4/services/plasma-applet-searchbox.desktop
@@ -2131,7 +1757,6 @@ 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
-share/kde4/services/plasma-containment-newspaper.desktop
share/kde4/services/plasma-containment-panel.desktop
share/kde4/services/plasma-containment-sal.desktop
share/kde4/services/plasma-containment-saverdesktop.desktop
@@ -2160,22 +1785,40 @@ share/kde4/services/plasma-dataengine-nowplaying.desktop
share/kde4/services/plasma-dataengine-places.desktop
share/kde4/services/plasma-dataengine-powermanagement.desktop
share/kde4/services/plasma-dataengine-rss.desktop
+share/kde4/services/plasma-dataengine-share-addon-imgsusepasteorg.desktop
+share/kde4/services/plasma-dataengine-share-addon-imgur.desktop
+share/kde4/services/plasma-dataengine-share-addon-kde.desktop
+share/kde4/services/plasma-dataengine-share-addon-pastebincom.desktop
+share/kde4/services/plasma-dataengine-share-addon-pasteopensuseorg.desktop
+share/kde4/services/plasma-dataengine-share-addon-pasteubuntucom.desktop
+share/kde4/services/plasma-dataengine-share-addon-privatepastecom.desktop
+share/kde4/services/plasma-dataengine-share-addon-simplestimagehosting.desktop
+share/kde4/services/plasma-dataengine-share-addon-wklej.desktop
+share/kde4/services/plasma-dataengine-share-addon-wstaw.desktop
+share/kde4/services/plasma-dataengine-share.desktop
share/kde4/services/plasma-dataengine-soliddevice.desktop
share/kde4/services/plasma-dataengine-systemmonitor.desktop
share/kde4/services/plasma-dataengine-tasks.desktop
share/kde4/services/plasma-dataengine-time.desktop
share/kde4/services/plasma-dataengine-weather.desktop
+share/kde4/services/plasma-engine-activities.desktop
share/kde4/services/plasma-engine-akonadi.desktop
share/kde4/services/plasma-engine-metadata.desktop
share/kde4/services/plasma-engine-searchlaunch.desktop
share/kde4/services/plasma-geolocation-ip.desktop
+share/kde4/services/plasma-layout-org.kde.plasma-desktop.SaL.desktop
share/kde4/services/plasma-layout-org.kde.plasma-desktop.defaultPanel.desktop
+share/kde4/services/plasma-layout-org.kde.plasma-desktop.desktopIcons.desktop
+share/kde4/services/plasma-layout-org.kde.plasma-desktop.findWidgets.desktop
+share/kde4/services/plasma-layout-org.kde.plasma-desktop.photoActivity.desktop
share/kde4/services/plasma-layout-org.kde.plasma-netbook.defaultPage.desktop
share/kde4/services/plasma-layout-org.kde.plasma-netbook.defaultPanel.desktop
share/kde4/services/plasma-layout-org.kde.plasma-netbook.defaultSal.desktop
share/kde4/services/plasma-packagestructure-dashboard.desktop
+share/kde4/services/plasma-packagestructure-share.desktop
share/kde4/services/plasma-packagestructure-web.desktop
share/kde4/services/plasma-pager-default.desktop
+share/kde4/services/plasma-runner-activityrunner.desktop
share/kde4/services/plasma-runner-bookmarks.desktop
share/kde4/services/plasma-runner-calculator.desktop
share/kde4/services/plasma-runner-kill.desktop
@@ -2212,11 +1855,22 @@ share/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
share/kde4/services/plasma-scriptengine-runner-python.desktop
share/kde4/services/plasma-scriptengine-wallpaper-python.desktop
share/kde4/services/plasma-tasks-default.desktop
+share/kde4/services/plasma-toolbox-desktoptoolbox.desktop
+share/kde4/services/plasma-toolbox-nettoolbox.desktop
+share/kde4/services/plasma-toolbox-paneltoolbox.desktop
share/kde4/services/plasma-wallpaper-color.desktop
share/kde4/services/plasma-wallpaper-image.desktop
share/kde4/services/plasma_applet_keyboard.desktop
share/kde4/services/plasma_engine_statusnotifieritem.desktop
-share/kde4/services/powerdevilconfig.desktop
+share/kde4/services/powerdevilactivitiesconfig.desktop
+share/kde4/services/powerdevilbrightnesscontrolaction.desktop
+share/kde4/services/powerdevildimdisplayaction.desktop
+share/kde4/services/powerdevildpmsaction.desktop
+share/kde4/services/powerdevilglobalconfig.desktop
+share/kde4/services/powerdevilhandlebuttoneventsaction.desktop
+share/kde4/services/powerdevilprofilesconfig.desktop
+share/kde4/services/powerdevilrunscriptaction.desktop
+share/kde4/services/powerdevilsuspendsessionaction.desktop
share/kde4/services/randr.desktop
share/kde4/services/recentdocuments.desktop
share/kde4/services/screensaver.desktop
@@ -2240,6 +1894,7 @@ share/kde4/services/settings-network-and-connectivity.desktop
share/kde4/services/settings-network-settings.desktop
share/kde4/services/settings-permissions.desktop
share/kde4/services/settings-personal-information.desktop
+share/kde4/services/settings-power-management.desktop
share/kde4/services/settings-removable-devices.desktop
share/kde4/services/settings-sharing.desktop
share/kde4/services/settings-shortcuts-and-gestures.desktop
@@ -2247,10 +1902,10 @@ share/kde4/services/settings-startup-and-shutdown.desktop
share/kde4/services/settings-system-administration.desktop
share/kde4/services/settings-window-behaviour.desktop
share/kde4/services/settings-workspace-appearance-and-behavior.desktop
+share/kde4/services/settings-workspace-behavior.desktop
share/kde4/services/smbstatus.desktop
share/kde4/services/solid-actions.desktop
share/kde4/services/solidbackends/solid_fakenet.desktop
-share/kde4/services/solidbackends/solid_lirc.desktop
share/kde4/services/solidbackends/solid_wicd.desktop
share/kde4/services/standard_actions.desktop
share/kde4/services/style.desktop
@@ -2262,12 +1917,12 @@ share/kde4/servicetypes/kwineffect.desktop
share/kde4/servicetypes/plasma-geolocationprovider.desktop
share/kde4/servicetypes/plasma-layout-template.desktop
share/kde4/servicetypes/plasma-sal-menu.desktop
+share/kde4/servicetypes/plasma_shareprovider.desktop
+share/kde4/servicetypes/powerdevilaction.desktop
share/kde4/servicetypes/screensaver.desktop
share/kde4/servicetypes/solid-device-type.desktop
-share/kde4/servicetypes/solidbluetoothmanager.desktop
+share/kde4/servicetypes/solidmodemmanager.desktop
share/kde4/servicetypes/solidnetworkmanager.desktop
-share/kde4/servicetypes/solidpowermanager.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/PLIST.Linux b/x11/kde-workspace4/PLIST.Linux
new file mode 100644
index 00000000000..819a9460804
--- /dev/null
+++ b/x11/kde-workspace4/PLIST.Linux
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2012/03/19 19:44:03 markd Exp $
+bin/solid-network
+lib/kde4/kcm_joystick.so
+lib/kde4/solid_modemmanager04.so
+share/kde4/services/joystick.desktop
+share/kde4/services/solidbackends/solid_modemmanager04.desktop
diff --git a/x11/kde-workspace4/buildlink3.mk b/x11/kde-workspace4/buildlink3.mk
new file mode 100644
index 00000000000..583ee7005a9
--- /dev/null
+++ b/x11/kde-workspace4/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2012/03/19 19:44:03 markd Exp $
+
+BUILDLINK_TREE+= kde-workspace
+
+.if !defined(KDE_WORKSPACE_BUILDLINK3_MK)
+KDE_WORKSPACE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.kde-workspace+= kde-workspace4>=4.0.0
+BUILDLINK_ABI_DEPENDS.kde-workspace?= kde-workspace4>=4.5.4nb1
+BUILDLINK_PKGSRCDIR.kde-workspace?= ../../x11/kde-workspace4
+
+.include "../../graphics/qimageblitz/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+.endif # KDE_WORKSPACE_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -kde-workspace
diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo
new file mode 100644
index 00000000000..f452047a5ba
--- /dev/null
+++ b/x11/kde-workspace4/distinfo
@@ -0,0 +1,30 @@
+$NetBSD: distinfo,v 1.1 2012/03/19 19:44:03 markd Exp $
+
+SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
+RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
+Size (Daemon.README) = 2191 bytes
+SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
+RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
+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.0.tar.bz2) = 4c471b159315b084c65196b0c93c34981a9105c5
+RMD160 (kde-workspace-4.8.0.tar.bz2) = 05481e904d1ab00f6fbca54f37cf444ad7c513f3
+Size (kde-workspace-4.8.0.tar.bz2) = 35364809 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-ksysguard_example_CMakeLists.txt) = bd10f03a308442b8febe8864010987fb504b2d21
+SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.c) = 05312793f0c66cacf1bb61c081a8b15e6e7a2619
+SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.h) = e682d488c61ca2540ed4b2112c9bffc45bbe5e8d
+SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.c) = 9d02eaa299847ac32a128696bb6d35f73bae0551
+SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.h) = e58dc4a0a7be7350251f26de34a8949e7508c983
+SHA1 (patch-libs_ksysguard_ksgrd_SensorManager.cpp) = 5fa92fa4876514198813f900f71f3364794b8248
+SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eacb7db79de0ae5eaf80
+SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535
+SHA1 (patch-mkpamserv) = 736fc439a34298f51c9fb09200b9dc8628eabc43
+SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = 75f8a7baf99151232e4f29c71da51be61efc6c4a
+SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e
+SHA1 (patch-startkde.cmake) = 415b06854b02d8dd0e2807d9c02a5cc754b59540
diff --git a/x11/kdebase-workspace4/files/kdm.sh b/x11/kde-workspace4/files/kdm.sh
index ad5ac5ef657..bbccdba933d 100644
--- a/x11/kdebase-workspace4/files/kdm.sh
+++ b/x11/kde-workspace4/files/kdm.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: kdm.sh,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
+# $NetBSD: kdm.sh,v 1.1 2012/03/19 19:44:03 markd Exp $
#
# PROVIDE: kdm
diff --git a/x11/kdebase-workspace4/hacks.mk b/x11/kde-workspace4/hacks.mk
index 024ed934da9..dffd222a5a2 100644
--- a/x11/kdebase-workspace4/hacks.mk
+++ b/x11/kde-workspace4/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2010/10/27 05:39:13 markd Exp $
+# $NetBSD: hacks.mk,v 1.1 2012/03/19 19:44:03 markd Exp $
.if !defined(KDEBASE4_HACKS_MK)
KDEBASE4_HACKS_MK= # defined
@@ -13,3 +13,7 @@ post-wrapper:
.endif
.endif
+
+# fix up buildlinks failure to build link tree correctly
+post-wrapper:
+ ln -s netbsd-g++ ${BUILDLINK_DIR}/qt4/mkspecs/default
diff --git a/x11/kdebase-workspace4/options.mk b/x11/kde-workspace4/options.mk
index 3287286daee..411130622ec 100644
--- a/x11/kdebase-workspace4/options.mk
+++ b/x11/kde-workspace4/options.mk
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.2 2011/03/06 16:04:33 wiz Exp $
+# $NetBSD: options.mk,v 1.1 2012/03/19 19:44:03 markd Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase-workspace
+PKG_OPTIONS_VAR= PKG_OPTIONS.kde-workspace
PKG_SUPPORTED_OPTIONS= inet6
#PKG_SUPPORTED_OPTIONS= inet6 sasl samba debug pam
#PKG_SUGGESTED_OPTIONS= sasl
diff --git a/x11/kdebase-workspace4/patches/patch-ah b/x11/kde-workspace4/patches/patch-kcontrol_keyboard_xkb_rules.cpp
index c79f4753142..9cb448b5bd0 100644
--- a/x11/kdebase-workspace4/patches/patch-ah
+++ b/x11/kde-workspace4/patches/patch-kcontrol_keyboard_xkb_rules.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2011/01/18 10:59:13 markd Exp $
+$NetBSD: patch-kcontrol_keyboard_xkb_rules.cpp,v 1.1 2012/03/19 19:44:03 markd Exp $
Handle location of xkb/rules in NetBSD's intree X11R7
(/usr/X11R7/lib/X11/xkb/rules)
diff --git a/x11/kdebase-workspace4/patches/patch-ad b/x11/kde-workspace4/patches/patch-kdm_config.def
index 4f00cd171d1..f80defa4294 100644
--- a/x11/kdebase-workspace4/patches/patch-ad
+++ b/x11/kde-workspace4/patches/patch-kdm_config.def
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
+$NetBSD: patch-kdm_config.def,v 1.1 2012/03/19 19:44:03 markd Exp $
NetBSD server args
diff --git a/x11/kdebase-workspace4/patches/patch-ac b/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp
index 5b8f9fcf3f0..e840c1ce98e 100644
--- a/x11/kdebase-workspace4/patches/patch-ac
+++ b/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp
@@ -1,7 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2010/10/25 20:55:28 markd Exp $
+$NetBSD: patch-kdm_kcm_main.cpp,v 1.1 2012/03/19 19:44:03 markd Exp $
---- kcontrol/kdm/main.cpp.orig 2010-05-27 17:23:09.000000000 +0000
-+++ kcontrol/kdm/main.cpp
+Allow $PKG_SYSCONFDIR/kdm/kdmrc to override the one under $PREFIX
+
+--- kdm/kcm/main.cpp.orig 2010-05-27 17:23:09.000000000 +0000
++++ kdm/kcm/main.cpp
@@ -281,8 +281,12 @@ KConfig *KDModule::createTempConfig()
pTempConfigFile->open();
QString tempConfigName = pTempConfigFile->fileName();
diff --git a/x11/kdebase-workspace4/patches/patch-ab b/x11/kde-workspace4/patches/patch-kdm_kfrontend_CMakeLists.txt
index 1bdbb59b746..5b7002b8974 100644
--- a/x11/kdebase-workspace4/patches/patch-ab
+++ b/x11/kde-workspace4/patches/patch-kdm_kfrontend_CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2010/10/25 20:55:28 markd Exp $
+$NetBSD: patch-kdm_kfrontend_CMakeLists.txt,v 1.1 2012/03/19 19:44:03 markd Exp $
--- kdm/kfrontend/CMakeLists.txt.orig 2010-03-10 10:42:50.000000000 +0000
+++ kdm/kfrontend/CMakeLists.txt
diff --git a/x11/kdebase-workspace4/patches/patch-af b/x11/kde-workspace4/patches/patch-ksysguard_example_CMakeLists.txt
index e12125e47e8..be2d2c39f36 100644
--- a/x11/kdebase-workspace4/patches/patch-af
+++ b/x11/kde-workspace4/patches/patch-ksysguard_example_CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
+$NetBSD: patch-ksysguard_example_CMakeLists.txt,v 1.1 2012/03/19 19:44:03 markd Exp $
--- ksysguard/example/CMakeLists.txt.orig 2007-12-23 11:54:28.000000000 +1300
+++ ksysguard/example/CMakeLists.txt
@@ -1,2 +1,2 @@
-install( FILES ksysguarddrc DESTINATION ${SYSCONF_INSTALL_DIR} )
-+install( FILES ksysguarddrc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/kdebase-workspace4 )
++install( FILES ksysguarddrc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/kde-workspace4 )
install( FILES ksysguard.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ksysguard )
diff --git a/x11/kdebase-workspace4/patches/patch-bc b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_CPU.c
index a45dcd64aab..d8ad8b18e0b 100644
--- a/x11/kdebase-workspace4/patches/patch-bc
+++ b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_CPU.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
+$NetBSD: patch-ksysguard_ksysguardd_NetBSD_CPU.c,v 1.1 2012/03/19 19:44:03 markd Exp $
--- ksysguard/ksysguardd/NetBSD/CPU.c.orig 2008-01-05 12:55:45.000000000 +1300
+++ ksysguard/ksysguardd/NetBSD/CPU.c
@@ -6,7 +6,7 @@ $NetBSD: patch-bc,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
registerMonitor("cpu/system/nice", "integer", printCPUNice, printCPUNiceInfo, sm);
registerMonitor("cpu/system/sys", "integer", printCPUSys, printCPUSysInfo, sm);
registerMonitor("cpu/system/idle", "integer", printCPUIdle, printCPUIdleInfo, sm);
-+ registerMonitor("cpu/system/interrupt", "integer", printCPUIntr, printCPUIntrInfo, sm);
++ registerMonitor("cpu/system/intr", "integer", printCPUIntr, printCPUIntrInfo, sm);
+ /* linux compat */
+ registerMonitor("cpu/system/wait", "integer", printCPUWait, printCPUWaitInfo, sm);
@@ -23,7 +23,7 @@ $NetBSD: patch-bc,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
removeMonitor("cpu/system/nice");
removeMonitor("cpu/system/sys");
removeMonitor("cpu/system/idle");
-+ removeMonitor("cpu/system/interrupt");
++ removeMonitor("cpu/system/intr");
+ removeMonitor("cpu/system/wait");
/* These were registered as legacy monitors */
diff --git a/x11/kdebase-workspace4/patches/patch-bo b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_CPU.h
index ef376ab033f..a5aae02f27d 100644
--- a/x11/kdebase-workspace4/patches/patch-bo
+++ b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_CPU.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-bo,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
+$NetBSD: patch-ksysguard_ksysguardd_NetBSD_CPU.h,v 1.1 2012/03/19 19:44:03 markd Exp $
--- ksysguard/ksysguardd/NetBSD/CPU.h.save 2006-10-26 15:12:41.000000000 +1300
+++ ksysguard/ksysguardd/NetBSD/CPU.h
diff --git a/x11/kdebase-workspace4/patches/patch-bd b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_Memory.c
index 89b8af0de54..2c4076dd3d0 100644
--- a/x11/kdebase-workspace4/patches/patch-bd
+++ b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_Memory.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
+$NetBSD: patch-ksysguard_ksysguardd_NetBSD_Memory.c,v 1.1 2012/03/19 19:44:03 markd Exp $
--- ksysguard/ksysguardd/NetBSD/Memory.c.orig 2008-01-05 12:55:45.000000000 +1300
+++ ksysguard/ksysguardd/NetBSD/Memory.c
diff --git a/x11/kdebase-workspace4/patches/patch-be b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_Memory.h
index 89d78befe32..81776092078 100644
--- a/x11/kdebase-workspace4/patches/patch-be
+++ b/x11/kde-workspace4/patches/patch-ksysguard_ksysguardd_NetBSD_Memory.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-be,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
+$NetBSD: patch-ksysguard_ksysguardd_NetBSD_Memory.h,v 1.1 2012/03/19 19:44:03 markd Exp $
--- ksysguard/ksysguardd/NetBSD/Memory.h.orig 2008-01-05 12:55:45.000000000 +1300
+++ ksysguard/ksysguardd/NetBSD/Memory.h
diff --git a/x11/kde-workspace4/patches/patch-libs_ksysguard_ksgrd_SensorManager.cpp b/x11/kde-workspace4/patches/patch-libs_ksysguard_ksgrd_SensorManager.cpp
new file mode 100644
index 00000000000..b8830e92f23
--- /dev/null
+++ b/x11/kde-workspace4/patches/patch-libs_ksysguard_ksgrd_SensorManager.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-libs_ksysguard_ksgrd_SensorManager.cpp,v 1.1 2012/03/19 19:44:03 markd Exp $
+
+--- libs/ksysguard/ksgrd/SensorManager.cpp.orig 2011-04-01 10:52:43.000000000 +0000
++++ libs/ksysguard/ksgrd/SensorManager.cpp
+@@ -81,6 +81,7 @@ void SensorManager::retranslate()
+ mDict.insert( QLatin1String( "wired" ), i18n( "Wired Memory" ) );
+ mDict.insert( QLatin1String( "execpages" ), i18n( "Exec Pages" ) );
+ mDict.insert( QLatin1String( "filepages" ), i18n( "File Pages" ) );
++ mDict.insert( QLatin1String( "anonpages" ), i18n( "Anon Pages" ) );
+
+ /* Processes */
+ mDict.insert( QLatin1String( "processes" ), i18n( "Processes" ) );
diff --git a/x11/kdebase-workspace4/patches/patch-ca b/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_CMakeLists.txt
index b7a070ec445..81c74ccf727 100644
--- a/x11/kdebase-workspace4/patches/patch-ca
+++ b/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.3 2010/10/25 20:55:28 markd Exp $
+$NetBSD: patch-libs_ksysguard_processcore_CMakeLists.txt,v 1.1 2012/03/19 19:44:03 markd Exp $
--- libs/ksysguard/processcore/CMakeLists.txt.orig 2010-06-16 12:02:57.000000000 +0000
+++ libs/ksysguard/processcore/CMakeLists.txt
diff --git a/x11/kdebase-workspace4/patches/patch-cb b/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_processes.cpp
index 5e17dfe26cd..8f668ef5176 100644
--- a/x11/kdebase-workspace4/patches/patch-cb
+++ b/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_processes.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-cb,v 1.2 2010/10/25 20:55:28 markd Exp $
+$NetBSD: patch-libs_ksysguard_processcore_processes.cpp,v 1.1 2012/03/19 19:44:04 markd Exp $
--- libs/ksysguard/processcore/processes.cpp.orig 2010-06-16 12:02:57.000000000 +0000
+++ libs/ksysguard/processcore/processes.cpp
diff --git a/x11/kdebase-workspace4/patches/patch-ae b/x11/kde-workspace4/patches/patch-mkpamserv
index da8082b344a..8052395dd6a 100644
--- a/x11/kdebase-workspace4/patches/patch-ae
+++ b/x11/kde-workspace4/patches/patch-mkpamserv
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
+$NetBSD: patch-mkpamserv,v 1.1 2012/03/19 19:44:04 markd Exp $
--- mkpamserv.orig 2007-07-26 22:37:17.000000000 +1200
+++ mkpamserv
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
new file mode 100644
index 00000000000..4d7b265dbfa
--- /dev/null
+++ b/x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp
@@ -0,0 +1,53 @@
+$NetBSD: patch-plasma_generic_applets_digital-clock_clock.cpp,v 1.1 2012/03/19 19:44:04 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()
+
+ void Clock::expandFontToMax(QFont &font, const QString &text)
+ {
+- bool first = true;
+ const QRect rect = contentsRect().toRect();
++ int tryMax = 10;
++ int trys = 0;
++ int pointSize = font.pointSize();
++ int width, height;
+
+ // Starting with the given font, increase its size until it'll fill the rect
++ // Try logic protects against an infinite loop
++ // when larger point sizes are missing
+ do {
+- if (first) {
+- first = false;
+- } else {
+- font.setPointSize(font.pointSize() + 1);
+- }
+-
++ 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()) {
+- break;
++ if (fr.width() > width || fr.height() > height) {
++ width = fr.width();
++ height = fr.height();
++ if (width > rect.width() || height > rect.height()) {
++ break;
++ }
++ // Real point size has changed and is valid
++ pointSize = font.pointSize();
++ trys = 0;
+ }
+- } while (true);
++ else {
++ // Real point size did not change
++ trys++;
++ }
++ } while (trys < tryMax);
++
++ font.setPointSize(pointSize);
+ }
+
+ void Clock::prepareFont(QFont &font, QRect &rect, const QString &text, bool singleline)
diff --git a/x11/kdebase-workspace4/patches/patch-plasma_generic_dataengines_rss_CMakeLists.txt b/x11/kde-workspace4/patches/patch-plasma_generic_dataengines_rss_CMakeLists.txt
index 00c18653e1d..3dfa994b32e 100644
--- a/x11/kdebase-workspace4/patches/patch-plasma_generic_dataengines_rss_CMakeLists.txt
+++ b/x11/kde-workspace4/patches/patch-plasma_generic_dataengines_rss_CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-plasma_generic_dataengines_rss_CMakeLists.txt,v 1.1 2012/01/17 00:44:55 sbd Exp $
+$NetBSD: patch-plasma_generic_dataengines_rss_CMakeLists.txt,v 1.1 2012/03/19 19:44:04 markd Exp $
--- plasma/generic/dataengines/rss/CMakeLists.txt.orig 2009-09-16 11:40:54.000000000 +0000
+++ plasma/generic/dataengines/rss/CMakeLists.txt
diff --git a/x11/kdebase-workspace4/patches/patch-ag b/x11/kde-workspace4/patches/patch-startkde.cmake
index 4ba1f293abd..f5aba28f43f 100644
--- a/x11/kdebase-workspace4/patches/patch-ag
+++ b/x11/kde-workspace4/patches/patch-startkde.cmake
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2011/01/23 07:55:16 markd Exp $
+$NetBSD: patch-startkde.cmake,v 1.1 2012/03/19 19:44:04 markd Exp $
--- startkde.cmake.orig 2007-11-29 02:29:24.000000000 +1300
+++ startkde.cmake
diff --git a/x11/kdebase-runtime4/buildlink3.mk b/x11/kdebase-runtime4/buildlink3.mk
deleted file mode 100644
index 35194c8761d..00000000000
--- a/x11/kdebase-runtime4/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.13 2012/03/03 00:12:33 wiz Exp $
-
-BUILDLINK_TREE+= kdebase-runtime
-
-.if !defined(KDEBASE_RUNTIME_BUILDLINK3_MK)
-KDEBASE_RUNTIME_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.kdebase-runtime+= kdebase-runtime4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdebase-runtime?= kdebase-runtime4>=4.5.5nb7
-BUILDLINK_PKGSRCDIR.kdebase-runtime?= ../../x11/kdebase-runtime4
-
-.include "../../x11/kdelibs4/buildlink3.mk"
-.endif # KDEBASE_RUNTIME_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -kdebase-runtime
diff --git a/x11/kdebase-runtime4/distinfo b/x11/kdebase-runtime4/distinfo
deleted file mode 100644
index d7f031b10b8..00000000000
--- a/x11/kdebase-runtime4/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.16 2011/01/23 07:55:16 markd Exp $
-
-SHA1 (kdebase-runtime-4.5.5.tar.bz2) = 3827a38727e077a2aef6d63f38e68ec72bd01a84
-RMD160 (kdebase-runtime-4.5.5.tar.bz2) = dae7b41b4cd7e5c13357b283fe2bf97863e306db
-Size (kdebase-runtime-4.5.5.tar.bz2) = 5766109 bytes
-SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
-SHA1 (patch-ac) = 6bb21775f48d7a7155712524162a2de736391f40
-SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
-SHA1 (patch-ae) = b2728696f413b146831db62e422adcf73b132126
-SHA1 (patch-af) = 1a8f15ac1c8dadd59fe00ca7ca304ba41521f896
-SHA1 (patch-ag) = 5ca9064552379792c32577875d07562d3f736ab7
-SHA1 (patch-ah) = edda8d4ff8d1dc4a1aef8aafb2dc9cc7c9b11502
-SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a
-SHA1 (patch-ak) = 5fd43f0518e7f77a1d126248ea81e83c578e1b29
-SHA1 (patch-kdesud) = d26cc003542eb1a2922eeff313037746bd907dea
diff --git a/x11/kdebase-runtime4/patches/patch-ah b/x11/kdebase-runtime4/patches/patch-ah
deleted file mode 100644
index b1d4a53aed9..00000000000
--- a/x11/kdebase-runtime4/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
-
---- khelpcenter/docmetainfo.cpp.orig 2008-11-13 05:37:12.000000000 +1300
-+++ khelpcenter/docmetainfo.cpp
-@@ -140,7 +140,7 @@ void DocMetaInfo::scanMetaInfo( bool for
-
- if ( metaInfos.isEmpty() ) {
- KStandardDirs* kstd = KGlobal::dirs();
-- //kstd->addResourceType( "data", 0, QLatin1String("share/apps/khelpcenter") );
-+ //kstd->addResourceType( "data", 0, QLatin1String("share/kde/apps/khelpcenter") );
- metaInfos = kstd->findDirs( "appdata", "plugins" );
- }
- for( it = metaInfos.constBegin(); it != metaInfos.constEnd(); ++it) {
diff --git a/x11/kdebase-runtime4/patches/patch-kdesud b/x11/kdebase-runtime4/patches/patch-kdesud
deleted file mode 100644
index 3b36405a570..00000000000
--- a/x11/kdebase-runtime4/patches/patch-kdesud
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-kdesud,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
-
-g++ 4.1.2 says:
-kdesud.cpp:210: error: cast from 'char*' to 'socklen_t' loses precision
-
---- kdesu/kdesud/kdesud.cpp.orig 2007-10-26 01:22:09.000000000 +1300
-+++ kdesu/kdesud/kdesud.cpp
-@@ -79,8 +79,8 @@
- #endif
-
- #ifndef SUN_LEN
--#define SUN_LEN(ptr) ((kde_socklen_t) (((struct sockaddr_un *) 0)->sun_path) \
-- + strlen ((ptr)->sun_path))
-+#define SUN_LEN(ptr) ((kde_socklen_t) \
-+ (offsetof(struct sockaddr_un, sun_path) + strlen ((ptr)->sun_path)))
- #endif
-
- #define ERR strerror(errno)
diff --git a/x11/kdebase-workspace4/PLIST.Linux b/x11/kdebase-workspace4/PLIST.Linux
deleted file mode 100644
index 96fcfbc960a..00000000000
--- a/x11/kdebase-workspace4/PLIST.Linux
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2012/01/17 00:57:55 sbd Exp $
-bin/solid-bluetooth
-bin/solid-network
-bin/solid-powermanagement
-lib/kde4/kcm_joystick.so
-lib/kde4/kded_networkstatus.so
-lib/kde4/solid_hal_power.so
-share/kde4/services/joystick.desktop
-share/kde4/services/kded/networkstatus.desktop
-share/kde4/services/solidbackends/solid_hal_power.desktop
diff --git a/x11/kdebase-workspace4/buildlink3.mk b/x11/kdebase-workspace4/buildlink3.mk
deleted file mode 100644
index 4912f755f23..00000000000
--- a/x11/kdebase-workspace4/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.13 2012/03/03 00:12:27 wiz Exp $
-
-BUILDLINK_TREE+= kdebase-workspace
-
-.if !defined(KDEBASE_WORKSPACE_BUILDLINK3_MK)
-KDEBASE_WORKSPACE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.kdebase-workspace+= kdebase-workspace4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdebase-workspace?= kdebase-workspace4>=4.5.5nb10
-BUILDLINK_PKGSRCDIR.kdebase-workspace?= ../../x11/kdebase-workspace4
-
-.include "../../graphics/qimageblitz/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.endif # KDEBASE_WORKSPACE_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -kdebase-workspace
diff --git a/x11/kdebase-workspace4/distinfo b/x11/kdebase-workspace4/distinfo
deleted file mode 100644
index f28f61b27b9..00000000000
--- a/x11/kdebase-workspace4/distinfo
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: distinfo,v 1.19 2012/01/17 00:44:55 sbd Exp $
-
-SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
-RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
-Size (Daemon.README) = 2191 bytes
-SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
-RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
-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 (kdebase-workspace-4.5.5.tar.bz2) = 38457b606bfc0b39842fb451566ddf49d145da82
-RMD160 (kdebase-workspace-4.5.5.tar.bz2) = 351f05ae6a1b67b35de7460e1e4353ba3d16720e
-Size (kdebase-workspace-4.5.5.tar.bz2) = 65688854 bytes
-SHA1 (patch-aa) = 6447886c745193338fb7dbea117b0ce1976a964b
-SHA1 (patch-ab) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
-SHA1 (patch-ac) = 8b77575ca1998e2cd297d98721b59ff104193959
-SHA1 (patch-ad) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
-SHA1 (patch-ae) = 736fc439a34298f51c9fb09200b9dc8628eabc43
-SHA1 (patch-af) = 00f4fd7dff0e44af433e52d732129cee2e38e84e
-SHA1 (patch-ag) = 415b06854b02d8dd0e2807d9c02a5cc754b59540
-SHA1 (patch-ah) = e4569e0671c55e990cbc0913e5abaead046a8e71
-SHA1 (patch-bb) = 3652162d6419963fdfcd952af116a0e944ad1618
-SHA1 (patch-bc) = c4fabab37cc4cb70b974a9455c2d640b3bd63fd7
-SHA1 (patch-bd) = 9d02eaa299847ac32a128696bb6d35f73bae0551
-SHA1 (patch-be) = e58dc4a0a7be7350251f26de34a8949e7508c983
-SHA1 (patch-bo) = e682d488c61ca2540ed4b2112c9bffc45bbe5e8d
-SHA1 (patch-ca) = 61b886388aa5d0831581eacb7db79de0ae5eaf80
-SHA1 (patch-cb) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535
-SHA1 (patch-cc) = f0c92eb5edc2690008d028652820cad77bf50b07
-SHA1 (patch-cd) = c9e7b32b39b8191f5f54a799bdfa7009136429f9
-SHA1 (patch-ce) = b02c04dae0005bec33a13ecf09254d35a0e4cd0b
-SHA1 (patch-kcheckpass_checkpass_pam.c) = 7c897fe7fa078a7027a08de5de5ad4c17369f0df
-SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e
diff --git a/x11/kdebase-workspace4/patches/patch-aa b/x11/kdebase-workspace4/patches/patch-aa
deleted file mode 100644
index 230d3a0bbf8..00000000000
--- a/x11/kdebase-workspace4/patches/patch-aa
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2011/01/19 16:41:04 wiz Exp $
-
-Fix build with png-1.5.
-
---- ksplash/ksplashx/qpngio.cpp.orig 2009-08-28 16:01:29.000000000 +0000
-+++ ksplash/ksplashx/qpngio.cpp
-@@ -112,12 +112,19 @@ void setup_qt( QImage& image, png_struct
- png_uint_32 height;
- int bit_depth;
- int color_type;
-+ png_bytep trans_alpha;
-+ int num_trans;
-+ png_color_16p trans_color;
-+ png_colorp palette;
-+ int num_palette;
- png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- 0, 0, 0);
-+ png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
-+ png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
-
- if ( color_type == PNG_COLOR_TYPE_GRAY ) {
- // Black & White or 8-bit grayscale
-- if ( bit_depth == 1 && info_ptr->channels == 1 ) {
-+ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
- png_set_invert_mono( png_ptr );
- png_read_update_info( png_ptr, info_ptr );
- if (!image.create( width, height, 1, 2, QImage::BigEndian ))
-@@ -154,7 +161,7 @@ void setup_qt( QImage& image, png_struct
- #if PNG_LIBPNG_VER < 10400
- const int g = info_ptr->trans_values.gray;
- #else
-- const int g = info_ptr->trans_color.gray;
-+ const int g = trans_color->gray;
- #endif
- if (g < ncols) {
- image.setAlphaBuffer(true);
-@@ -164,7 +171,7 @@ void setup_qt( QImage& image, png_struct
- }
- } else if ( color_type == PNG_COLOR_TYPE_PALETTE
- && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
-- && info_ptr->num_palette <= 256 )
-+ && num_palette <= 256 )
- {
- // 1-bit and 8-bit color
- if ( bit_depth != 1 )
-@@ -172,32 +179,32 @@ void setup_qt( QImage& image, png_struct
- png_read_update_info( png_ptr, info_ptr );
- png_get_IHDR(png_ptr, info_ptr,
- &width, &height, &bit_depth, &color_type, 0, 0, 0);
-- if (!image.create(width, height, bit_depth, info_ptr->num_palette,
-+ if (!image.create(width, height, bit_depth, num_palette,
- QImage::BigEndian))
- return;
- int i = 0;
- if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
- image.setAlphaBuffer( true );
-- while ( i < info_ptr->num_trans ) {
-+ while ( i < num_trans ) {
- image.setColor(i, qRgba(
-- info_ptr->palette[i].red,
-- info_ptr->palette[i].green,
-- info_ptr->palette[i].blue,
-+ palette[i].red,
-+ palette[i].green,
-+ palette[i].blue,
- #if PNG_LIBPNG_VER < 10400
- info_ptr->trans[i]
- #else
-- info_ptr->trans_alpha[i]
-+ trans_alpha[i]
- #endif
- )
- );
- i++;
- }
- }
-- while ( i < info_ptr->num_palette ) {
-+ while ( i < num_palette ) {
- image.setColor(i, qRgba(
-- info_ptr->palette[i].red,
-- info_ptr->palette[i].green,
-- info_ptr->palette[i].blue,
-+ palette[i].red,
-+ palette[i].green,
-+ palette[i].blue,
- 0xff
- )
- );
-@@ -280,7 +287,7 @@ QImage splash_read_png_image(FILE* f)
- return QImage();
- }
-
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- return QImage();
- }
diff --git a/x11/kdebase-workspace4/patches/patch-bb b/x11/kdebase-workspace4/patches/patch-bb
deleted file mode 100644
index 8dea4a69dae..00000000000
--- a/x11/kdebase-workspace4/patches/patch-bb
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $
-
---- ksysguard/gui/ksgrd/SensorManager.cc.orig 2009-01-02 05:25:51.000000000 +1300
-+++ ksysguard/gui/ksgrd/SensorManager.cc
-@@ -62,6 +62,7 @@ void SensorManager::retranslate()
- mDict.insert( QLatin1String( "user" ), i18n( "User Load" ) );
- mDict.insert( QLatin1String( "sys" ), i18nc( "@item sensor description", "System Load" ) );
- mDict.insert( QLatin1String( "wait" ), i18n( "Waiting" ) );
-+ mDict.insert( QLatin1String( "interrupt" ), i18n( "Interrupt Load" ) );
- mDict.insert( QLatin1String( "TotalLoad" ), i18n( "Total Load" ) );
- mDict.insert( QLatin1String( "mem" ), i18n( "Memory" ) );
- mDict.insert( QLatin1String( "physical" ), i18n( "Physical Memory" ) );
-@@ -76,6 +77,7 @@ void SensorManager::retranslate()
- mDict.insert( QLatin1String( "wired" ), i18n( "Wired Memory" ) );
- mDict.insert( QLatin1String( "execpages" ), i18n( "Exec Pages" ) );
- mDict.insert( QLatin1String( "filepages" ), i18n( "File Pages" ) );
-+ mDict.insert( QLatin1String( "anonpages" ), i18n( "Anon Pages" ) );
- mDict.insert( QLatin1String( "pscount" ), i18n( "Process Count" ) );
- mDict.insert( QLatin1String( "ps" ), i18n( "Process Controller" ) );
- mDict.insert( QLatin1String( "disk" ), i18n( "Disk Throughput" ) );
diff --git a/x11/kdebase-workspace4/patches/patch-cc b/x11/kdebase-workspace4/patches/patch-cc
deleted file mode 100644
index f5970f6a621..00000000000
--- a/x11/kdebase-workspace4/patches/patch-cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2011/01/10 11:55:18 markd Exp $
-
---- libs/ksysguard/processcore/processes_local_p.cpp.orig 2009-12-14 10:43:38.000000000 +0000
-+++ libs/ksysguard/processcore/processes_local_p.cpp
-@@ -21,8 +21,10 @@
-
- #if defined __linux__
- #include "processes_linux_p.cpp"
--#elif defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __DragonFly__
-+#elif defined __FreeBSD__ || defined __FreeBSD_kernel__
- #include "processes_freebsd_p.cpp"
-+#elif defined __DragonFly__
-+#include "processes_dragonfly_p.cpp"
- #elif defined __OpenBSD__
- #include "processes_openbsd_p.cpp"
- #elif defined __NetBSD__
diff --git a/x11/kdebase-workspace4/patches/patch-cd b/x11/kdebase-workspace4/patches/patch-cd
deleted file mode 100644
index 81c72136f96..00000000000
--- a/x11/kdebase-workspace4/patches/patch-cd
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2011/01/10 11:55:18 markd Exp $
-
---- libs/ksysguard/processcore/processes_freebsd_p.cpp.orig 2010-02-20 11:31:44.000000000 +0000
-+++ libs/ksysguard/processcore/processes_freebsd_p.cpp
-@@ -29,10 +29,6 @@
- #include <sys/types.h>
- #include <sys/user.h>
- #include <sys/resource.h>
--#if defined(__DragonFly__)
--#include <sys/resourcevar.h>
--#include <err.h>
--#endif
- #include <signal.h>
- #include <unistd.h>
- #include <stdlib.h>
-@@ -77,53 +73,25 @@ void ProcessesLocal::Private::readProcSt
- process->setGid(0);
- process->setTracerpid(0);
-
--
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- process->setEuid(p->ki_uid);
- process->setUid(p->ki_ruid);
- process->setEgid(p->ki_svgid);
- process->setGid(p->ki_rgid);
- process->setName(QString(p->ki_comm ? p->ki_comm : "????"));
--#elif defined(__DragonFly__) && __DragonFly_version >= 190000
-- process->setUid(p->kp_uid);
-- process->setGid(p->kp_pgid);
-- process->setName(QString(p->kp_comm ? p->kp_comm : "????"));
--#else
-- process->setUid(p->kp_eproc.e_ucred.cr_uid);
-- process->setGid(p->kp_eproc.e_pgid);
--#endif
- }
-
- void ProcessesLocal::Private::readProcStat(struct kinfo_proc *p, Process *ps)
- {
- int status;
- struct rusage pru;
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+
- ps->setUserTime(p->ki_rusage.ru_utime.tv_sec * 100 + p->ki_rusage.ru_utime.tv_usec / 10000);
- ps->setSysTime(p->ki_rusage.ru_stime.tv_sec * 100 + p->ki_rusage.ru_stime.tv_usec / 10000);
- ps->setNiceLevel(p->ki_nice);
- ps->setVmSize(p->ki_size / 1024);
- ps->setVmRSS(p->ki_rssize * getpagesize() / 1024);
- status = p->ki_stat;
--#elif defined(__DragonFly__)
--#if __DragonFly_version >= 190000
-- if (!getrusage(p->kp_pid, &pru)) {
-- errx(1, "failed to get rusage info");
-- }
-- ps->setUserTime(pru.ru_utime.tv_usec / 1000); /*p_runtime / 1000*/
-- ps->setNiceLevel(p->kp_nice);
-- ps->setVmSize(p->kp_vm_map_size);
-- ps->setVmRSS(p->kp_vm_rssize * getpagesize());
-- status = p->kp_stat;
--#else
-- ps->setUserTime(p->kp_proc.p_rtime.tv_sec*100+p->kp_proc.p_rtime.tv_usec/100);
-- ps->setNiceLevel(p->kp_proc.p_nice);
-- ps->setVmSize(p->kp_eproc.e_vm.vm_map.size);
-- ps->setVmRSS(p->kp_eproc.e_vm.vm_rssize * getpagesize());
-- status = p->kp_proc.p_stat;
--#endif
- ps->setSysTime(0);
--#endif
-
- // "idle","run","sleep","stop","zombie"
- switch( status ) {
-@@ -185,13 +153,7 @@ long ProcessesLocal::getParentPid(long p
- struct kinfo_proc p;
- if(d->readProc(pid, &p))
- {
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- ppid = p.ki_ppid;
--#elif defined(__DragonFly__) && __DragonFly_version >= 190000
-- ppid = p.kp_ppid;
--#else
-- ppid = p.kp_eproc.e_ppid;
--#endif
- }
- return ppid;
- }
-@@ -230,16 +192,9 @@ QSet<long> ProcessesLocal::getAllPids( )
-
- for (num = 0; num < len / sizeof(struct kinfo_proc); num++)
- {
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- long pid = p[num].ki_pid;
- long long ppid = p[num].ki_ppid;
--#elif defined(__DragonFly__) && __DragonFly_version >= 190000
-- long pid = p[num].kp_pid;
-- long long ppid = p[num].kp_ppid;
--#else
-- long pid = p[num].kp_proc.p_pid;
-- long long ppid = p[num].kp_eproc.e_ppid;
--#endif
-+
- //skip all process with parent id = 0 but init
- if(ppid == 0 && pid != 1)
- continue;
diff --git a/x11/kdebase-workspace4/patches/patch-ce b/x11/kdebase-workspace4/patches/patch-ce
deleted file mode 100644
index 0821f915603..00000000000
--- a/x11/kdebase-workspace4/patches/patch-ce
+++ /dev/null
@@ -1,272 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2011/01/10 11:55:18 markd Exp $
-
---- libs/ksysguard/processcore/processes_dragonfly_p.cpp.orig 2011-01-10 11:40:21.000000000 +0000
-+++ libs/ksysguard/processcore/processes_dragonfly_p.cpp
-@@ -0,0 +1,267 @@
-+/* This file is part of the KDE project
-+ Copyright (C) 2007 Manolo Valdes <nolis71cu@gmail.com>
-+ Copyright (C) 2010 Alex Hornung <ahornung@gmail.com>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public License
-+ along with this library; see the file COPYING.LIB. If not, write to
-+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ Boston, MA 02110-1301, USA.
-+*/
-+
-+#include "processes_local_p.h"
-+#include "process.h"
-+
-+#include <klocale.h>
-+
-+#include <QSet>
-+
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/types.h>
-+#include <sys/user.h>
-+#include <sys/resource.h>
-+#include <sys/resourcevar.h>
-+#include <err.h>
-+#include <signal.h>
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <sched.h>
-+
-+#define PP(pp, field) ((pp)->kp_ ## field)
-+#define LP(pp, field) ((pp)->kp_lwp.kl_ ## field)
-+#define VP(pp, field) ((pp)->kp_vm_ ## field)
-+
-+namespace KSysGuard
-+{
-+
-+ class ProcessesLocal::Private
-+ {
-+ public:
-+ Private() {;}
-+ ~Private() {;}
-+ inline bool readProc(long pid, struct kinfo_proc *p);
-+ inline void readProcStatus(struct kinfo_proc *p, Process *process);
-+ inline void readProcStat(struct kinfo_proc *p, Process *process);
-+ inline void readProcStatm(struct kinfo_proc *p, Process *process);
-+ inline bool readProcCmdline(long pid, Process *process);
-+ };
-+
-+bool ProcessesLocal::Private::readProc(long pid, struct kinfo_proc *p)
-+{
-+ int mib[4];
-+ size_t len;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = pid;
-+
-+ len = sizeof (struct kinfo_proc);
-+ if (sysctl(mib, 4, p, &len, NULL, 0) == -1 || !len)
-+ return false;
-+ return true;
-+}
-+
-+void ProcessesLocal::Private::readProcStatus(struct kinfo_proc *p, Process *process)
-+{
-+ process->setUid(0);
-+ process->setGid(0);
-+ process->setTracerpid(0);
-+
-+ process->setEuid(PP(p, uid));
-+ process->setUid(PP(p, ruid));
-+ process->setEgid(PP(p, svgid));
-+ process->setGid(PP(p, rgid));
-+ process->setName(QString(PP(p, comm)));
-+}
-+
-+void ProcessesLocal::Private::readProcStat(struct kinfo_proc *p, Process *ps)
-+{
-+ ps->setUserTime(LP(p, uticks) / 10000);
-+ ps->setSysTime((LP(p, sticks) + LP(p, iticks)) / 10000);
-+ ps->setNiceLevel(PP(p, nice));
-+ ps->setVmSize(VP(p, map_size) / 1024); /* convert to KiB */
-+ ps->setVmRSS(VP(p, prssize) * getpagesize() / 1024); /* convert to KiB */
-+
-+// "idle","run","sleep","stop","zombie"
-+ switch( LP(p, stat) ) {
-+ case LSRUN:
-+ ps->setStatus(Process::Running);
-+ break;
-+ case LSSLEEP:
-+ ps->setStatus(Process::Sleeping);
-+ break;
-+ case LSSTOP:
-+ ps->setStatus(Process::Stopped);
-+ break;
-+ default:
-+ ps->setStatus(Process::OtherStatus);
-+ break;
-+ }
-+ if (PP(p, stat) == SZOMB)
-+ ps->setStatus(Process::Zombie);
-+}
-+
-+void ProcessesLocal::Private::readProcStatm(struct kinfo_proc *p, Process *process)
-+{
-+ process->setVmURSS(-1);
-+}
-+
-+bool ProcessesLocal::Private::readProcCmdline(long pid, Process *process)
-+{
-+ int mib[4];
-+ size_t buflen = 256;
-+ char buf[256];
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_ARGS;
-+ mib[3] = pid;
-+
-+ if (sysctl(mib, 4, buf, &buflen, NULL, 0) == -1 || (buflen == 0))
-+ return false;
-+ QString command = QString(buf);
-+
-+ //cmdline seperates parameters with the NULL character
-+ command = command.replace('\0', ' ');
-+ process->setCommand(command.trimmed());
-+
-+ return true;
-+}
-+
-+ProcessesLocal::ProcessesLocal() : d(new Private())
-+{
-+
-+}
-+
-+long ProcessesLocal::getParentPid(long pid) {
-+ long long ppid = 0;
-+ struct kinfo_proc p;
-+ if(d->readProc(pid, &p))
-+ ppid = PP(&p, ppid);
-+
-+ return ppid;
-+}
-+
-+bool ProcessesLocal::updateProcessInfo( long pid, Process *process)
-+{
-+ struct kinfo_proc p;
-+ if(!d->readProc(pid, &p)) return false;
-+ d->readProcStat(&p, process);
-+ d->readProcStatus(&p, process);
-+ d->readProcStatm(&p, process);
-+ if(!d->readProcCmdline(pid, process)) return false;
-+
-+ return true;
-+}
-+
-+QSet<long> ProcessesLocal::getAllPids( )
-+{
-+ QSet<long> pids;
-+ int mib[3];
-+ size_t len;
-+ size_t num;
-+ struct kinfo_proc *p;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_ALL;
-+ if (sysctl(mib, 3, NULL, &len, NULL, 0) == -1)
-+ return pids;
-+ if ((p = (kinfo_proc *) malloc(len)) == NULL)
-+ return pids;
-+ if (sysctl(mib, 3, p, &len, NULL, 0) == -1) {
-+ free(p);
-+ return pids;
-+ }
-+
-+ for (num = 0; num < len / sizeof(struct kinfo_proc); num++)
-+ {
-+ long pid = PP((&p[num]), pid);
-+ long long ppid = PP((&p[num]), ppid);
-+
-+ //skip all process with parent id = 0 but init
-+ if(ppid == 0 && pid != 1)
-+ continue;
-+ pids.insert(pid);
-+ }
-+ free(p);
-+ return pids;
-+}
-+
-+bool ProcessesLocal::sendSignal(long pid, int sig) {
-+ if ( kill( (pid_t)pid, sig ) ) {
-+ //Kill failed
-+ return false;
-+ }
-+ return true;
-+}
-+
-+bool ProcessesLocal::setNiceness(long pid, int priority) {
-+ if ( setpriority( PRIO_PROCESS, pid, priority ) ) {
-+ //set niceness failed
-+ return false;
-+ }
-+ return true;
-+}
-+
-+bool ProcessesLocal::setScheduler(long pid, int priorityClass, int priority)
-+{
-+ if(priorityClass == KSysGuard::Process::Other || priorityClass == KSysGuard::Process::Batch)
-+ priority = 0;
-+ if(pid <= 0) return false; // check the parameters
-+ struct sched_param params;
-+ params.sched_priority = priority;
-+ switch(priorityClass) {
-+ case (KSysGuard::Process::Other):
-+ return (sched_setscheduler( pid, SCHED_OTHER, &params) == 0);
-+ case (KSysGuard::Process::RoundRobin):
-+ return (sched_setscheduler( pid, SCHED_RR, &params) == 0);
-+ case (KSysGuard::Process::Fifo):
-+ return (sched_setscheduler( pid, SCHED_FIFO, &params) == 0);
-+#ifdef SCHED_BATCH
-+ case (KSysGuard::Process::Batch):
-+ return (sched_setscheduler( pid, SCHED_BATCH, &params) == 0);
-+#endif
-+ default:
-+ return false;
-+ }
-+}
-+
-+bool ProcessesLocal::setIoNiceness(long pid, int priorityClass, int priority) {
-+ return false; //Not yet supported
-+}
-+
-+bool ProcessesLocal::supportsIoNiceness() {
-+ return false;
-+}
-+
-+long long ProcessesLocal::totalPhysicalMemory() {
-+
-+ size_t Total;
-+ size_t len;
-+
-+ len = sizeof (Total);
-+ if (sysctlbyname("hw.physmem", &Total, &len, NULL, 0) == -1)
-+ return 0;
-+
-+ Total *= getpagesize() / 1024;
-+ return Total;
-+}
-+
-+ProcessesLocal::~ProcessesLocal()
-+{
-+ delete d;
-+}
-+
-+}
diff --git a/x11/kdebase-workspace4/patches/patch-kcheckpass_checkpass_pam.c b/x11/kdebase-workspace4/patches/patch-kcheckpass_checkpass_pam.c
deleted file mode 100644
index 8615f1a6524..00000000000
--- a/x11/kdebase-workspace4/patches/patch-kcheckpass_checkpass_pam.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-kcheckpass_checkpass_pam.c,v 1.1 2011/11/19 21:12:05 markd Exp $
-
-Don't all pam_service to be a path.
-
---- kcheckpass/checkpass_pam.c.orig 2009-10-06 21:37:13.000000000 +0000
-+++ kcheckpass/checkpass_pam.c
-@@ -147,6 +147,8 @@ AuthReturn Authenticate(const char *call
- /* PAM_data.classic = 1; */
- pam_service = caller;
- }
-+ if (strchr(pam_service, '/')) /* service shouldn't be a path */
-+ return AuthError;
- pam_error = pam_start(pam_service, user, &PAM_conversation, &pamh);
- if (pam_error != PAM_SUCCESS)
- return AuthError;
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
deleted file mode 100644
index 001578b5a11..00000000000
--- a/x11/kdebase4/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2012/03/03 00:14:18 wiz Exp $
-
-DISTNAME= kdebase-${_KDE_VERSION}
-PKGREVISION= 7
-CATEGORIES= x11
-COMMENT= Base modules for the KDE 4 integrated X11 desktop
-
-.include "../../meta-pkgs/kde4/Makefile.kde4"
-
-# BUILD_MAKE_FLAGS+= VERBOSE=1
-
-REPLACE_RUBY+= apps/dolphin/src/khns/servicemenudeinstallation
-REPLACE_RUBY+= apps/dolphin/src/khns/servicemenuinstallation
-
-.include "../../lang/ruby/replace.mk"
-
-.include "../../meta-pkgs/kde4/kde4.mk"
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/qimageblitz/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kdebase-runtime4/buildlink3.mk"
-.include "../../x11/kdebase-workspace4/buildlink3.mk"
-.include "../../lang/ruby/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase4/buildlink3.mk b/x11/kdebase4/buildlink3.mk
deleted file mode 100644
index 6eff6460599..00000000000
--- a/x11/kdebase4/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/02 19:43:39 markd Exp $
-
-BUILDLINK_TREE+= kdebase4
-
-.if !defined(KDEBASE4_BUILDLINK3_MK)
-KDEBASE4_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.kdebase4+= kdebase4>=4.1.85
-BUILDLINK_PKGSRCDIR.kdebase4?= ../../x11/kdebase4
-.endif # KDEBASE4_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -kdebase4
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
deleted file mode 100644
index fc619606237..00000000000
--- a/x11/kdebase4/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.14 2011/01/23 07:55:16 markd Exp $
-
-SHA1 (kdebase-4.5.5.tar.bz2) = fa5a89dad13743c03831e930af978b593ad6ec6c
-RMD160 (kdebase-4.5.5.tar.bz2) = 98579c8266b79d1f9909766dba0772760a55deb8
-Size (kdebase-4.5.5.tar.bz2) = 2643134 bytes
-SHA1 (patch-aa) = 84d234fe0ec585cd1cd92636d80bfa98b898ad2d
diff --git a/x11/kdebase4/patches/patch-aa b/x11/kdebase4/patches/patch-aa
deleted file mode 100644
index aaa7837decc..00000000000
--- a/x11/kdebase4/patches/patch-aa
+++ /dev/null
@@ -1,185 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2010/04/10 02:45:05 markd Exp $
-
---- apps/konsole/src/ProcessInfo.cpp.orig 2010-03-26 17:26:32.000000000 +0000
-+++ apps/konsole/src/ProcessInfo.cpp
-@@ -894,6 +894,171 @@ private:
- }
- } ;
-
-+class NetBSDProcessInfo : public UnixProcessInfo
-+{
-+public:
-+ NetBSDProcessInfo(int pid, bool env) :
-+ UnixProcessInfo(pid,env)
-+ {
-+ }
-+
-+private:
-+ virtual bool readProcInfo(int pid)
-+ {
-+ // indicies of various fields within the process status file which
-+ // contain various information about the process
-+ const int PARENT_PID_FIELD = 2;
-+ const int PROCESS_NAME_FIELD = 0;
-+ const int GROUP_PROCESS_FIELD = 3;
-+ const int UID_PROCESS_FIELD = 11;
-+
-+ QString parentPidString;
-+ QString processNameString;
-+ QString foregroundPidString;
-+ QString uidString;
-+
-+ // read process status file ( /proc/<pid/status )
-+ //
-+ // the expected file format is a list of fields separated by spaces, using
-+ // parenthesies to escape fields such as the process name which may itself contain
-+ // spaces:
-+ //
-+ // FIELD FIELD (FIELD WITH SPACES) FIELD FIELD
-+ //
-+ QFile processInfo( QString("/proc/%1/status").arg(pid) );
-+ if ( processInfo.open(QIODevice::ReadOnly) )
-+ {
-+ QTextStream stream(&processInfo);
-+ QString data = stream.readAll();
-+
-+ int stack = 0;
-+ int field = 0;
-+ int pos = 0;
-+
-+ while (pos < data.count())
-+ {
-+ QChar c = data[pos];
-+
-+ if ( c == '(' )
-+ stack++;
-+ else if ( c == ')' )
-+ stack--;
-+ else if ( stack == 0 && c == ' ' )
-+ field++;
-+ else
-+ {
-+ switch ( field )
-+ {
-+ case PARENT_PID_FIELD:
-+ parentPidString.append(c);
-+ break;
-+ case PROCESS_NAME_FIELD:
-+ processNameString.append(c);
-+ break;
-+ case GROUP_PROCESS_FIELD:
-+ foregroundPidString.append(c);
-+ break;
-+ case UID_PROCESS_FIELD:
-+ uidString.append(c);
-+ break;
-+ }
-+ }
-+
-+ pos++;
-+ }
-+ }
-+ else
-+ {
-+ setFileError( processInfo.error() );
-+ return false;
-+ }
-+
-+ // check that data was read successfully
-+ bool ok = false;
-+
-+ // uid string must be less than 5 chars (uint)
-+ if (uidString.size() > 5)
-+ uidString.clear();
-+
-+ int uid = uidString.toInt(&ok);
-+ if (ok)
-+ setUserId(uid);
-+ readUserName();
-+
-+ int foregroundPid = foregroundPidString.toInt(&ok);
-+ if (ok)
-+ setForegroundPid(foregroundPid);
-+
-+ int parentPid = parentPidString.toInt(&ok);
-+ if (ok)
-+ setParentPid(parentPid);
-+
-+ if (!processNameString.isEmpty())
-+ setName(processNameString);
-+
-+ // update object state
-+ setPid(pid);
-+
-+ return ok;
-+ }
-+
-+ virtual bool readArguments(int pid)
-+ {
-+ // read command-line arguments file found at /proc/<pid>/cmdline
-+ // the expected format is a list of strings delimited by null characters,
-+ // and ending in a double null character pair.
-+
-+ QFile argumentsFile( QString("/proc/%1/cmdline").arg(pid) );
-+ if ( argumentsFile.open(QIODevice::ReadOnly) )
-+ {
-+ QTextStream stream(&argumentsFile);
-+ QString data = stream.readAll();
-+
-+ QStringList argList = data.split( QChar('\0') );
-+
-+ foreach ( const QString &entry , argList )
-+ {
-+ if (!entry.isEmpty())
-+ addArgument(entry);
-+ }
-+ }
-+ else
-+ {
-+ setFileError( argumentsFile.error() );
-+ }
-+
-+ return true;
-+ }
-+
-+ virtual bool readCurrentDir(int pid)
-+ {
-+ QFileInfo info( QString("/proc/%1/cwd").arg(pid) );
-+
-+ const bool readable = info.isReadable();
-+
-+ if ( readable && info.isSymLink() )
-+ {
-+ setCurrentDir( info.symLinkTarget() );
-+ return true;
-+ }
-+ else
-+ {
-+ if ( !readable )
-+ setError( PermissionsError );
-+ else
-+ setError( UnknownError );
-+
-+ return false;
-+ }
-+ }
-+
-+ virtual bool readEnvironment(int pid)
-+ {
-+ // Not supported in NetBSD
-+ return true;
-+ }
-+} ;
-+
- SSHProcessInfo::SSHProcessInfo(const ProcessInfo& process)
- : _process(process)
- {
-@@ -1039,6 +1204,8 @@ ProcessInfo* ProcessInfo::newInstance(in
- return new LinuxProcessInfo(pid,enableEnvironmentRead);
- #elif defined(Q_OS_SOLARIS)
- return new SolarisProcessInfo(pid,enableEnvironmentRead);
-+#elif defined(Q_OS_NETBSD)
-+ return new NetBSDProcessInfo(pid,enableEnvironmentRead);
- #elif defined(Q_OS_MAC)
- return new MacProcessInfo(pid,enableEnvironmentRead);
- #elif defined(Q_OS_FREEBSD)
diff --git a/x11/kdebindings4-python/Makefile b/x11/kdebindings4-python/Makefile
deleted file mode 100644
index d9fe308cc85..00000000000
--- a/x11/kdebindings4-python/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile,v 1.35 2012/03/09 12:34:25 wiz Exp $
-
-PKGNAME= kdebindings4-python-${_KDE_VERSION}
-DISTNAME= kdebindings-${_KDE_VERSION}
-PKGREVISION= 9
-CATEGORIES= misc
-COMMENT= Python bindings for the KDE integrated X11 desktop
-
-.include "../../meta-pkgs/kde4/Makefile.kde4"
-
-# BUILD_MAKE_FLAGS+= VERBOSE=1
-
-CMAKE_ARGS+= -DBUILD_smoke=OFF -DBUILD_ruby=OFF -DBUILD_php=OFF
-CMAKE_ARGS+= -DBUILD_java=OFF -DBUILD_falcon=OFF -DBUILD_csharp=OFF
-CMAKE_ARGS+= -DBUILD_perl=OFF
-CMAKE_ARGS+= -DENABLE_SMOKE=off
-CMAKE_ARGS+= -DENABLE_QYOTO=off
-CMAKE_ARGS+= -DENABLE_QTRUBY=off -DENABLE_KORUNDUM=off
-CMAKE_ARGS+= -DENABLE_KROSSRUBY=off
-CMAKE_ARGS+= -DENABLE_KROSSJAVA=off -DENABLE_KROSSFALCON=off
-CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
-
-PYTHON_VERSIONS_ACCEPTED= 27 26 25
-PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
-REPLACE_PYTHON+= \
- python/pykde4/tools/pykdeuic4/*.py \
- python/pykde4/examples/*.py \
- python/pykde4/examples/*/*.py \
- python/pykde4/docs/html/tutorials/started/*.py
-
-# We need to replace the embedded interpreter
-SUBST_CLASSES+= pykdeuic4
-SUBST_STAGE.pykdeuic4= post-build
-SUBST_FILES.pykdeuic4= python/pykde4/tools/pykdeuic4/pykdeuic4.py
-SUBST_SED.pykdeuic4= 's:/usr/bin/env python$$:${PYTHONBIN}:'
-
-post-extract:
- ${CP} ${FILESDIR}/FindPolkitQt.cmake ${WRKSRC}/cmake/modules
-
-# patched by pkgsrc; remove them, otherwise they get installed
-post-patch:
- rm ${WRKSRC}/python/pykde4/sip/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 "../../security/polkit-qt/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.10
-.include "../../x11/py-sip/buildlink3.mk"
-.include "../../x11/py-qt4/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebindings4-python/buildlink3.mk b/x11/kdebindings4-python/buildlink3.mk
deleted file mode 100644
index 232268f92e9..00000000000
--- a/x11/kdebindings4-python/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/02 19:47:47 markd Exp $
-
-BUILDLINK_TREE+= kdebindings4-python
-
-.if !defined(KDEBINDINGS4_PYTHON_BUILDLINK3_MK)
-KDEBINDINGS4_PYTHON_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.kdebindings4-python+= kdebindings4-python>=4.1.85
-BUILDLINK_PKGSRCDIR.kdebindings4-python?= ../../x11/kdebindings4-python
-
-.endif # KDEBINDINGS4_PYTHON_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -kdebindings4-python
diff --git a/x11/kdebindings4-python/distinfo b/x11/kdebindings4-python/distinfo
deleted file mode 100644
index 7bd4115ecee..00000000000
--- a/x11/kdebindings4-python/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.19 2012/01/02 06:58:25 sbd Exp $
-
-SHA1 (kdebindings-4.5.5.tar.bz2) = 5f754f0b6989df9557c5ccec18b4f96207fceb94
-RMD160 (kdebindings-4.5.5.tar.bz2) = c69f387c8dd5e3205fa8a436cc63cecf9511f38e
-Size (kdebindings-4.5.5.tar.bz2) = 7134992 bytes
-SHA1 (patch-aa) = f01b1d350a8e79e639f46c797baf035684275158
-SHA1 (patch-ab) = cae51d216ad914009b4e9c80a17a172ec5a5eaec
-SHA1 (patch-ac) = 698eaecc5cb2489b16409bc14c4beee5ca93a296
-SHA1 (patch-am) = c2f5907c53185941a5fd2bb58deada46c19e31ae
-SHA1 (patch-python_pykde4_CMakeLists.txt) = 3b3d614bdb8a4db2a0f69e86d5aee35e496b8134
diff --git a/x11/kdebindings4-python/files/FindPolkitQt.cmake b/x11/kdebindings4-python/files/FindPolkitQt.cmake
deleted file mode 100644
index c3f7ca679a7..00000000000
--- a/x11/kdebindings4-python/files/FindPolkitQt.cmake
+++ /dev/null
@@ -1,94 +0,0 @@
-# - Try to find Polkit-qt
-# Once done this will define
-#
-# POLKITQT_FOUND - system has Polkit-qt
-# POLKITQT_INCLUDE_DIR - the Polkit-qt include directory
-# POLKITQT_LIBRARIES - Link these to use all Polkit-qt libs
-# POLKITQT_CORE_LIBRARY
-# POLKITQT_GUI_LIBRARY
-# POLKITQT_DEFINITIONS - Compiler switches required for using Polkit-qt
-
-# Copyright (c) 2008, Adrien Bustany, <madcat@mymadcat.com>
-# Copyright (c) 2009, Daniel Nicoletti, <dantti85-pk@yahoo.com.br>
-# Copyright (c) 2009, Dario Freddi, <drf54321@gmail.com>
-# Copyright (c) 2009, Michal Malek, <michalm@jabster.pl>
-#
-# Redistribution and use is allowed according to the terms of the GPLv2+ license.
-
-if (POLKITQT_INCLUDE_DIR AND POLKITQT_LIB)
- set(POLKITQT_FIND_QUIETLY TRUE)
-endif (POLKITQT_INCLUDE_DIR AND POLKITQT_LIB)
-
-include(FindPkgConfig)
-
-if (NOT POLKITQT_MIN_VERSION)
- set(POLKITQT_MIN_VERSION "0.9.0")
-endif (NOT POLKITQT_MIN_VERSION)
-
-pkg_search_module( POLKITQT polkit-qt )
-
-if (POLKITQT_FOUND)
- if (POLKITQT_VERSION VERSION_LESS POLKITQT_MIN_VERSION)
- message(STATUS "Found Polkit-Qt release < ${POLKITQT_MIN_VERSION}")
- message(STATUS "You need Polkit-Qt version ${POLKITQT_MIN_VERSION} or newer to compile this component")
- set(POLKITQT_FOUND FALSE)
- return()
- else (POLKITQT_VERSION VERSION_LESS POLKITQT_MIN_VERSION)
- message(STATUS "Found Polkit-Qt release >= ${POLKITQT_MIN_VERSION}")
- endif (POLKITQT_VERSION VERSION_LESS POLKITQT_MIN_VERSION)
-else (POLKITQT_FOUND)
- set(POLKITQT_FOUND FALSE)
- message(STATUS "Cannot find Polkit-Qt library!")
- return()
-endif (POLKITQT_FOUND)
-
-
-# find_path( POLKITQT_INCLUDE_DIR PolicyKit/policykit-qt/Polkit-qt )
-find_path( POLKITQT_INCLUDE_DIR
- NAMES PolicyKit/polkit-qt/
- HINTS ${POLKITQT_INCLUDEDIR}
-)
-
-find_library( POLKITQT_CORE_LIBRARY
- NAMES polkit-qt-core
- HINTS ${POLKITQT_LIBDIR}
-)
-find_library( POLKITQT_GUI_LIBRARY
- NAMES polkit-qt-gui
- HINTS ${POLKITQT_LIBDIR}
-)
-
-if (POLKITQT_INCLUDE_DIR AND POLKITQT_CORE_LIBRARY AND POLKITQT_GUI_LIBRARY)
- set(POLKITQT_FOUND TRUE)
-else (POLKITQT_INCLUDE_DIR AND POLKITQT_CORE_LIBRARY AND POLKITQT_GUI_LIBRARY)
- set(POLKITQT_FOUND FALSE)
-endif (POLKITQT_INCLUDE_DIR AND POLKITQT_CORE_LIBRARY AND POLKITQT_GUI_LIBRARY)
-
-set(POLKITQT_LIBRARIES ${POLKITQT_CORE_LIBRARY} ${POLKITQT_GUI_LIBRARY})
-
-set(POLKITQT_INCLUDE_DIR ${POLKITQT_INCLUDE_DIR}/PolicyKit/polkit-qt ${POLKITQT_INCLUDE_DIR}/PolicyKit/)
-
-set(POLICY_FILES_INSTALL_DIR ${POLKITQT_PREFIX}/share/PolicyKit/policy/)
-
-if (POLKITQT_FOUND)
- if (NOT POLKITQT_FIND_QUIETLY)
- message(STATUS "Found Polkit-Qt: ${POLKITQT_LIBRARIES}")
- endif (NOT POLKITQT_FIND_QUIETLY)
-else (POLKITQT_FOUND)
- if (POLKITQT_FIND_REQUIRED)
- message(FATAL_ERROR "Could NOT find Polkit-Qt")
- endif (POLKITQT_FIND_REQUIRED)
-endif (POLKITQT_FOUND)
-
-mark_as_advanced(POLKITQT_INCLUDE_DIR POLKITQT_LIB)
-
-macro(dbus_add_activation_system_service _sources)
- pkg_search_module( DBUS dbus-1 )
- foreach (_i ${_sources})
- get_filename_component(_service_file ${_i} ABSOLUTE)
- string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
- set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file})
- configure_file(${_service_file} ${_target})
- install(FILES ${_target} DESTINATION ${DBUS_PREFIX}/share/dbus-1/system-services )
- endforeach (_i ${ARGN})
-endmacro(dbus_add_activation_system_service _sources)
diff --git a/x11/kdebindings4-python/patches/patch-aa b/x11/kdebindings4-python/patches/patch-aa
deleted file mode 100644
index c87ba69fd6e..00000000000
--- a/x11/kdebindings4-python/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/10/02 19:47:47 markd Exp $
-
-only installing python bindings so dont install smoke.h
-
---- smoke/CMakeLists.txt.orig 2008-12-04 21:34:05.000000000 +1300
-+++ smoke/CMakeLists.txt
-@@ -123,4 +123,4 @@ message(STATUS "Build Smoke... " ${SMOKE
- # Qt only
- #install( FILES smoke.h DESTINATION ${INSTALL_DIR}/include )
-
--install( FILES smoke.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include )
-+#install( FILES smoke.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include )
diff --git a/x11/kdebindings4-python/patches/patch-ac b/x11/kdebindings4-python/patches/patch-ac
deleted file mode 100644
index 46cfbdd2fd6..00000000000
--- a/x11/kdebindings4-python/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/04/10 02:45:05 markd Exp $
-
---- CMakeLists.txt.orig 2010-04-04 12:10:19.000000000 +0000
-+++ CMakeLists.txt
-@@ -1,6 +1,6 @@
- project(kdebindings)
-
--add_subdirectory(generator)
-+#add_subdirectory(generator)
-
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules )
diff --git a/x11/kdebindings4-python/patches/patch-am b/x11/kdebindings4-python/patches/patch-am
deleted file mode 100644
index ecb500f9ff6..00000000000
--- a/x11/kdebindings4-python/patches/patch-am
+++ /dev/null
@@ -1,160 +0,0 @@
-$NetBSD: patch-am,v 1.2 2011/01/18 09:14:14 wiz Exp $
-
-http://websvn.kde.org/?view=revision&revision=1170602
-https://projects.kde.org/projects/kde/kdebindings/pykde4/repository/diff/sip/kdecore/typedefs.sip?rev=e0b183d78884c8af3396e3877ec7284a0bbce7e4&type=sbs
-
---- python/pykde4/sip/kdecore/typedefs.sip.orig 2010-11-02 12:51:10.000000000 +0000
-+++ python/pykde4/sip/kdecore/typedefs.sip
-@@ -582,90 +582,6 @@ template <TYPE1,TYPE2*>
- %End
- };
-
--template <TYPE>
--%MappedType QSet<TYPE>
--{
--%TypeHeaderCode
--#include <qset.h>
--%End
--
--%ConvertFromTypeCode
-- // Create the list.
-- PyObject *l;
--
-- if ((l = PyList_New(sipCpp->size())) == NULL)
-- return NULL;
--
-- // Set the list elements.
-- QSet<TYPE> set = *sipCpp;
-- int i = 0;
-- foreach (TYPE value, set)
-- {
-- PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj);
-- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
-- {
-- Py_DECREF(l);
--
-- if (obj)
-- Py_DECREF(obj);
--
-- return NULL;
-- }
--
-- Py_DECREF(obj);
-- i++;
-- }
--
-- return l;
--%End
--
--%ConvertToTypeCode
-- // Check the type if that is all that is required.
-- if (sipIsErr == NULL)
-- {
-- if (!PyList_Check(sipPy))
-- return 0;
-- }
--
-- // 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)
-- if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
-- return 0;
-- }
--
-- QSet<TYPE> *qs = new QSet<TYPE>;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-- {
-- int state;
--
-- TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
--
-- if (*sipIsErr)
-- {
-- sipReleaseType(t, sipType_TYPE, state);
--
-- delete qs;
-- return 0;
-- }
--
-- *qs << *t;
--
-- sipReleaseType(t, sipType_TYPE, state);
-- }
--
-- *sipCppPtr = qs;
--
-- return sipGetState(sipTransferObj);
--%End
--};
--
--
- template <TYPE1,TYPE2>
- %MappedType QPair<TYPE1,TYPE2>
- {
-@@ -733,61 +649,6 @@ template <TYPE1,TYPE2>
- };
-
-
--%MappedType QList<uint>
--{
--%TypeHeaderCode
--#include <qlist.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) {
-- PyObject *pobj;
--
--#if PY_MAJOR_VERSION >= 3
-- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
--#else
-- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
--#endif
-- Py_DECREF(l);
--
-- return NULL;
-- }
--
-- PyList_SET_ITEM(l, i, pobj);
-- }
--
-- return l;
--%End
--
--%ConvertToTypeCode
-- // Check the type if that is all that is required.
-- if (sipIsErr == NULL)
-- return PyList_Check(sipPy);
--
-- QList<uint> *ql = new QList<uint>;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--#if PY_MAJOR_VERSION >= 3
-- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
--#else
-- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
--#endif
-- }
--
-- *sipCppPtr = ql;
--
-- return sipGetState(sipTransferObj);
--%End
--};
--
--
- template <TYPE*>
- %MappedType QStack<TYPE*>
- {
diff --git a/x11/kdebindings4-python/DESCR b/x11/py-kde4/DESCR
index 2b0a29b6afe..2b0a29b6afe 100644
--- a/x11/kdebindings4-python/DESCR
+++ b/x11/py-kde4/DESCR
diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile
new file mode 100644
index 00000000000..d831e5fabe6
--- /dev/null
+++ b/x11/py-kde4/Makefile
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile,v 1.1 2012/03/19 19:44:04 markd Exp $
+
+PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION}
+DISTNAME= pykde4-${_KDE_VERSION}
+CATEGORIES= misc
+COMMENT= Python bindings for the KDE integrated X11 desktop
+
+.include "../../wip/kde4/Makefile.kde4"
+
+# BUILD_MAKE_FLAGS+= VERBOSE=1
+
+CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
+
+PYTHON_VERSIONS_ACCEPTED= 27 26 25
+PY_PATCHPLIST= yes
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+
+REPLACE_PYTHON+= \
+ tools/pykdeuic4/*.py \
+ examples/*.py \
+ examples/*/*.py \
+ docs/html/tutorials/started/*.py
+
+# We need to replace the embedded interpreter
+SUBST_CLASSES+= pykdeuic4
+SUBST_STAGE.pykdeuic4= post-build
+SUBST_FILES.pykdeuic4= tools/pykdeuic4/pykdeuic4.py
+SUBST_SED.pykdeuic4= 's:/usr/bin/env python$$:${PYTHONBIN}:'
+
+#post-extract:
+# ${CP} ${FILESDIR}/FindPolkitQt.cmake ${WRKSRC}/cmake/modules
+
+.include "../../wip/kde4/kde4.mk"
+
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.include "../../wip/kdepimlibs4/buildlink3.mk"
+.include "../../security/polkit-qt/buildlink3.mk"
+.include "../../wip/kdelibs4/buildlink3.mk"
+BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.10
+.include "../../x11/py-sip/buildlink3.mk"
+.include "../../x11/py-qt4/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebindings4-python/PLIST b/x11/py-kde4/PLIST
index 32b91109d27..ad21513060c 100644
--- a/x11/kdebindings4-python/PLIST
+++ b/x11/py-kde4/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2010/10/25 20:55:29 markd Exp $
+@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:04 markd Exp $
bin/pykdeuic4
lib/kde4/kpythonpluginfactory.so
-lib/kde4/krosspython.so
${PYSITELIB}/PyKDE4/__init__.py
${PYSITELIB}/PyKDE4/__init__.pyc
${PYSITELIB}/PyKDE4/akonadi.so
@@ -12,6 +11,7 @@ ${PYSITELIB}/PyKDE4/khtml.so
${PYSITELIB}/PyKDE4/kio.so
${PYSITELIB}/PyKDE4/knewstuff.so
${PYSITELIB}/PyKDE4/kparts.so
+${PYSITELIB}/PyKDE4/kterminal.so
${PYSITELIB}/PyKDE4/ktexteditor.so
${PYSITELIB}/PyKDE4/kutils.so
${PYSITELIB}/PyKDE4/nepomuk.so
@@ -50,6 +50,7 @@ share/kde/apps/pykde4/examples/khtmlExamples/__init__.py
share/kde/apps/pykde4/examples/kioExamples/__init__.py
share/kde/apps/pykde4/examples/kpartsExamples/__init__.py
share/kde/apps/pykde4/examples/kpartsExamples/katepart.py
+share/kde/apps/pykde4/examples/kpartsExamples/konsolepart.py
share/kde/apps/pykde4/examples/kutilsExamples/__init__.py
share/kde/apps/pykde4/examples/polkitqtExamples/PkExampleUi.py
share/kde/apps/pykde4/examples/polkitqtExamples/README
@@ -64,8 +65,11 @@ share/kde/apps/pykde4/examples/solidExamples/solid_storageaccess.py
share/kde/apps/pykde4/examples/solidExamples/solid_storagedrive.py
share/kde/apps/pykde4/examples/solidExamples/solid_storagevolume.py
share/kde/apps/pykde4/examples/solid_demo.py
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/abstractdifferencesreporter.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/addressattribute.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/agentactionmanager.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/agentbase.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/agentfactory.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/agentfilterproxymodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/agentinstance.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/agentinstancecreatejob.sip
@@ -83,6 +87,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/attributefactory.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/cachepolicy.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/changerecorder.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collection.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionattributessynchronizationjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectioncombobox.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectioncopyjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectioncreatejob.sip
@@ -104,15 +109,20 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsmodel.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/entitydisplayattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entityhiddenattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitylistview.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitymimetypefiltermodel.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entityorderproxymodel.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entityrightsfiltermodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitytreemodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitytreeview.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitytreeviewstatesaver.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/etmviewstatesaver.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/favoritecollectionsmodel.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/indexpolicyattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/item.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/itemcopyjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/itemcreatejob.sip
@@ -129,9 +139,11 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/itemsync.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/itemview.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/job.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/linkjob.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/messageflags.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/messagefolderattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/messagemodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/messageparts.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/messagestatus.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/messagethreaderproxymodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/messagethreadingattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/mimetypechecker.sip
@@ -139,7 +151,11 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/monitor.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/partfetcher.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/persistentsearchattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/preprocessorbase.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/recursivecollectionfilterproxymodel.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/recursiveitemfetchjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/resourcebase.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/resourcebasesettings.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/resourcesettings.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/resourcesynchronizationjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/searchcreatejob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/selectionproxymodel.sip
@@ -150,6 +166,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/specialcollectionsrequestjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/specialmailcollections.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/specialmailcollectionsrequestjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/standardactionmanager.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/standardmailactionmanager.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/statisticsproxymodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transactionjobs.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transactionsequence.sip
@@ -204,6 +221,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/kjobuidelegate.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/klibloader.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/klibrary.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/klocale.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/klocalizeddate.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/klocalizedstring.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/klocalsocket.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/klockfile.sip
@@ -276,6 +294,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kcategorizedsortfilterproxymodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kcategorizedview.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kcategorydrawer.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kcharselect.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kcheckableproxymodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kcmodule.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kcodecaction.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kcolorbutton.sip
@@ -295,16 +314,21 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kconfigdialogmanager.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kconfigskeleton.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kcrash.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kcursor.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdatecombobox.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdatepicker.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdatetable.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdatetimeedit.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdatetimewidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdatewidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdeprintdialog.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdescendantsproxymodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdeuimod.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdialog.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdialogbuttonbox.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdialogjobuidelegate.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kdualaction.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/keditlistbox.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/keditlistwidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kedittoolbar.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kextendableitemdelegate.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kfadewidgeteffect.sip
@@ -317,6 +341,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kfontcombobox.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kfontdialog.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kfontrequester.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kfontsizeaction.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kfontutils.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kgesture.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kglobalaccel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kglobalsettings.sip
@@ -331,6 +356,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kiconcache.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kiconeffect.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kiconloader.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kicontheme.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kidentityproxymodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kinputdialog.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kkeysequencewidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kkeyserver.sip
@@ -347,6 +373,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kmenu.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kmenubar.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kmessagebox.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kmessageboxmessagehandler.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kmessagewidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kmodelindexproxymapper.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kmodifierkeyinfo.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kmultitabbar.sip
@@ -360,7 +387,6 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kpagemodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kpageview.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kpagewidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kpagewidgetmodel.sip
-share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kpalette.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kpassivepopup.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kpassivepopupmessagehandler.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kpassworddialog.sip
@@ -378,6 +404,8 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kplotpoint.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kplotwidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kprogressdialog.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kpushbutton.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kratingpainter.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kratingwidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/krecentfilesaction.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/krecursivefilterproxymodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kreplace.sip
@@ -407,12 +435,13 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kstatusnotifieritem.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kstringvalidator.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kstyle.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ksvgrenderer.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ksystemeventfilter.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ksystemtrayicon.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ktabbar.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ktabwidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ktextbrowser.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ktextedit.sip
-share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ktimezone.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ktimecombobox.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ktimezonewidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ktip.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/ktitlewidget.sip
@@ -429,6 +458,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kundostack.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kuniqueapplication.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kurllabel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kvbox.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kviewstatemaintainer.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kviewstatesaver.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kwallet.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kdeui/kwidgetitemdelegate.sip
@@ -491,6 +521,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kio/global.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/job.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/jobclasses.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/jobuidelegate.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kio/kabstractfileitemactionplugin.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kabstractfilemodule.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kabstractfilewidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kacl.sip
@@ -515,7 +546,6 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kio/kdesktopfileactions.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kdevicelistmodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kdirlister.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kdirmodel.sip
-share/sip${PYVERSSUFFIX}/PyKDE4/kio/kdirnotify.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kdiroperator.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kdirselectdialog.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kdirsortfilterproxymodel.sip
@@ -528,6 +558,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kio/kfile.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kfiledialog.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kfilefiltercombo.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kfileitem.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kio/kfileitemactionplugin.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kfileitemactions.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kfileitemdelegate.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kfileitemlistproperties.sip
@@ -556,10 +587,12 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kio/kopenwithdialog.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kpreviewwidgetbase.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kpropertiesdialog.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kprotocolmanager.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kio/krecentdirs.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/krecentdocument.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kremoteencoding.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/krun.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/ksambashare.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kio/ksambasharedata.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kscan.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kservicegroup.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kio/kshellcompletion.sip
@@ -616,8 +649,10 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kparts/browseropenorsavequestion.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/browserrun.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/event.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/factory.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kparts/fileinfoextension.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/genericfactory.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/historyprovider.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kparts/htmlextension.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/kpartsmod.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/mainwindow.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/part.sip
@@ -625,6 +660,11 @@ share/sip${PYVERSSUFFIX}/PyKDE4/kparts/partmanager.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/plugin.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/scriptableextension.sip
share/sip${PYVERSSUFFIX}/PyKDE4/kparts/statusbarextension.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kparts/textextension.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kterminal/kterminal.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kterminal/kterminalmod.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kterminal/terminal_interface.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/kterminal/terminal_interface_v2.sip
share/sip${PYVERSSUFFIX}/PyKDE4/ktexteditor/attribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/ktexteditor/codecompletioninterface.sip
share/sip${PYVERSSUFFIX}/PyKDE4/ktexteditor/codecompletionmodel.sip
@@ -671,24 +711,31 @@ share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/andterm.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/class.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/comparisonterm.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/entity.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/file.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/filequery.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/global.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/groupterm.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/kmetadatatagcloud.sip
-share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/kratingpainter.sip
-share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/kratingwidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/ktagcloudwidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/ktagdisplaywidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/literal.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/literalterm.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/ncal.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/nco.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/ndo.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/negationterm.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/nepomukmassupdatejob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/nepomukmod.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/nepomukontologyloader.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/nepomukservice.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/nfo.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/nie.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/nmm.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/nuao.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/ontology.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/optionalterm.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/orterm.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/pimo.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/property.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/query.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/queryparser.sip
@@ -699,10 +746,12 @@ share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/resourceterm.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/resourcetypeterm.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/result.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/simpleterm.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/standardqueries.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/tag.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/tagwidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/term.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/thing.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/tmo.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/tools.sip
share/sip${PYVERSSUFFIX}/PyKDE4/nepomuk/variant.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/abstractaudiodataoutput.sip
@@ -725,6 +774,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/phonon/mediacontroller.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/medianode.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/mediaobject.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/mediasource.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/phonon/mrl.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/objectdescription.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/objectdescriptionmodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/packet.sip
@@ -732,6 +782,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/phonon/packetpool.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/path.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/phononmod.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/phononnamespace.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/phonon/pulsesupport.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/seekslider.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/snapshotinterface.sip
share/sip${PYVERSSUFFIX}/PyKDE4/phonon/streaminterface.sip
@@ -773,6 +824,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/plasma/datacontainer.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/dataengine.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/dataenginemanager.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/dataenginescript.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/plasma/declarativewidget.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/delegate.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/dialog.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/extender.sip
@@ -794,6 +846,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/plasma/packagestructure.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/paintutils.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/plasma.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/plasmamod.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/plasma/pluginloader.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/popupapplet.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/pushbutton.sip
share/sip${PYVERSSUFFIX}/PyKDE4/plasma/querymatch.sip
@@ -846,8 +899,10 @@ share/sip${PYVERSSUFFIX}/PyKDE4/solid/deviceinterface.sip
share/sip${PYVERSSUFFIX}/PyKDE4/solid/devicenotifier.sip
share/sip${PYVERSSUFFIX}/PyKDE4/solid/dvbinterface.sip
share/sip${PYVERSSUFFIX}/PyKDE4/solid/genericinterface.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/solid/internetgateway.sip
share/sip${PYVERSSUFFIX}/PyKDE4/solid/networking.sip
share/sip${PYVERSSUFFIX}/PyKDE4/solid/networkinterface.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/solid/networkshare.sip
share/sip${PYVERSSUFFIX}/PyKDE4/solid/opticaldisc.sip
share/sip${PYVERSSUFFIX}/PyKDE4/solid/opticaldrive.sip
share/sip${PYVERSSUFFIX}/PyKDE4/solid/portablemediaplayer.sip
diff --git a/x11/py-kde4/buildlink3.mk b/x11/py-kde4/buildlink3.mk
new file mode 100644
index 00000000000..13724e50c2a
--- /dev/null
+++ b/x11/py-kde4/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2012/03/19 19:44:04 markd Exp $
+
+BUILDLINK_TREE+= py-kde4
+
+.if !defined(PY_KDE4_BUILDLINK3_MK)
+PY_KDE4_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.py-kde4+= ${PYPKGPREFIX}-kde4>=4.8.0
+BUILDLINK_PKGSRCDIR.py-kde4?= ../../wip/py-kde4
+
+.endif # PY_KDE4_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -py-kde4
diff --git a/x11/py-kde4/distinfo b/x11/py-kde4/distinfo
new file mode 100644
index 00000000000..3a1bad62136
--- /dev/null
+++ b/x11/py-kde4/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2012/03/19 19:44:04 markd Exp $
+
+SHA1 (pykde4-4.8.0.tar.bz2) = cf204efebc1eda6de7f4405dbf5037bdaffd30e9
+RMD160 (pykde4-4.8.0.tar.bz2) = 1933aca61f0f29a7d3622d891137425278820c51
+Size (pykde4-4.8.0.tar.bz2) = 2109081 bytes
+SHA1 (patch-CMakeLists.txt) = 6981a91671511739e63568d7bc2ee8899d28f8a9
+SHA1 (patch-__init__.py) = 721287a0ec82b79ea4a502526ed98ba44c6d979f
diff --git a/x11/kdebindings4-python/patches/patch-python_pykde4_CMakeLists.txt b/x11/py-kde4/patches/patch-CMakeLists.txt
index 4967b888a11..2f490531917 100644
--- a/x11/kdebindings4-python/patches/patch-python_pykde4_CMakeLists.txt
+++ b/x11/py-kde4/patches/patch-CMakeLists.txt
@@ -1,7 +1,7 @@
-$NetBSD: patch-python_pykde4_CMakeLists.txt,v 1.1 2012/01/02 06:58:26 sbd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.1 2012/03/19 19:44:04 markd Exp $
---- python/pykde4/CMakeLists.txt.orig 2010-11-02 12:51:11.000000000 +0000
-+++ python/pykde4/CMakeLists.txt
+--- CMakeLists.txt.orig 2010-11-02 12:51:11.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})
diff --git a/x11/kdebindings4-python/patches/patch-ab b/x11/py-kde4/patches/patch-__init__.py
index d9fb2d3fce8..c53efc5fda1 100644
--- a/x11/kdebindings4-python/patches/patch-ab
+++ b/x11/py-kde4/patches/patch-__init__.py
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/10/02 19:47:47 markd Exp $
+$NetBSD: patch-__init__.py,v 1.1 2012/03/19 19:44:04 markd Exp $
deal with possible lack of DLFCN package as its only on Linux and Solaris
---- python/pykde4/__init__.py.orig 2008-07-22 12:00:52.000000000 +1200
-+++ python/pykde4/__init__.py
+--- __init__.py.orig 2008-07-22 12:00:52.000000000 +1200
++++ __init__.py
@@ -1,4 +1,22 @@
-import sys,DLFCN
+import sys