aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2010-09-02 21:06:27 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2010-09-02 21:06:27 +0000
commit08351f8e016396e46d654e72eceb6a2ed81aadbb (patch)
treed97f07c03bb7f9977c1021629266214a9d2310e6 /x11
parent0b3b58a79f748bf25f2a89f19316de184c390fa6 (diff)
downloadports-08351f8e016396e46d654e72eceb6a2ed81aadbb.tar.gz
ports-08351f8e016396e46d654e72eceb6a2ed81aadbb.zip
Notes
Diffstat (limited to 'x11')
-rw-r--r--x11/kde4-baseapps/Makefile18
-rw-r--r--x11/kde4-baseapps/distinfo6
-rw-r--r--x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake15
-rw-r--r--x11/kde4-baseapps/pkg-plist596
-rw-r--r--x11/kde4-runtime/Makefile19
-rw-r--r--x11/kde4-runtime/distinfo6
-rw-r--r--x11/kde4-runtime/pkg-plist399
-rw-r--r--x11/kde4-workspace/Makefile16
-rw-r--r--x11/kde4-workspace/distinfo6
-rw-r--r--x11/kde4-workspace/files/patch-CMakeLists.txt15
-rw-r--r--x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp15
-rw-r--r--x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt12
-rw-r--r--x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c24
-rw-r--r--x11/kde4-workspace/files/patch-kdm__backend__client.c28
-rw-r--r--x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt (renamed from x11/kde4-baseapps/files/patch-apps__kinfocenter__base__CMakeLists.txt)4
-rw-r--r--x11/kde4-workspace/files/patch-kinfocenter__Modules__base__info_fbsd.cpp (renamed from x11/kdebase4/files/patch-apps__kinfocenter__base__info_fbsd.cpp)4
-rw-r--r--x11/kde4-workspace/files/patch-kinfocenter__Modules__info__CMakeLists.txt (renamed from x11/kdebase4/files/patch-apps__kinfocenter__info__CMakeLists.txt)12
-rw-r--r--x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt11
-rw-r--r--x11/kde4-workspace/files/patch-solid__CMakeLists.txt12
-rw-r--r--x11/kde4-workspace/pkg-plist357
-rw-r--r--x11/kde4/Makefile3
-rw-r--r--x11/kdebase4-runtime/Makefile19
-rw-r--r--x11/kdebase4-runtime/distinfo6
-rw-r--r--x11/kdebase4-runtime/pkg-plist399
-rw-r--r--x11/kdebase4-workspace/Makefile16
-rw-r--r--x11/kdebase4-workspace/distinfo6
-rw-r--r--x11/kdebase4-workspace/files/patch-CMakeLists.txt15
-rw-r--r--x11/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp15
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt12
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c24
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm__backend__client.c28
-rw-r--r--x11/kdebase4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt (renamed from x11/kdebase4/files/patch-apps__kinfocenter__base__CMakeLists.txt)4
-rw-r--r--x11/kdebase4-workspace/files/patch-kinfocenter__Modules__base__info_fbsd.cpp (renamed from x11/kde4-baseapps/files/patch-apps__kinfocenter__base__info_fbsd.cpp)4
-rw-r--r--x11/kdebase4-workspace/files/patch-kinfocenter__Modules__info__CMakeLists.txt (renamed from x11/kde4-baseapps/files/patch-apps__kinfocenter__info__CMakeLists.txt)12
-rw-r--r--x11/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt11
-rw-r--r--x11/kdebase4-workspace/files/patch-solid__CMakeLists.txt12
-rw-r--r--x11/kdebase4-workspace/pkg-plist357
-rw-r--r--x11/kdebase4/Makefile18
-rw-r--r--x11/kdebase4/distinfo6
-rw-r--r--x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake15
-rw-r--r--x11/kdebase4/pkg-plist596
-rw-r--r--x11/kdelibs4/Makefile11
-rw-r--r--x11/kdelibs4/distinfo6
-rw-r--r--x11/kdelibs4/files/patch-KDE4Defaults.cmake4
-rw-r--r--x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake24
-rw-r--r--x11/kdelibs4/files/patch-kdecore_io_kdirwatch.cpp11
-rw-r--r--x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp21
-rw-r--r--x11/kdelibs4/files/patch-kio_kfile_kdiskfreespaceinfo.cpp11
-rw-r--r--x11/kdelibs4/pkg-plist180
-rw-r--r--x11/plasma-scriptengine-python/files/patch-plasma__generic__scriptengines__python__CMakeLists.txt4
-rw-r--r--x11/plasma-scriptengine-ruby/files/patch-plasma__generic__scriptengines__ruby__CMakeLists.txt2
51 files changed, 1131 insertions, 2296 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index eb86e7804ea1..b9c677e8a87b 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -16,9 +16,11 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
+BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \
soprano.4:${PORTSDIR}/textproc/soprano \
- qimageblitz.4:${PORTSDIR}/x11/qimageblitz
+ qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+ kwebkit.1:${PORTSDIR}/www/kwebkitpart
LATEST_LINK= ${PORTNAME}4
@@ -37,10 +39,7 @@ CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
-DWITH_RAW1394:BOOL=OFF \
-DWITH_PCIUTILS:BOOL=OFF
-OPTIONS= WEBKIT "KWebKit support in Konqueror KTTS plugin" off
-
-MAN1= kappfinder.1 \
- kbookmarkmerger.1 \
+MAN1= kbookmarkmerger.1 \
kfind.1
.include <bsd.port.options.mk>
@@ -49,13 +48,4 @@ MAN1= kappfinder.1 \
LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
.endif
-.ifdef(WITH_WEBKIT)
-LIB_DEPENDS+= kwebkit.1:${PORTSDIR}/www/kwebkitpart
-CMAKE_ARGS+= -DWITH_KWebKitPart:BOOL=ON
-PLIST_SUB+= WEBKIT=""
-.else
-CMAKE_ARGS+= -DWITH_KWebKitPart:BOOL=OFF
-PLIST_SUB+= WEBKIT="@comment "
-.endif
-
.include <bsd.port.mk>
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index ae4f7a69df5f..a28c438ea7b5 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-4.4.5.tar.bz2) = 93fa095ba7bee61a995f1ef6c60a1e32
-SHA256 (KDE/kdebase-4.4.5.tar.bz2) = c95e97e257657cc38fa27ba9a84f5b70949b6eeb2521cbbd6f0dbb3cf5ad6be0
-SIZE (KDE/kdebase-4.4.5.tar.bz2) = 4046023
+MD5 (KDE/kdebase-4.5.1.tar.bz2) = 9249b29618eed5dd5c7bfccacb3e0c43
+SHA256 (KDE/kdebase-4.5.1.tar.bz2) = 8bce667812f9dcb7e2018334009ac9942c07144a5d682260af0d8e12f2d0e819
+SIZE (KDE/kdebase-4.5.1.tar.bz2) = 2611115
diff --git a/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake b/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
deleted file mode 100644
index 1cd6d43a3e33..000000000000
--- a/x11/kde4-baseapps/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./apps/cmake/modules/FindPCIUTILS.cmake.orig 2008-08-07 15:20:57.000000000 +0000
-+++ ./apps/cmake/modules/FindPCIUTILS.cmake 2008-12-27 11:49:04.000000000 +0000
-@@ -14,7 +14,11 @@
- FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pci)
- if(PCIUTILS_LIBRARY)
- FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv)
-- set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY} ${RESOLV_LIBRARY})
-+ if(RESOLV_LIBRARY)
-+ set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY} ${RESOLV_LIBRARY})
-+ else(RESOLV_LIBRARY)
-+ set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY})
-+ endif(RESOLV_LIBRARY)
- endif(PCIUTILS_LIBRARY)
-
-
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index 3d30d89c622b..96cffcc4eaf6 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -1,12 +1,10 @@
bin/dolphin
-bin/kappfinder
bin/kbookmarkmerger
bin/kdepasswd
bin/kdialog
bin/keditbookmarks
bin/kfind
bin/kfmclient
-bin/kinfocenter
bin/konqueror
bin/konsole
bin/konsoleprofile
@@ -31,27 +29,16 @@ include/konqsidebarplugin.h
include/kversioncontrolplugin.h
include/libkonq_export.h
lib/kde4/dolphinpart.so
-lib/kde4/fileviewsvnplugin.so
lib/kde4/kcm_dolphingeneral.so
lib/kde4/kcm_dolphinnavigation.so
lib/kde4/kcm_dolphinservices.so
lib/kde4/kcm_dolphinviewmodes.so
lib/kde4/kcm_history.so
-lib/kde4/kcm_info.so
-lib/kde4/kcm_ioslaveinfo.so
lib/kde4/kcm_kio.so
lib/kde4/kcm_konq.so
lib/kde4/kcm_konqhtml.so
lib/kde4/kcm_kurifilt.so
-lib/kde4/kcm_memory.so
-lib/kde4/kcm_nic.so
-lib/kde4/kcm_opengl.so
-lib/kde4/kcm_partition.so
-lib/kde4/kcm_pci.so
lib/kde4/kcm_performance.so
-lib/kde4/kcm_samba.so
-lib/kde4/kcm_solidproc.so
-lib/kde4/kcm_usb.so
lib/kde4/kcm_useraccount.so
lib/kde4/kded_favicons.so
lib/kde4/kded_konqy_preloader.so
@@ -63,19 +50,22 @@ lib/kde4/konq_sidebartree_bookmarks.so
lib/kde4/konq_sidebartree_dirtree.so
lib/kde4/konq_sound.so
lib/kde4/konqsidebar_history.so
+lib/kde4/konqsidebar_places.so
lib/kde4/konqsidebar_tree.so
lib/kde4/konqsidebar_web.so
lib/kde4/libkcminit_nsplugins.so
-lib/kde4/libkfindpart.so
lib/kde4/libkonsolepart.so
lib/kde4/libnsplugin.so
lib/kde4/plasma_applet_folderview.so
lib/libdolphinprivate.so
lib/libdolphinprivate.so.5
lib/libdolphinprivate.so.5.0.1
+lib/libkbookmarkmodel_private.so
+lib/libkbookmarkmodel_private.so.5
+lib/libkbookmarkmodel_private.so.5.0.1
+lib/libkdeinit4_dolphin.so
lib/libkdeinit4_keditbookmarks.so
lib/libkdeinit4_kfmclient.so
-lib/libkdeinit4_kinfocenter.so
lib/libkdeinit4_konqueror.so
lib/libkdeinit4_konsole.so
lib/libkdeinit4_kwrite.so
@@ -91,14 +81,13 @@ lib/libkonquerorprivate.so.5.0.1
lib/libkonsoleprivate.so
share/applications/kde4/Home.desktop
share/applications/kde4/dolphin.desktop
-share/applications/kde4/kappfinder.desktop
share/applications/kde4/kdepasswd.desktop
+share/applications/kde4/keditbookmarks.desktop
share/applications/kde4/kfind.desktop
share/applications/kde4/kfmclient.desktop
share/applications/kde4/kfmclient_dir.desktop
share/applications/kde4/kfmclient_html.desktop
share/applications/kde4/kfmclient_war.desktop
-share/applications/kde4/kinfocenter.desktop
share/applications/kde4/konqbrowser.desktop
share/applications/kde4/konquerorsu.desktop
share/applications/kde4/konsole.desktop
@@ -108,238 +97,8 @@ share/apps/dolphin/dolphinui.rc
share/apps/dolphinpart/dolphinpart.rc
share/apps/dolphinpart/kpartplugins/kshellcmdplugin.desktop
share/apps/dolphinpart/kpartplugins/kshellcmdplugin.rc
-share/apps/kappfinder/apps/Development/Forte.desktop
-share/apps/kappfinder/apps/Development/assistant.desktop
-share/apps/kappfinder/apps/Development/ddd.desktop
-share/apps/kappfinder/apps/Development/designer.desktop
-share/apps/kappfinder/apps/Development/dlgedit.desktop
-share/apps/kappfinder/apps/Development/eclipse.desktop
-share/apps/kappfinder/apps/Development/j2mewtk.desktop
-share/apps/kappfinder/apps/Development/linguist.desktop
-share/apps/kappfinder/apps/Development/pose.desktop
-share/apps/kappfinder/apps/Editors/emacs.desktop
-share/apps/kappfinder/apps/Editors/gedit.desktop
-share/apps/kappfinder/apps/Editors/gvim.desktop
-share/apps/kappfinder/apps/Editors/lemacs.desktop
-share/apps/kappfinder/apps/Editors/nano.desktop
-share/apps/kappfinder/apps/Editors/nedit.desktop
-share/apps/kappfinder/apps/Editors/pico.desktop
-share/apps/kappfinder/apps/Editors/xedit.desktop
-share/apps/kappfinder/apps/Editors/xemacs.desktop
-share/apps/kappfinder/apps/Games/Arcade/ClanBomber.desktop
-share/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop
-share/apps/kappfinder/apps/Games/Arcade/Gnibbles.desktop
-share/apps/kappfinder/apps/Games/Arcade/GnobotsII.desktop
-share/apps/kappfinder/apps/Games/Arcade/Mures.desktop
-share/apps/kappfinder/apps/Games/Arcade/SuperMethaneBrothers.desktop
-share/apps/kappfinder/apps/Games/Arcade/Trophy.desktop
-share/apps/kappfinder/apps/Games/Arcade/TuxRacer.desktop
-share/apps/kappfinder/apps/Games/Arcade/XKobo.desktop
-share/apps/kappfinder/apps/Games/Arcade/XSoldier.desktop
-share/apps/kappfinder/apps/Games/Arcade/alephone-nogl.desktop
-share/apps/kappfinder/apps/Games/Arcade/alephone.desktop
-share/apps/kappfinder/apps/Games/Arcade/cxhextris.desktop
-share/apps/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop
-share/apps/kappfinder/apps/Games/Board/Gataxx.desktop
-share/apps/kappfinder/apps/Games/Board/Gchess.desktop
-share/apps/kappfinder/apps/Games/Board/Glines.desktop
-share/apps/kappfinder/apps/Games/Board/Gmahjongg.desktop
-share/apps/kappfinder/apps/Games/Board/Gmines.desktop
-share/apps/kappfinder/apps/Games/Board/Gnotravex.desktop
-share/apps/kappfinder/apps/Games/Board/Gnotski.desktop
-share/apps/kappfinder/apps/Games/Board/Gstones.desktop
-share/apps/kappfinder/apps/Games/Board/Iagno.desktop
-share/apps/kappfinder/apps/Games/Board/SameGnome.desktop
-share/apps/kappfinder/apps/Games/Board/Xgammon.desktop
-share/apps/kappfinder/apps/Games/Board/xboard.desktop
-share/apps/kappfinder/apps/Games/Card/AisleRiot.desktop
-share/apps/kappfinder/apps/Games/Card/FreeCell.desktop
-share/apps/kappfinder/apps/Games/Card/PySol.desktop
-share/apps/kappfinder/apps/Games/Card/XPat2.desktop
-share/apps/kappfinder/apps/Games/Clanbomber.desktop
-share/apps/kappfinder/apps/Games/Emulators/qmamecat.desktop
-share/apps/kappfinder/apps/Games/GTali.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/angband.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/moria.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/nethack.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/rogue.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/tome.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/zangband.desktop
-share/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop
-share/apps/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop
-share/apps/kappfinder/apps/Games/TacticStrategy/xscorch.desktop
-share/apps/kappfinder/apps/Games/defendguin.desktop
-share/apps/kappfinder/apps/Games/penguin-command.desktop
-share/apps/kappfinder/apps/Games/xshipwars.desktop
-share/apps/kappfinder/apps/Graphics/ElectricEyes.desktop
-share/apps/kappfinder/apps/Graphics/GPhoto.desktop
-share/apps/kappfinder/apps/Graphics/GnomeColorSelector.desktop
-share/apps/kappfinder/apps/Graphics/GnomeIconEditor.desktop
-share/apps/kappfinder/apps/Graphics/Gqview.desktop
-share/apps/kappfinder/apps/Graphics/Sketch.desktop
-share/apps/kappfinder/apps/Graphics/Xpcd.desktop
-share/apps/kappfinder/apps/Graphics/Xwpick.desktop
-share/apps/kappfinder/apps/Graphics/bitmap.desktop
-share/apps/kappfinder/apps/Graphics/blender.desktop
-share/apps/kappfinder/apps/Graphics/ghostview.desktop
-share/apps/kappfinder/apps/Graphics/gimp.desktop
-share/apps/kappfinder/apps/Graphics/gv.desktop
-share/apps/kappfinder/apps/Graphics/inkscape.desktop
-share/apps/kappfinder/apps/Graphics/sodipodi.desktop
-share/apps/kappfinder/apps/Graphics/tgif.desktop
-share/apps/kappfinder/apps/Graphics/xdvi.desktop
-share/apps/kappfinder/apps/Graphics/xfig.desktop
-share/apps/kappfinder/apps/Graphics/xpaint.desktop
-share/apps/kappfinder/apps/Graphics/xv.desktop
-share/apps/kappfinder/apps/Internet/BlueFish.desktop
-share/apps/kappfinder/apps/Internet/Dpsftp.desktop
-share/apps/kappfinder/apps/Internet/DrakSync.desktop
-share/apps/kappfinder/apps/Internet/Evolution.desktop
-share/apps/kappfinder/apps/Internet/Faces.desktop
-share/apps/kappfinder/apps/Internet/Fetchmailconf.desktop
-share/apps/kappfinder/apps/Internet/Gabber.desktop
-share/apps/kappfinder/apps/Internet/Galeon.desktop
-share/apps/kappfinder/apps/Internet/GnomeICU.desktop
-share/apps/kappfinder/apps/Internet/Netscapemessenger.desktop
-share/apps/kappfinder/apps/Internet/Nmapfe.desktop
-share/apps/kappfinder/apps/Internet/Pan.desktop
-share/apps/kappfinder/apps/Internet/Sylpheed.desktop
-share/apps/kappfinder/apps/Internet/Terminal/Links.desktop
-share/apps/kappfinder/apps/Internet/Terminal/Lynx.desktop
-share/apps/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
-share/apps/kappfinder/apps/Internet/Terminal/lftp.desktop
-share/apps/kappfinder/apps/Internet/Terminal/mutt.desktop
-share/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop
-share/apps/kappfinder/apps/Internet/Terminal/pine.desktop
-share/apps/kappfinder/apps/Internet/Terminal/silc.desktop
-share/apps/kappfinder/apps/Internet/Terminal/slrn.desktop
-share/apps/kappfinder/apps/Internet/Terminal/w3m.desktop
-share/apps/kappfinder/apps/Internet/arena.desktop
-share/apps/kappfinder/apps/Internet/balsa.desktop
-share/apps/kappfinder/apps/Internet/btdownloadgui.desktop
-share/apps/kappfinder/apps/Internet/coolmail.desktop
-share/apps/kappfinder/apps/Internet/dc_gui.desktop
-share/apps/kappfinder/apps/Internet/ed2k_gui.desktop
-share/apps/kappfinder/apps/Internet/epiphany.desktop
-share/apps/kappfinder/apps/Internet/ethereal.desktop
-share/apps/kappfinder/apps/Internet/gFTP.desktop
-share/apps/kappfinder/apps/Internet/gaim.desktop
-share/apps/kappfinder/apps/Internet/gnomemeeting.desktop
-share/apps/kappfinder/apps/Internet/gnometalk.desktop
-share/apps/kappfinder/apps/Internet/gtelnet.desktop
-share/apps/kappfinder/apps/Internet/ickle.desktop
-share/apps/kappfinder/apps/Internet/javaws.desktop
-share/apps/kappfinder/apps/Internet/knews.desktop
-share/apps/kappfinder/apps/Internet/licq.desktop
-share/apps/kappfinder/apps/Internet/mldonkey_gui.desktop
-share/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
-share/apps/kappfinder/apps/Internet/mozilla-thunderbird.desktop
-share/apps/kappfinder/apps/Internet/mozilla.desktop
-share/apps/kappfinder/apps/Internet/netscape.desktop
-share/apps/kappfinder/apps/Internet/netscape6.desktop
-share/apps/kappfinder/apps/Internet/opera.desktop
-share/apps/kappfinder/apps/Internet/wireshark.desktop
-share/apps/kappfinder/apps/Internet/xbiff.desktop
-share/apps/kappfinder/apps/Internet/xchat.desktop
-share/apps/kappfinder/apps/Internet/xfmail.desktop
-share/apps/kappfinder/apps/Internet/xftp.desktop
-share/apps/kappfinder/apps/Multimedia/Aumix.desktop
-share/apps/kappfinder/apps/Multimedia/Grip.desktop
-share/apps/kappfinder/apps/Multimedia/MP3info.desktop
-share/apps/kappfinder/apps/Multimedia/XMovie.desktop
-share/apps/kappfinder/apps/Multimedia/alevt.desktop
-share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop
-share/apps/kappfinder/apps/Multimedia/ams.desktop
-share/apps/kappfinder/apps/Multimedia/amsynth.desktop
-share/apps/kappfinder/apps/Multimedia/ardour.desktop
-share/apps/kappfinder/apps/Multimedia/audacity.desktop
-share/apps/kappfinder/apps/Multimedia/aviplay.desktop
-share/apps/kappfinder/apps/Multimedia/bcast2000.desktop
-share/apps/kappfinder/apps/Multimedia/djplay.desktop
-share/apps/kappfinder/apps/Multimedia/ecamegapedal.desktop
-share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop
-share/apps/kappfinder/apps/Multimedia/freebirth.desktop
-share/apps/kappfinder/apps/Multimedia/freqtweak.desktop
-share/apps/kappfinder/apps/Multimedia/galan.desktop
-share/apps/kappfinder/apps/Multimedia/gtv.desktop
-share/apps/kappfinder/apps/Multimedia/hydrogen.desktop
-share/apps/kappfinder/apps/Multimedia/jack-rack.desktop
-share/apps/kappfinder/apps/Multimedia/jamin.desktop
-share/apps/kappfinder/apps/Multimedia/jazz.desktop
-share/apps/kappfinder/apps/Multimedia/meterbridge.desktop
-share/apps/kappfinder/apps/Multimedia/mixxx.desktop
-share/apps/kappfinder/apps/Multimedia/mplayer.desktop
-share/apps/kappfinder/apps/Multimedia/mtv.desktop
-share/apps/kappfinder/apps/Multimedia/muse.desktop
-share/apps/kappfinder/apps/Multimedia/ogle.desktop
-share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop
-share/apps/kappfinder/apps/Multimedia/qjackctl.desktop
-share/apps/kappfinder/apps/Multimedia/qsynth.desktop
-share/apps/kappfinder/apps/Multimedia/realplayer.desktop
-share/apps/kappfinder/apps/Multimedia/rezound.desktop
-share/apps/kappfinder/apps/Multimedia/slab.desktop
-share/apps/kappfinder/apps/Multimedia/sweep.desktop
-share/apps/kappfinder/apps/Multimedia/vkeybd.desktop
-share/apps/kappfinder/apps/Multimedia/xawtv.desktop
-share/apps/kappfinder/apps/Multimedia/xcam.desktop
-share/apps/kappfinder/apps/Multimedia/xine.desktop
-share/apps/kappfinder/apps/Multimedia/xmms-enqueue.desktop
-share/apps/kappfinder/apps/Multimedia/xmms.desktop
-share/apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop
-share/apps/kappfinder/apps/Office/Applix.desktop
-share/apps/kappfinder/apps/Office/Dia.desktop
-share/apps/kappfinder/apps/Office/Gnome-Cal.desktop
-share/apps/kappfinder/apps/Office/Gnome-Card.desktop
-share/apps/kappfinder/apps/Office/GnomeTimeTracker.desktop
-share/apps/kappfinder/apps/Office/Gnumeric.desktop
-share/apps/kappfinder/apps/Office/Guppi.desktop
-share/apps/kappfinder/apps/Office/Ical.desktop
-share/apps/kappfinder/apps/Office/WordPerfect.desktop
-share/apps/kappfinder/apps/Office/WordPerfect2000.desktop
-share/apps/kappfinder/apps/Office/XAcc.desktop
-share/apps/kappfinder/apps/Office/XsLite.desktop
-share/apps/kappfinder/apps/Office/abiword.desktop
-share/apps/kappfinder/apps/Office/acroread.desktop
-share/apps/kappfinder/apps/Office/gnucash.desktop
-share/apps/kappfinder/apps/Office/lyx.desktop
-share/apps/kappfinder/apps/Office/mrproject.desktop
-share/apps/kappfinder/apps/Office/netscapeaddressbook.desktop
-share/apps/kappfinder/apps/Office/plan.desktop
-share/apps/kappfinder/apps/Office/pybliographic.desktop
-share/apps/kappfinder/apps/Office/scribus.desktop
-share/apps/kappfinder/apps/Office/xpdf.desktop
-share/apps/kappfinder/apps/System/Terminal/aterm.desktop
-share/apps/kappfinder/apps/System/Terminal/procinfo.desktop
-share/apps/kappfinder/apps/System/Terminal/rxvt.desktop
-share/apps/kappfinder/apps/System/Terminal/vmstat.desktop
-share/apps/kappfinder/apps/System/citrix_ica.desktop
-share/apps/kappfinder/apps/System/editres.desktop
-share/apps/kappfinder/apps/System/sam.desktop
-share/apps/kappfinder/apps/System/wine.desktop
-share/apps/kappfinder/apps/System/xosview.desktop
-share/apps/kappfinder/apps/Toys/xeyes.desktop
-share/apps/kappfinder/apps/Toys/xpinguin.desktop
-share/apps/kappfinder/apps/Utilities/GKrellM.desktop
-share/apps/kappfinder/apps/Utilities/GnomeWho.desktop
-share/apps/kappfinder/apps/Utilities/SystemInfo.desktop
-share/apps/kappfinder/apps/Utilities/SystemLogViewer.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/Xkill.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xcalc.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xclipboard.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xclock.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xconsole.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xload.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xmag.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
-share/apps/kappfinder/apps/Utilities/calctool.desktop
-share/apps/kappfinder/apps/Utilities/e-notes.desktop
-share/apps/kappfinder/apps/Utilities/oclock.desktop
-share/apps/kappfinder/apps/Utilities/xgnokii.desktop
share/apps/kbookmark/directory_bookmarkbar.desktop
share/apps/kcmcss/template.css
-share/apps/kcmusb/usb.ids
share/apps/kconf_update/favicons.upd
share/apps/kconf_update/kfmclient_3_2.upd
share/apps/kconf_update/kfmclient_3_2_update.sh
@@ -357,18 +116,17 @@ share/apps/keditbookmarks/keditbookmarks-genui.rc
share/apps/keditbookmarks/keditbookmarksui.rc
share/apps/khtml/kpartplugins/khtmlkttsd.desktop
share/apps/khtml/kpartplugins/khtmlkttsd.rc
-share/apps/kinfocenter/about/kinfocenter.css
-share/apps/kinfocenter/about/main.html
-share/apps/kinfocenter/kinfocenterui.rc
share/apps/konqsidebartng/dirtree/bookmarks_module.desktop
share/apps/konqsidebartng/dirtree/dirtree_module.desktop
share/apps/konqsidebartng/entries/bookmarks.desktop
share/apps/konqsidebartng/entries/history.desktop
share/apps/konqsidebartng/entries/home.desktop
+share/apps/konqsidebartng/entries/places.desktop
share/apps/konqsidebartng/entries/remote.desktop
share/apps/konqsidebartng/entries/root.desktop
share/apps/konqsidebartng/entries/services.desktop
share/apps/konqsidebartng/plugins/konqsidebar_history.desktop
+share/apps/konqsidebartng/plugins/konqsidebar_places.desktop
share/apps/konqsidebartng/plugins/konqsidebar_tree.desktop
share/apps/konqsidebartng/plugins/konqsidebar_web.desktop
share/apps/konqsidebartng/virtual_folders/remote/.directory
@@ -421,8 +179,8 @@ share/apps/konsole/linux.keytab
share/apps/konsole/partui.rc
share/apps/konsole/sessionui.rc
share/apps/konsole/solaris.keytab
-%%WEBKIT%%share/apps/kwebkitpart/kpartplugins/khtmlkttsd.desktop
-%%WEBKIT%%share/apps/kwebkitpart/kpartplugins/khtmlkttsd.rc
+share/apps/kwebkitpart/kpartplugins/khtmlkttsd.desktop
+share/apps/kwebkitpart/kpartplugins/khtmlkttsd.rc
share/apps/kwrite/kwriteui.rc
share/apps/plugin/nspluginpart.rc
share/autostart/konqy_preload.desktop
@@ -453,6 +211,7 @@ share/doc/HTML/en/dolphin/index.cache.bz2
share/doc/HTML/en/dolphin/index.docbook
share/doc/HTML/en/dolphin/locationbar-breadcrumb.png
share/doc/HTML/en/dolphin/locationbar-editable.png
+share/doc/HTML/en/dolphin/nepomuk-search.png
share/doc/HTML/en/dolphin/preferences-general-behavior.png
share/doc/HTML/en/dolphin/preferences-navigation.png
share/doc/HTML/en/dolphin/preferences-startup.png
@@ -469,61 +228,6 @@ share/doc/HTML/en/kfind/common
share/doc/HTML/en/kfind/index.cache.bz2
share/doc/HTML/en/kfind/index.docbook
share/doc/HTML/en/kfind/man-kfind.1.docbook
-share/doc/HTML/en/kinfocenter/common
-share/doc/HTML/en/kinfocenter/devices/common
-share/doc/HTML/en/kinfocenter/devices/index.cache.bz2
-share/doc/HTML/en/kinfocenter/devices/index.docbook
-share/doc/HTML/en/kinfocenter/dma/common
-share/doc/HTML/en/kinfocenter/dma/index.cache.bz2
-share/doc/HTML/en/kinfocenter/dma/index.docbook
-share/doc/HTML/en/kinfocenter/index.cache.bz2
-share/doc/HTML/en/kinfocenter/index.docbook
-share/doc/HTML/en/kinfocenter/interrupts/common
-share/doc/HTML/en/kinfocenter/interrupts/index.cache.bz2
-share/doc/HTML/en/kinfocenter/interrupts/index.docbook
-share/doc/HTML/en/kinfocenter/ioports/common
-share/doc/HTML/en/kinfocenter/ioports/index.cache.bz2
-share/doc/HTML/en/kinfocenter/ioports/index.docbook
-share/doc/HTML/en/kinfocenter/kinfocenter.png
-share/doc/HTML/en/kinfocenter/memory/common
-share/doc/HTML/en/kinfocenter/memory/index.cache.bz2
-share/doc/HTML/en/kinfocenter/memory/index.docbook
-share/doc/HTML/en/kinfocenter/nics/common
-share/doc/HTML/en/kinfocenter/nics/index.cache.bz2
-share/doc/HTML/en/kinfocenter/nics/index.docbook
-share/doc/HTML/en/kinfocenter/opengl/common
-share/doc/HTML/en/kinfocenter/opengl/index.cache.bz2
-share/doc/HTML/en/kinfocenter/opengl/index.docbook
-share/doc/HTML/en/kinfocenter/partitions/common
-share/doc/HTML/en/kinfocenter/partitions/index.cache.bz2
-share/doc/HTML/en/kinfocenter/partitions/index.docbook
-share/doc/HTML/en/kinfocenter/pci/common
-share/doc/HTML/en/kinfocenter/pci/index.cache.bz2
-share/doc/HTML/en/kinfocenter/pci/index.docbook
-share/doc/HTML/en/kinfocenter/processor/common
-share/doc/HTML/en/kinfocenter/processor/index.cache.bz2
-share/doc/HTML/en/kinfocenter/processor/index.docbook
-share/doc/HTML/en/kinfocenter/protocols/common
-share/doc/HTML/en/kinfocenter/protocols/index.cache.bz2
-share/doc/HTML/en/kinfocenter/protocols/index.docbook
-share/doc/HTML/en/kinfocenter/samba/common
-share/doc/HTML/en/kinfocenter/samba/index.cache.bz2
-share/doc/HTML/en/kinfocenter/samba/index.docbook
-share/doc/HTML/en/kinfocenter/scsi/common
-share/doc/HTML/en/kinfocenter/scsi/index.cache.bz2
-share/doc/HTML/en/kinfocenter/scsi/index.docbook
-share/doc/HTML/en/kinfocenter/sound/common
-share/doc/HTML/en/kinfocenter/sound/index.cache.bz2
-share/doc/HTML/en/kinfocenter/sound/index.docbook
-share/doc/HTML/en/kinfocenter/usb/common
-share/doc/HTML/en/kinfocenter/usb/index.cache.bz2
-share/doc/HTML/en/kinfocenter/usb/index.docbook
-share/doc/HTML/en/kinfocenter/view1394/common
-share/doc/HTML/en/kinfocenter/view1394/index.cache.bz2
-share/doc/HTML/en/kinfocenter/view1394/index.docbook
-share/doc/HTML/en/kinfocenter/xserver/common
-share/doc/HTML/en/kinfocenter/xserver/index.cache.bz2
-share/doc/HTML/en/kinfocenter/xserver/index.docbook
share/doc/HTML/en/konqueror/basics.docbook
share/doc/HTML/en/konqueror/bookmarks.docbook
share/doc/HTML/en/konqueror/browser.docbook
@@ -555,238 +259,25 @@ share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/kwrite/common
share/doc/HTML/en/kwrite/index.cache.bz2
share/doc/HTML/en/kwrite/index.docbook
-share/icons/hicolor/128x128/apps/kappfinder.png
share/icons/hicolor/128x128/apps/konqueror.png
-share/icons/hicolor/16x16/apps/kappfinder.png
share/icons/hicolor/16x16/apps/kfind.png
share/icons/hicolor/16x16/apps/konqueror.png
-share/icons/hicolor/22x22/apps/kappfinder.png
share/icons/hicolor/22x22/apps/kfind.png
share/icons/hicolor/22x22/apps/konqueror.png
-share/icons/hicolor/32x32/apps/kappfinder.png
share/icons/hicolor/32x32/apps/kfind.png
share/icons/hicolor/32x32/apps/konqueror.png
-share/icons/hicolor/48x48/apps/kappfinder.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/konqueror.png
-share/icons/hicolor/64x64/apps/kappfinder.png
share/icons/hicolor/64x64/apps/kfind.png
share/icons/hicolor/64x64/apps/konqueror.png
share/icons/hicolor/scalable/apps/konqueror.svgz
-share/icons/oxygen/128x128/apps/applixware.png
-share/icons/oxygen/128x128/apps/clanbomber.png
-share/icons/oxygen/128x128/apps/email.png
-share/icons/oxygen/128x128/apps/gimp.png
-share/icons/oxygen/128x128/apps/licq.png
-share/icons/oxygen/128x128/apps/netscape.png
-share/icons/oxygen/128x128/apps/penguin.png
-share/icons/oxygen/128x128/apps/staroffice.png
-share/icons/oxygen/128x128/apps/terminal.png
-share/icons/oxygen/128x128/apps/tux.png
-share/icons/oxygen/128x128/apps/wp.png
-share/icons/oxygen/128x128/apps/xclock.png
-share/icons/oxygen/128x128/apps/xfmail.png
-share/icons/oxygen/128x128/apps/xmag.png
-share/icons/oxygen/16x16/apps/abiword.png
-share/icons/oxygen/16x16/apps/alevt.png
-share/icons/oxygen/16x16/apps/applixware.png
-share/icons/oxygen/16x16/apps/assistant.png
-share/icons/oxygen/16x16/apps/blender.png
-share/icons/oxygen/16x16/apps/bluefish.png
-share/icons/oxygen/16x16/apps/clanbomber.png
-share/icons/oxygen/16x16/apps/designer.png
-share/icons/oxygen/16x16/apps/dia.png
-share/icons/oxygen/16x16/apps/eclipse.png
-share/icons/oxygen/16x16/apps/emacs.png
-share/icons/oxygen/16x16/apps/email.png
-share/icons/oxygen/16x16/apps/evolution.png
-share/icons/oxygen/16x16/apps/gabber.png
-share/icons/oxygen/16x16/apps/gaim.png
-share/icons/oxygen/16x16/apps/gimp.png
-share/icons/oxygen/16x16/apps/gnomemeeting.png
-share/icons/oxygen/16x16/apps/gnucash.png
-share/icons/oxygen/16x16/apps/gnumeric.png
-share/icons/oxygen/16x16/apps/gv.png
-share/icons/oxygen/16x16/apps/gvim.png
-share/icons/oxygen/16x16/apps/licq.png
-share/icons/oxygen/16x16/apps/linguist.png
-share/icons/oxygen/16x16/apps/lyx.png
-share/icons/oxygen/16x16/apps/netscape.png
-share/icons/oxygen/16x16/apps/opera.png
-share/icons/oxygen/16x16/apps/pan.png
-share/icons/oxygen/16x16/apps/penguin.png
-share/icons/oxygen/16x16/apps/plan.png
-share/icons/oxygen/16x16/apps/planner.png
-share/icons/oxygen/16x16/apps/pybliographic.png
-share/icons/oxygen/16x16/apps/realplayer.png
-share/icons/oxygen/16x16/apps/sodipodi.png
-share/icons/oxygen/16x16/apps/terminal.png
-share/icons/oxygen/16x16/apps/tux.png
-share/icons/oxygen/16x16/apps/wp.png
-share/icons/oxygen/16x16/apps/xcalc.png
-share/icons/oxygen/16x16/apps/xchat.png
-share/icons/oxygen/16x16/apps/xclipboard.png
-share/icons/oxygen/16x16/apps/xclock.png
-share/icons/oxygen/16x16/apps/xedit.png
-share/icons/oxygen/16x16/apps/xemacs.png
-share/icons/oxygen/16x16/apps/xeyes.png
-share/icons/oxygen/16x16/apps/xfig.png
-share/icons/oxygen/16x16/apps/xfmail.png
-share/icons/oxygen/16x16/apps/xload.png
-share/icons/oxygen/16x16/apps/xmag.png
-share/icons/oxygen/16x16/apps/xmms.png
-share/icons/oxygen/16x16/apps/xosview.png
-share/icons/oxygen/16x16/apps/xpaint.png
-share/icons/oxygen/16x16/apps/xv.png
-share/icons/oxygen/22x22/apps/email.png
-share/icons/oxygen/32x32/apps/abiword.png
-share/icons/oxygen/32x32/apps/alevt.png
-share/icons/oxygen/32x32/apps/applixware.png
-share/icons/oxygen/32x32/apps/assistant.png
-share/icons/oxygen/32x32/apps/blender.png
-share/icons/oxygen/32x32/apps/bluefish.png
-share/icons/oxygen/32x32/apps/clanbomber.png
-share/icons/oxygen/32x32/apps/designer.png
-share/icons/oxygen/32x32/apps/dia.png
-share/icons/oxygen/32x32/apps/eclipse.png
-share/icons/oxygen/32x32/apps/emacs.png
-share/icons/oxygen/32x32/apps/email.png
-share/icons/oxygen/32x32/apps/evolution.png
-share/icons/oxygen/32x32/apps/gabber.png
-share/icons/oxygen/32x32/apps/gaim.png
-share/icons/oxygen/32x32/apps/galeon.png
-share/icons/oxygen/32x32/apps/gimp.png
-share/icons/oxygen/32x32/apps/gnomemeeting.png
-share/icons/oxygen/32x32/apps/gnucash.png
-share/icons/oxygen/32x32/apps/gnumeric.png
-share/icons/oxygen/32x32/apps/gv.png
-share/icons/oxygen/32x32/apps/gvim.png
-share/icons/oxygen/32x32/apps/licq.png
-share/icons/oxygen/32x32/apps/linguist.png
-share/icons/oxygen/32x32/apps/lyx.png
-share/icons/oxygen/32x32/apps/netscape.png
-share/icons/oxygen/32x32/apps/opera.png
-share/icons/oxygen/32x32/apps/pan.png
-share/icons/oxygen/32x32/apps/penguin.png
-share/icons/oxygen/32x32/apps/pinguin.png
-share/icons/oxygen/32x32/apps/plan.png
-share/icons/oxygen/32x32/apps/planner.png
-share/icons/oxygen/32x32/apps/pybliographic.png
-share/icons/oxygen/32x32/apps/realplayer.png
-share/icons/oxygen/32x32/apps/sodipodi.png
-share/icons/oxygen/32x32/apps/terminal.png
-share/icons/oxygen/32x32/apps/tux.png
-share/icons/oxygen/32x32/apps/wp.png
-share/icons/oxygen/32x32/apps/xawtv.png
-share/icons/oxygen/32x32/apps/xcalc.png
-share/icons/oxygen/32x32/apps/xchat.png
-share/icons/oxygen/32x32/apps/xclipboard.png
-share/icons/oxygen/32x32/apps/xclock.png
-share/icons/oxygen/32x32/apps/xedit.png
-share/icons/oxygen/32x32/apps/xemacs.png
-share/icons/oxygen/32x32/apps/xeyes.png
-share/icons/oxygen/32x32/apps/xfig.png
-share/icons/oxygen/32x32/apps/xfmail.png
-share/icons/oxygen/32x32/apps/xload.png
-share/icons/oxygen/32x32/apps/xmag.png
-share/icons/oxygen/32x32/apps/xmms.png
-share/icons/oxygen/32x32/apps/xosview.png
-share/icons/oxygen/32x32/apps/xpaint.png
-share/icons/oxygen/32x32/apps/xv.png
-share/icons/oxygen/48x48/apps/abiword.png
-share/icons/oxygen/48x48/apps/applixware.png
-share/icons/oxygen/48x48/apps/blender.png
-share/icons/oxygen/48x48/apps/bluefish.png
-share/icons/oxygen/48x48/apps/clanbomber.png
-share/icons/oxygen/48x48/apps/designer.png
-share/icons/oxygen/48x48/apps/dia.png
-share/icons/oxygen/48x48/apps/eclipse.png
-share/icons/oxygen/48x48/apps/emacs.png
-share/icons/oxygen/48x48/apps/email.png
-share/icons/oxygen/48x48/apps/evolution.png
-share/icons/oxygen/48x48/apps/gabber.png
-share/icons/oxygen/48x48/apps/gaim.png
-share/icons/oxygen/48x48/apps/galeon.png
-share/icons/oxygen/48x48/apps/gimp.png
-share/icons/oxygen/48x48/apps/gnomemeeting.png
-share/icons/oxygen/48x48/apps/gnucash.png
-share/icons/oxygen/48x48/apps/gnumeric.png
-share/icons/oxygen/48x48/apps/gvim.png
-share/icons/oxygen/48x48/apps/licq.png
-share/icons/oxygen/48x48/apps/netscape.png
-share/icons/oxygen/48x48/apps/opera.png
-share/icons/oxygen/48x48/apps/pan.png
-share/icons/oxygen/48x48/apps/penguin.png
-share/icons/oxygen/48x48/apps/planner.png
-share/icons/oxygen/48x48/apps/sodipodi.png
-share/icons/oxygen/48x48/apps/staroffice.png
-share/icons/oxygen/48x48/apps/terminal.png
-share/icons/oxygen/48x48/apps/tux.png
-share/icons/oxygen/48x48/apps/wp.png
-share/icons/oxygen/48x48/apps/xchat.png
-share/icons/oxygen/48x48/apps/xclock.png
-share/icons/oxygen/48x48/apps/xedit.png
-share/icons/oxygen/48x48/apps/xemacs.png
-share/icons/oxygen/48x48/apps/xfmail.png
-share/icons/oxygen/48x48/apps/xmag.png
-share/icons/oxygen/48x48/apps/xv.png
-share/icons/oxygen/64x64/apps/applixware.png
-share/icons/oxygen/64x64/apps/clanbomber.png
-share/icons/oxygen/64x64/apps/email.png
-share/icons/oxygen/64x64/apps/gimp.png
-share/icons/oxygen/64x64/apps/gvim.png
-share/icons/oxygen/64x64/apps/licq.png
-share/icons/oxygen/64x64/apps/netscape.png
-share/icons/oxygen/64x64/apps/penguin.png
-share/icons/oxygen/64x64/apps/staroffice.png
-share/icons/oxygen/64x64/apps/terminal.png
-share/icons/oxygen/64x64/apps/tux.png
-share/icons/oxygen/64x64/apps/wp.png
-share/icons/oxygen/64x64/apps/xclock.png
-share/icons/oxygen/64x64/apps/xfmail.png
-share/icons/oxygen/64x64/apps/xmag.png
-share/icons/oxygen/scalable/apps/aim.svgz
-share/icons/oxygen/scalable/apps/antivirus.svgz
-share/icons/oxygen/scalable/apps/applixware.svgz
-share/icons/oxygen/scalable/apps/browser.svgz
-share/icons/oxygen/scalable/apps/camera.svgz
-share/icons/oxygen/scalable/apps/clanbomber.svgz
-share/icons/oxygen/scalable/apps/clock.svgz
-share/icons/oxygen/scalable/apps/core.svgz
-share/icons/oxygen/scalable/apps/display.svgz
-share/icons/oxygen/scalable/apps/download_manager.svgz
-share/icons/oxygen/scalable/apps/email.svgz
-share/icons/oxygen/scalable/apps/galeon.svgz
-share/icons/oxygen/scalable/apps/netscape.svgz
-share/icons/oxygen/scalable/apps/penguin.svgz
-share/icons/oxygen/scalable/apps/personal.svgz
-share/icons/oxygen/scalable/apps/realplayer.svgz
-share/icons/oxygen/scalable/apps/shell.svgz
-share/icons/oxygen/scalable/apps/staroffice.svgz
-share/icons/oxygen/scalable/apps/terminal.svgz
-share/icons/oxygen/scalable/apps/tux.svgz
-share/icons/oxygen/scalable/apps/xcalc.svgz
-share/icons/oxygen/scalable/apps/xchat.svgz
-share/icons/oxygen/scalable/apps/xclock.svgz
-share/icons/oxygen/scalable/apps/xeyes.svgz
-share/icons/oxygen/scalable/apps/xpaint.svgz
share/kde4/services/ServiceMenus/konsolehere.desktop
share/kde4/services/bookmarks.desktop
share/kde4/services/cache.desktop
share/kde4/services/cookies.desktop
-share/kde4/services/desktoppath.desktop
-share/kde4/services/devices.desktop
-share/kde4/services/dma.desktop
share/kde4/services/dolphinpart.desktop
share/kde4/services/ebrowsing.desktop
share/kde4/services/filebehavior.desktop
-share/kde4/services/fileviewsvnplugin.desktop
-share/kde4/services/interrupts.desktop
-share/kde4/services/ioports.desktop
-share/kde4/services/ioslaveinfo.desktop
-share/kde4/services/kcm_memory.desktop
-share/kde4/services/kcm_partition.desktop
-share/kde4/services/kcm_pci.desktop
share/kde4/services/kcm_useraccount.desktop
share/kde4/services/kcmdolphingeneral.desktop
share/kde4/services/kcmdolphinnavigation.desktop
@@ -795,11 +286,8 @@ share/kde4/services/kcmdolphinviewmodes.desktop
share/kde4/services/kcmhistory.desktop
share/kde4/services/kcmkonqyperformance.desktop
share/kde4/services/kcmperformance.desktop
-share/kde4/services/kcmsolidproc.desktop
-share/kde4/services/kcmusb.desktop
share/kde4/services/kded/favicons.desktop
share/kde4/services/kded/konqy_preloader.desktop
-share/kde4/services/kfindpart.desktop
share/kde4/services/khtml_appearance.desktop
share/kde4/services/khtml_behavior.desktop
share/kde4/services/khtml_filter.desktop
@@ -811,19 +299,16 @@ share/kde4/services/konq_sidebartng.desktop
share/kde4/services/konqueror.desktop
share/kde4/services/konsolepart.desktop
share/kde4/services/netpref.desktop
-share/kde4/services/nic.desktop
-share/kde4/services/opengl.desktop
share/kde4/services/plasma-applet-folderview.desktop
share/kde4/services/proxy.desktop
-share/kde4/services/scsi.desktop
share/kde4/services/smb.desktop
-share/kde4/services/smbstatus.desktop
-share/kde4/services/sound.desktop
share/kde4/services/useragent.desktop
share/kde4/services/useragentstrings/android10.desktop
share/kde4/services/useragentstrings/chrome10onwinnt51.desktop
+share/kde4/services/useragentstrings/chrome50oncurrent.desktop
share/kde4/services/useragentstrings/firefox20oncurrent.desktop
share/kde4/services/useragentstrings/firefox30oncurrent.desktop
+share/kde4/services/useragentstrings/firefox36oncurrent.desktop
share/kde4/services/useragentstrings/googlebot.desktop
share/kde4/services/useragentstrings/ie401onwinnt4.desktop
share/kde4/services/useragentstrings/ie50onppc.desktop
@@ -844,11 +329,10 @@ share/kde4/services/useragentstrings/op962oncurrent.desktop
share/kde4/services/useragentstrings/safari20.desktop
share/kde4/services/useragentstrings/safari30oniphone.desktop
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/xserver.desktop
share/kde4/servicetypes/fileviewversioncontrolplugin.desktop
-share/kde4/servicetypes/findpart.desktop
share/kde4/servicetypes/konqaboutpage.desktop
share/kde4/servicetypes/konqdndpopupmenuplugin.desktop
share/kde4/servicetypes/konqpopupmenuplugin.desktop
@@ -886,31 +370,13 @@ share/templates/linkZIP.desktop
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/konsole
@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kinfocenter/xserver
-@dirrm share/doc/HTML/en/kinfocenter/view1394
-@dirrm share/doc/HTML/en/kinfocenter/usb
-@dirrm share/doc/HTML/en/kinfocenter/sound
-@dirrm share/doc/HTML/en/kinfocenter/scsi
-@dirrm share/doc/HTML/en/kinfocenter/samba
-@dirrm share/doc/HTML/en/kinfocenter/protocols
-@dirrm share/doc/HTML/en/kinfocenter/processor
-@dirrm share/doc/HTML/en/kinfocenter/pci
-@dirrm share/doc/HTML/en/kinfocenter/partitions
-@dirrm share/doc/HTML/en/kinfocenter/opengl
-@dirrm share/doc/HTML/en/kinfocenter/nics
-@dirrm share/doc/HTML/en/kinfocenter/memory
-@dirrm share/doc/HTML/en/kinfocenter/ioports
-@dirrm share/doc/HTML/en/kinfocenter/interrupts
-@dirrm share/doc/HTML/en/kinfocenter/dma
-@dirrm share/doc/HTML/en/kinfocenter/devices
-@dirrm share/doc/HTML/en/kinfocenter
@dirrm share/doc/HTML/en/kfind
@dirrm share/doc/HTML/en/kdepasswd
@dirrm share/doc/HTML/en/dolphin
@dirrm share/apps/plugin
@dirrm share/apps/kwrite
-%%WEBKIT%%@dirrmtry share/apps/kwebkitpart/kpartplugins
-%%WEBKIT%%@dirrmtry share/apps/kwebkitpart
+@dirrmtry share/apps/kwebkitpart/kpartplugins
+@dirrmtry share/apps/kwebkitpart
@dirrm share/apps/konsole
@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@@ -921,33 +387,9 @@ share/templates/linkZIP.desktop
@dirrm share/apps/konqsidebartng/plugins
@dirrm share/apps/konqsidebartng/entries
@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/kinfocenter/about
-@dirrm share/apps/kinfocenter
@dirrm share/apps/keditbookmarks
-@dirrm share/apps/kcmusb
@dirrm share/apps/kcmcss
@dirrm share/apps/kbookmark
-@dirrm share/apps/kappfinder/apps/Utilities/XUtilities
-@dirrm share/apps/kappfinder/apps/Utilities
-@dirrm share/apps/kappfinder/apps/Toys
-@dirrm share/apps/kappfinder/apps/System/Terminal
-@dirrm share/apps/kappfinder/apps/System
-@dirrm share/apps/kappfinder/apps/Office
-@dirrm share/apps/kappfinder/apps/Multimedia
-@dirrm share/apps/kappfinder/apps/Internet/Terminal
-@dirrm share/apps/kappfinder/apps/Internet
-@dirrm share/apps/kappfinder/apps/Graphics
-@dirrm share/apps/kappfinder/apps/Games/TacticStrategy
-@dirrm share/apps/kappfinder/apps/Games/Roguelikes
-@dirrm share/apps/kappfinder/apps/Games/Emulators
-@dirrm share/apps/kappfinder/apps/Games/Card
-@dirrm share/apps/kappfinder/apps/Games/Board
-@dirrm share/apps/kappfinder/apps/Games/Arcade
-@dirrm share/apps/kappfinder/apps/Games
-@dirrm share/apps/kappfinder/apps/Editors
-@dirrm share/apps/kappfinder/apps/Development
-@dirrm share/apps/kappfinder/apps
-@dirrm share/apps/kappfinder
-@dirrm share/apps/dolphinpart/kpartplugins
-@dirrm share/apps/dolphinpart
-@dirrm share/apps/dolphin
+@dirrmtry share/apps/dolphinpart/kpartplugins
+@dirrmtry share/apps/dolphinpart
+@dirrmtry share/apps/dolphin
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 41e0a9134c0e..213bc04c4e80 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -25,9 +24,11 @@ LIB_DEPENDS= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
ssh.4:${PORTSDIR}/security/libssh \
attica.0:${PORTSDIR}/x11-toolkits/attica
#explicitly depend on libssh to avoid interference with ssh.4 from compat7x
-BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
+BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh \
+ ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
+RUN_DEPENDS= cagibid:${PORTSDIR}/net/cagibi
-USE_KDE4= kdelibs kdeprefix kdehier automoc4 #pimlibs
+USE_KDE4= kdelibs kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
@@ -37,10 +38,11 @@ USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
MAN1= kdesu.1
+MAN8= nepomukserver.8 nepomukservicestub.8
SUB_FILES= nepomuk-env.sh
-OPTIONS= PULSEAUDIO "Enable playback via PulseAudio soundserver" off \
+OPTIONS= PULSEAUDIO "Enable playback via PulseAudio sound server" off \
VIRTUOSO "Install Virtuoso server (required for Nepomuk)" off
# Explicitly disable alsa, see for details:
@@ -64,15 +66,6 @@ CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
RUN_DEPENDS+= ${LOCALBASE}/bin/virtuoso-t:${PORTSDIR}/databases/virtuoso
.endif
-.if exists(${LOCALBASE}/lib/soprano/libsoprano_virtuosobackend.so)
-CMAKE_ARGS+= -DWITH_Nepomuk:BOOL=ON
-MAN8= nepomukserver.8 nepomukservicestub.8
-PLIST_SUB+= NEPOMUK=""
-.else
-CMAKE_ARGS+= -DWITH_Nepomuk:BOOL=OFF
-PLIST_SUB+= NEPOMUK="@comment "
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
${PATCH_WRKSRC}/khelpcenter/infotree.cpp \
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 35861ff8dc78..253a1cbeff89 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.4.5.tar.bz2) = 6f2bfc771ff5143b89f5a5709d4cca69
-SHA256 (KDE/kdebase-runtime-4.4.5.tar.bz2) = 3d3be43d2f53b40dea7fc566f1f5b07b30fcc6b4c69ad77c1e1be13637781428
-SIZE (KDE/kdebase-runtime-4.4.5.tar.bz2) = 7332344
+MD5 (KDE/kdebase-runtime-4.5.1.tar.bz2) = 83542744f8a23ff2b2621d152ce38fcc
+SHA256 (KDE/kdebase-runtime-4.5.1.tar.bz2) = 3f975db0f6b165f24d53495294fce4f317aeb036653d16fd561950e77ef757ba
+SIZE (KDE/kdebase-runtime-4.5.1.tar.bz2) = 5750512
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index 1db3aa271f1d..a0fcaa9eb4d0 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -24,11 +24,12 @@ bin/ktrash
bin/kuiserver
bin/kwalletd
bin/kwriteconfig
-%%NEPOMUK%%bin/nepomukserver
-%%NEPOMUK%%bin/nepomukservicestub
+bin/nepomukserver
+bin/nepomukservicestub
bin/plasmapkg
bin/solid-hardware
env/nepomuk-env.sh
+etc/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
etc/xdg/menus/kde-information.menu
lib/attica_kde.so
lib/kconf_update_bin/phonon_devicepreference_update
@@ -52,16 +53,17 @@ lib/kde4/kcm_kded.so
lib/kde4/kcm_kdnssd.so
lib/kde4/kcm_knotify.so
lib/kde4/kcm_locale.so
-%%NEPOMUK%%lib/kde4/kcm_nepomuk.so
+lib/kde4/kcm_nepomuk.so
lib/kde4/kcm_phonon.so
lib/kde4/kcm_phononxine.so
lib/kde4/kcm_trash.so
lib/kde4/kcmspellchecking.so
+lib/kde4/kded_activitymanager.so
lib/kde4/kded_desktopnotifier.so
lib/kde4/kded_device_automounter.so
lib/kde4/kded_kpasswdserver.so
lib/kde4/kded_ktimezoned.so
-%%NEPOMUK%%lib/kde4/kded_nepomuksearchmodule.so
+lib/kde4/kded_nepomuksearchmodule.so
lib/kde4/kded_networkwatcher.so
lib/kde4/kded_phononserver.so
lib/kde4/kded_remotedirnotify.so
@@ -79,8 +81,8 @@ lib/kde4/kio_fish.so
lib/kde4/kio_floppy.so
lib/kde4/kio_info.so
lib/kde4/kio_man.so
-%%NEPOMUK%%lib/kde4/kio_nepomuk.so
-%%NEPOMUK%%lib/kde4/kio_nepomuksearch.so
+lib/kde4/kio_nepomuk.so
+lib/kde4/kio_nepomuksearch.so
lib/kde4/kio_network.so
lib/kde4/kio_nfs.so
lib/kde4/kio_remote.so
@@ -88,16 +90,17 @@ lib/kde4/kio_settings.so
lib/kde4/kio_sftp.so
lib/kde4/kio_smb.so
lib/kde4/kio_thumbnail.so
-%%NEPOMUK%%lib/kde4/kio_timeline.so
+lib/kde4/kio_timeline.so
lib/kde4/kio_trash.so
lib/kde4/kshorturifilter.so
-lib/kde4/kstyle_oxygen_config.so
lib/kde4/kuriikwsfilter.so
lib/kde4/kurisearchfilter.so
lib/kde4/libexec/drkonqi
+lib/kde4/libexec/kcmremotewidgetshelper
lib/kde4/libexec/kdeeject
lib/kde4/libexec/kdesu
lib/kde4/libexec/kdesud
+lib/kde4/libexec/kdontchangethehostname
lib/kde4/libexec/khc_docbookdig.pl
lib/kde4/libexec/khc_htdig.pl
lib/kde4/libexec/khc_htsearch.pl
@@ -110,18 +113,18 @@ lib/kde4/libkmanpart.so
lib/kde4/librenaudioplugin.so
lib/kde4/librenimageplugin.so
lib/kde4/localdomainurifilter.so
-%%NEPOMUK%%lib/kde4/nepomukfilewatch.so
-%%NEPOMUK%%lib/kde4/nepomukmigration1.so
-%%NEPOMUK%%lib/kde4/nepomukontologyloader.so
-%%NEPOMUK%%lib/kde4/nepomukqueryservice.so
-%%NEPOMUK%%lib/kde4/nepomukremovablestorageservice.so
-%%NEPOMUK%%lib/kde4/nepomukstorage.so
-%%NEPOMUK%%lib/kde4/nepomukstrigiservice.so
+lib/kde4/nepomukactivitiesservice.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_appletscript_simple_javascript.so
lib/kde4/plasma_dataenginescript_javascript.so
lib/kde4/plasma_runnerscript_javascript.so
lib/kde4/plugins/phonon_platform/kde.so
-lib/kde4/plugins/styles/oxygen.so
lib/kde4/svgthumbnail.so
lib/kde4/textthumbnail.so
lib/kde4/windowsexethumbnail.so
@@ -131,14 +134,15 @@ lib/libkdeinit4_kglobalaccel.so
lib/libkdeinit4_khelpcenter.so
lib/libkdeinit4_kuiserver.so
lib/libkdeinit4_kwalletd.so
-%%NEPOMUK%%lib/libkdeinit4_nepomukserver.so
+lib/libkdeinit4_nepomukserver.so
lib/libkwalletbackend.so
lib/libkwalletbackend.so.5
lib/libkwalletbackend.so.5.0.1
lib/libmolletnetwork.so
lib/libmolletnetwork.so.5
lib/libmolletnetwork.so.5.0.1
-%%NEPOMUK%%lib/strigi/strigiindex_nepomukbackend.so
+lib/strigi/strigiindex_nepomukbackend.so
+share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
share/applications/kde4/Help.desktop
share/applications/kde4/knetattach.desktop
share/apps/cmake/modules/FindCLucene.cmake
@@ -148,6 +152,15 @@ share/apps/desktoptheme/default/dialogs/background.svgz
share/apps/desktoptheme/default/dialogs/kickoff.svgz
share/apps/desktoptheme/default/dialogs/krunner.svgz
share/apps/desktoptheme/default/dialogs/shutdowndialog.svgz
+share/apps/desktoptheme/default/icons/audio.svgz
+share/apps/desktoptheme/default/icons/battery.svgz
+share/apps/desktoptheme/default/icons/device.svgz
+share/apps/desktoptheme/default/icons/klipper.svgz
+share/apps/desktoptheme/default/icons/nepomuk.svgz
+share/apps/desktoptheme/default/icons/network.svgz
+share/apps/desktoptheme/default/icons/notification.svgz
+share/apps/desktoptheme/default/icons/preferences.svgz
+share/apps/desktoptheme/default/icons/wallet.svgz
share/apps/desktoptheme/default/metadata.desktop
share/apps/desktoptheme/default/opaque/dialogs/background.svgz
share/apps/desktoptheme/default/opaque/dialogs/krunner.svgz
@@ -155,6 +168,10 @@ share/apps/desktoptheme/default/opaque/dialogs/shutdowndialog.svgz
share/apps/desktoptheme/default/opaque/widgets/extender-background.svgz
share/apps/desktoptheme/default/opaque/widgets/panel-background.svgz
share/apps/desktoptheme/default/opaque/widgets/tooltip.svgz
+share/apps/desktoptheme/default/translucent/dialogs/background.svgz
+share/apps/desktoptheme/default/translucent/dialogs/krunner.svgz
+share/apps/desktoptheme/default/translucent/widgets/panel-background.svgz
+share/apps/desktoptheme/default/translucent/widgets/tooltip.svgz
share/apps/desktoptheme/default/widgets/action-overlays.svgz
share/apps/desktoptheme/default/widgets/analog_meter.svgz
share/apps/desktoptheme/default/widgets/arrows.svgz
@@ -173,6 +190,7 @@ share/apps/desktoptheme/default/widgets/extender-background.svgz
share/apps/desktoptheme/default/widgets/extender-dragger.svgz
share/apps/desktoptheme/default/widgets/frame.svgz
share/apps/desktoptheme/default/widgets/glowbar.svgz
+share/apps/desktoptheme/default/widgets/identiconshapes.svgz
share/apps/desktoptheme/default/widgets/line.svgz
share/apps/desktoptheme/default/widgets/lineedit.svgz
share/apps/desktoptheme/default/widgets/monitor.svgz
@@ -240,6 +258,7 @@ share/apps/drkonqi/debuggers/external/kdbgrc
share/apps/drkonqi/debuggers/internal/gdbrc
share/apps/drkonqi/mappings
share/apps/drkonqi/pics/crash.png
+share/apps/hardwarenotifications/hardwarenotifications.notifyrc
share/apps/kcm_componentchooser/kcm_browser.desktop
share/apps/kcm_componentchooser/kcm_filemanager.desktop
share/apps/kcm_componentchooser/kcm_kemail.desktop
@@ -269,20 +288,12 @@ share/apps/khelpcenter/plugins/Manpages/man9.desktop
share/apps/khelpcenter/plugins/Manpages/mann.desktop
share/apps/khelpcenter/plugins/Scrollkeeper/.directory
share/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop
-share/apps/khelpcenter/plugins/Tutorials/.directory
-share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
-share/apps/khelpcenter/plugins/Tutorials/visualdict.desktop
-share/apps/khelpcenter/plugins/contact.desktop
-share/apps/khelpcenter/plugins/faq.desktop
share/apps/khelpcenter/plugins/info.desktop
share/apps/khelpcenter/plugins/kcontrolmodules.desktop
share/apps/khelpcenter/plugins/kicmodules.desktop
share/apps/khelpcenter/plugins/kioslaves.desktop
-share/apps/khelpcenter/plugins/links.desktop
+share/apps/khelpcenter/plugins/onlinehelp.desktop
share/apps/khelpcenter/plugins/plasma.desktop
-share/apps/khelpcenter/plugins/support.desktop
-share/apps/khelpcenter/plugins/userguide.desktop
-share/apps/khelpcenter/plugins/welcome.desktop
share/apps/khelpcenter/searchhandlers/docbook.desktop
share/apps/khelpcenter/searchhandlers/htdig.desktop
share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
@@ -303,21 +314,14 @@ share/apps/ksmserver/windowmanagers/compiz-custom.desktop
share/apps/ksmserver/windowmanagers/compiz.desktop
share/apps/ksmserver/windowmanagers/metacity.desktop
share/apps/ksmserver/windowmanagers/openbox.desktop
-share/apps/kstyle/themes/oxygen.themerc
-share/apps/kstyle/themes/qtcde.themerc
-share/apps/kstyle/themes/qtcleanlooks.themerc
-share/apps/kstyle/themes/qtgtk.themerc
-share/apps/kstyle/themes/qtmotif.themerc
-share/apps/kstyle/themes/qtplastique.themerc
-share/apps/kstyle/themes/qtwindows.themerc
share/apps/kwalletd/kwalletd.notifyrc
share/apps/libphonon/hardwaredatabase
-%%NEPOMUK%%share/apps/nepomukstorage/nepomukstorage.notifyrc
-%%NEPOMUK%%share/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
+share/apps/nepomukstorage/nepomukstorage.notifyrc
+share/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
share/apps/phonon/phonon.notifyrc
share/apps/remoteview/network.desktop
share/apps/remoteview/smb-network.desktop
-%%NEPOMUK%%share/autostart/nepomukserver.desktop
+share/autostart/nepomukserver.desktop
share/config.kcfg/khelpcenter.kcfg
share/config/emoticons.knsrc
share/config/icons.knsrc
@@ -325,18 +329,20 @@ share/config/khotnewstuff.knsrc
share/config/khotnewstuff_upload.knsrc
share/config/kshorturifilterrc
share/dbus-1/interfaces/org.kde.KTimeZoned.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.NepomukServer.xml
+share/dbus-1/interfaces/org.kde.NepomukServer.xml
share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.Query.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.RemovableStorage.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.Strigi.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.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.network.kioslavenotifier.xml
share/dbus-1/services/org.kde.knotify.service
+share/dbus-1/services/org.kde.kuiserver.service
+share/dbus-1/system-services/org.kde.kcontrol.kcmremotewidgets.service
share/desktop-directories/kde-development-translation.directory
share/desktop-directories/kde-development-webdevelopment.directory
share/desktop-directories/kde-development.directory
@@ -404,9 +410,6 @@ share/doc/HTML/en/kcontrol/filemanager/index.docbook
share/doc/HTML/en/kcontrol/filetypes/common
share/doc/HTML/en/kcontrol/filetypes/index.cache.bz2
share/doc/HTML/en/kcontrol/filetypes/index.docbook
-share/doc/HTML/en/kcontrol/helpindex/common
-share/doc/HTML/en/kcontrol/helpindex/index.cache.bz2
-share/doc/HTML/en/kcontrol/helpindex/index.docbook
share/doc/HTML/en/kcontrol/history/common
share/doc/HTML/en/kcontrol/history/index.cache.bz2
share/doc/HTML/en/kcontrol/history/index.docbook
@@ -453,16 +456,12 @@ share/doc/HTML/en/kcontrol/khtml-plugins/index.docbook
share/doc/HTML/en/kcontrol/language/common
share/doc/HTML/en/kcontrol/language/index.cache.bz2
share/doc/HTML/en/kcontrol/language/index.docbook
-%%NEPOMUK%%share/doc/HTML/en/kcontrol/nepomuk/common
-%%NEPOMUK%%share/doc/HTML/en/kcontrol/nepomuk/index.cache.bz2
-%%NEPOMUK%%share/doc/HTML/en/kcontrol/nepomuk/index.docbook
+share/doc/HTML/en/kcontrol/nepomuk/common
+share/doc/HTML/en/kcontrol/nepomuk/index.cache.bz2
+share/doc/HTML/en/kcontrol/nepomuk/index.docbook
share/doc/HTML/en/kcontrol/netpref/common
share/doc/HTML/en/kcontrol/netpref/index.cache.bz2
share/doc/HTML/en/kcontrol/netpref/index.docbook
-share/doc/HTML/en/kcontrol/paths/common
-share/doc/HTML/en/kcontrol/paths/index.cache.bz2
-share/doc/HTML/en/kcontrol/paths/index.docbook
-share/doc/HTML/en/kcontrol/paths/paths.png
share/doc/HTML/en/kcontrol/performance/common
share/doc/HTML/en/kcontrol/performance/index.cache.bz2
share/doc/HTML/en/kcontrol/performance/index.docbook
@@ -497,35 +496,10 @@ share/doc/HTML/en/kdesu/man-kdesu.1.docbook
share/doc/HTML/en/khelpcenter/background.png
share/doc/HTML/en/khelpcenter/bgtable.png
share/doc/HTML/en/khelpcenter/common
-share/doc/HTML/en/khelpcenter/contact.docbook
-share/doc/HTML/en/khelpcenter/faq/about.docbook
-share/doc/HTML/en/khelpcenter/faq/common
-share/doc/HTML/en/khelpcenter/faq/configkde.docbook
-share/doc/HTML/en/khelpcenter/faq/contrib.docbook
-share/doc/HTML/en/khelpcenter/faq/desktop.docbook
-share/doc/HTML/en/khelpcenter/faq/filemng.docbook
-share/doc/HTML/en/khelpcenter/faq/getkde.docbook
-share/doc/HTML/en/khelpcenter/faq/index.cache.bz2
-share/doc/HTML/en/khelpcenter/faq/index.docbook
-share/doc/HTML/en/khelpcenter/faq/install.docbook
-share/doc/HTML/en/khelpcenter/faq/intro.docbook
-share/doc/HTML/en/khelpcenter/faq/kdeapps.docbook
-share/doc/HTML/en/khelpcenter/faq/misc.docbook
-share/doc/HTML/en/khelpcenter/faq/moreinfo.docbook
-share/doc/HTML/en/khelpcenter/faq/nonkdeapps.docbook
-share/doc/HTML/en/khelpcenter/faq/notrelated.docbook
-share/doc/HTML/en/khelpcenter/faq/panel.docbook
-share/doc/HTML/en/khelpcenter/faq/qt.docbook
-share/doc/HTML/en/khelpcenter/faq/questions.docbook
-share/doc/HTML/en/khelpcenter/faq/sound.docbook
-share/doc/HTML/en/khelpcenter/faq/tips.docbook
-share/doc/HTML/en/khelpcenter/faq/webbrowse.docbook
-share/doc/HTML/en/khelpcenter/faq/winmng.docbook
share/doc/HTML/en/khelpcenter/glossary/common
share/doc/HTML/en/khelpcenter/glossary/index.cache.bz2
share/doc/HTML/en/khelpcenter/glossary/index.docbook
share/doc/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook
-share/doc/HTML/en/khelpcenter/help.docbook
share/doc/HTML/en/khelpcenter/index.cache.bz2
share/doc/HTML/en/khelpcenter/index.docbook
share/doc/HTML/en/khelpcenter/kdelogo2.png
@@ -533,123 +507,7 @@ share/doc/HTML/en/khelpcenter/khelpcenter.png
share/doc/HTML/en/khelpcenter/lines.png
share/doc/HTML/en/khelpcenter/lines2.png
share/doc/HTML/en/khelpcenter/pointers.png
-share/doc/HTML/en/khelpcenter/quickstart/common
-share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2
-share/doc/HTML/en/khelpcenter/quickstart/index.docbook
share/doc/HTML/en/khelpcenter/shadow1.png
-share/doc/HTML/en/khelpcenter/support.docbook
-share/doc/HTML/en/khelpcenter/userguide/a-window.png
-share/doc/HTML/en/khelpcenter/userguide/accessibility.docbook
-share/doc/HTML/en/khelpcenter/userguide/amarok-icon.png
-share/doc/HTML/en/khelpcenter/userguide/amarok.png
-share/doc/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
-share/doc/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
-share/doc/HTML/en/khelpcenter/userguide/burning-cds.docbook
-share/doc/HTML/en/khelpcenter/userguide/common
-share/doc/HTML/en/khelpcenter/userguide/control-center.docbook
-share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook
-share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook
-share/doc/HTML/en/khelpcenter/userguide/customizing-desktop.docbook
-share/doc/HTML/en/khelpcenter/userguide/desktop.png
-share/doc/HTML/en/khelpcenter/userguide/email.docbook
-share/doc/HTML/en/khelpcenter/userguide/extragear-applications.docbook
-share/doc/HTML/en/khelpcenter/userguide/file-sharing.docbook
-share/doc/HTML/en/khelpcenter/userguide/font-installation.docbook
-share/doc/HTML/en/khelpcenter/userguide/getting-help.docbook
-share/doc/HTML/en/khelpcenter/userguide/glossary.docbook
-share/doc/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
-share/doc/HTML/en/khelpcenter/userguide/index.cache.bz2
-share/doc/HTML/en/khelpcenter/userguide/index.docbook
-share/doc/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
-share/doc/HTML/en/khelpcenter/userguide/juk-icon.png
-share/doc/HTML/en/khelpcenter/userguide/juk.png
-share/doc/HTML/en/khelpcenter/userguide/kaboodle-icon.png
-share/doc/HTML/en/khelpcenter/userguide/kaboodle.png
-share/doc/HTML/en/khelpcenter/userguide/kcalc-systray.png
-share/doc/HTML/en/khelpcenter/userguide/kcontrol.png
-share/doc/HTML/en/khelpcenter/userguide/kde-as-root.docbook
-share/doc/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
-share/doc/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
-share/doc/HTML/en/khelpcenter/userguide/kde-office.docbook
-share/doc/HTML/en/khelpcenter/userguide/kmag.png
-share/doc/HTML/en/khelpcenter/userguide/kmousetool.png
-share/doc/HTML/en/khelpcenter/userguide/kmouth.png
-share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
-share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
-share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
-share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
-share/doc/HTML/en/khelpcenter/userguide/knode-news-account.png
-share/doc/HTML/en/khelpcenter/userguide/knode-start.png
-share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
-share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
-share/doc/HTML/en/khelpcenter/userguide/konsole-intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/kopete.png
-share/doc/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
-share/doc/HTML/en/khelpcenter/userguide/kppp-wizard.png
-share/doc/HTML/en/khelpcenter/userguide/messaging-intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/migrator-applications.docbook
-share/doc/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
-share/doc/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
-share/doc/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
-share/doc/HTML/en/khelpcenter/userguide/noatun-icon.png
-share/doc/HTML/en/khelpcenter/userguide/noatun.png
-share/doc/HTML/en/khelpcenter/userguide/oggfolder.png
-share/doc/HTML/en/khelpcenter/userguide/open-file-dialog.png
-share/doc/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
-share/doc/HTML/en/khelpcenter/userguide/pdf-files.docbook
-share/doc/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
-share/doc/HTML/en/khelpcenter/userguide/playing-movies.docbook
-share/doc/HTML/en/khelpcenter/userguide/playing-music.docbook
-share/doc/HTML/en/khelpcenter/userguide/printer-setup.docbook
-share/doc/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
-share/doc/HTML/en/khelpcenter/userguide/programs-controlling.docbook
-share/doc/HTML/en/khelpcenter/userguide/removable-disks.docbook
-share/doc/HTML/en/khelpcenter/userguide/rip.png
-share/doc/HTML/en/khelpcenter/userguide/ripsettings.png
-share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook
-share/doc/HTML/en/khelpcenter/userguide/services.png
-share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook
-share/doc/HTML/en/khelpcenter/userguide/splash-screen.png
-share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
-share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook
-share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook
-share/doc/HTML/en/khelpcenter/userguide/titlebar-menu.png
-share/doc/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
-share/doc/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
-share/doc/HTML/en/khelpcenter/userguide/under-the-hood.docbook
-share/doc/HTML/en/khelpcenter/userguide/usenet.docbook
-share/doc/HTML/en/khelpcenter/userguide/where-next.docbook
-share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook
-share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook
-share/doc/HTML/en/khelpcenter/visualdict/common
-share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2
-share/doc/HTML/en/khelpcenter/visualdict/index.docbook
-share/doc/HTML/en/khelpcenter/visualdict/pict1.png
-share/doc/HTML/en/khelpcenter/visualdict/pict10.png
-share/doc/HTML/en/khelpcenter/visualdict/pict11.png
-share/doc/HTML/en/khelpcenter/visualdict/pict12.png
-share/doc/HTML/en/khelpcenter/visualdict/pict13.png
-share/doc/HTML/en/khelpcenter/visualdict/pict14.png
-share/doc/HTML/en/khelpcenter/visualdict/pict15.png
-share/doc/HTML/en/khelpcenter/visualdict/pict16.png
-share/doc/HTML/en/khelpcenter/visualdict/pict17.png
-share/doc/HTML/en/khelpcenter/visualdict/pict18.png
-share/doc/HTML/en/khelpcenter/visualdict/pict19.png
-share/doc/HTML/en/khelpcenter/visualdict/pict2.png
-share/doc/HTML/en/khelpcenter/visualdict/pict20.png
-share/doc/HTML/en/khelpcenter/visualdict/pict21.png
-share/doc/HTML/en/khelpcenter/visualdict/pict22.png
-share/doc/HTML/en/khelpcenter/visualdict/pict23.png
-share/doc/HTML/en/khelpcenter/visualdict/pict3.png
-share/doc/HTML/en/khelpcenter/visualdict/pict4.png
-share/doc/HTML/en/khelpcenter/visualdict/pict5.png
-share/doc/HTML/en/khelpcenter/visualdict/pict6.png
-share/doc/HTML/en/khelpcenter/visualdict/pict7.png
-share/doc/HTML/en/khelpcenter/visualdict/pict8.png
-share/doc/HTML/en/khelpcenter/visualdict/pict9.png
-share/doc/HTML/en/khelpcenter/welcome.docbook
-share/doc/HTML/en/khelpcenter/whatiskde.docbook
share/doc/HTML/en/kioslave/bookmarks/common
share/doc/HTML/en/kioslave/bookmarks/index.cache.bz2
share/doc/HTML/en/kioslave/bookmarks/index.docbook
@@ -692,6 +550,9 @@ share/doc/HTML/en/kioslave/tar/index.docbook
share/doc/HTML/en/kioslave/thumbnail/common
share/doc/HTML/en/kioslave/thumbnail/index.cache.bz2
share/doc/HTML/en/kioslave/thumbnail/index.docbook
+share/doc/HTML/en/kioslave/xz/common
+share/doc/HTML/en/kioslave/xz/index.cache.bz2
+share/doc/HTML/en/kioslave/xz/index.docbook
share/doc/HTML/en/knetattach/common
share/doc/HTML/en/knetattach/index.cache.bz2
share/doc/HTML/en/knetattach/index.docbook
@@ -703,6 +564,9 @@ share/doc/HTML/en/knetattach/screenshot4.png
share/doc/HTML/en/network/common
share/doc/HTML/en/network/index.cache.bz2
share/doc/HTML/en/network/index.docbook
+share/doc/HTML/en/onlinehelp/common
+share/doc/HTML/en/onlinehelp/index.cache.bz2
+share/doc/HTML/en/onlinehelp/index.docbook
share/emoticons/kde4/angry.png
share/emoticons/kde4/bat.png
share/emoticons/kde4/beer.png
@@ -784,18 +648,19 @@ share/kde4/services/info.protocol
share/kde4/services/jpegthumbnail.desktop
share/kde4/services/kcm_attica.desktop
share/kde4/services/kcm_kdnssd.desktop
-%%NEPOMUK%%share/kde4/services/kcm_nepomuk.desktop
+share/kde4/services/kcm_nepomuk.desktop
share/kde4/services/kcm_phonon.desktop
share/kde4/services/kcm_phononxine.desktop
share/kde4/services/kcmcgi.desktop
share/kde4/services/kcmkded.desktop
share/kde4/services/kcmnotify.desktop
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
-%%NEPOMUK%%share/kde4/services/kded/nepomuksearchmodule.desktop
+share/kde4/services/kded/nepomuksearchmodule.desktop
share/kde4/services/kded/networkwatcher.desktop
share/kde4/services/kded/phononserver.desktop
share/kde4/services/kded/remotedirnotify.desktop
@@ -814,15 +679,16 @@ share/kde4/services/language.desktop
share/kde4/services/localdomainurifilter.desktop
share/kde4/services/lzma.protocol
share/kde4/services/man.protocol
-%%NEPOMUK%%share/kde4/services/nepomuk.protocol
-%%NEPOMUK%%share/kde4/services/nepomukfilewatch.desktop
-%%NEPOMUK%%share/kde4/services/nepomukmigration1.desktop
-%%NEPOMUK%%share/kde4/services/nepomukontologyloader.desktop
-%%NEPOMUK%%share/kde4/services/nepomukqueryservice.desktop
-%%NEPOMUK%%share/kde4/services/nepomukremovablestorageservice.desktop
-%%NEPOMUK%%share/kde4/services/nepomuksearch.protocol
-%%NEPOMUK%%share/kde4/services/nepomukstorage.desktop
-%%NEPOMUK%%share/kde4/services/nepomukstrigiservice.desktop
+share/kde4/services/nepomuk.protocol
+share/kde4/services/nepomukactivitiesservice.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
+share/kde4/services/nepomuksearch.protocol
+share/kde4/services/nepomukstorage.desktop
+share/kde4/services/nepomukstrigiservice.desktop
share/kde4/services/network.protocol
share/kde4/services/nfs.protocol
share/kde4/services/plasma-scriptengine-applet-simple-javascript.desktop
@@ -832,15 +698,16 @@ share/kde4/services/programs.protocol
share/kde4/services/remote.protocol
share/kde4/services/renaudiodlg.desktop
share/kde4/services/renimagedlg.desktop
+share/kde4/services/searchproviders/7digital.desktop
share/kde4/services/searchproviders/acronym.desktop
-share/kde4/services/searchproviders/alexa.desktop
-share/kde4/services/searchproviders/alexa_url.desktop
-share/kde4/services/searchproviders/alltheweb.desktop
share/kde4/services/searchproviders/altavista.desktop
+share/kde4/services/searchproviders/amazon.desktop
+share/kde4/services/searchproviders/amazon_mp3.desktop
share/kde4/services/searchproviders/amg.desktop
-share/kde4/services/searchproviders/appsy.desktop
share/kde4/services/searchproviders/austronaut.desktop
share/kde4/services/searchproviders/backports.desktop
+share/kde4/services/searchproviders/beolingus.desktop
+share/kde4/services/searchproviders/blip.desktop
share/kde4/services/searchproviders/bugft.desktop
share/kde4/services/searchproviders/bugno.desktop
share/kde4/services/searchproviders/call.desktop
@@ -857,14 +724,20 @@ share/kde4/services/searchproviders/dictfr.desktop
share/kde4/services/searchproviders/dmoz.desktop
share/kde4/services/searchproviders/docbook.desktop
share/kde4/services/searchproviders/doi.desktop
+share/kde4/services/searchproviders/duckduckgo.desktop
+share/kde4/services/searchproviders/duckduckgo_info.desktop
+share/kde4/services/searchproviders/duckduckgo_shopping.desktop
+share/kde4/services/searchproviders/ecosia.desktop
share/kde4/services/searchproviders/en2de.desktop
share/kde4/services/searchproviders/en2es.desktop
share/kde4/services/searchproviders/en2fr.desktop
share/kde4/services/searchproviders/en2it.desktop
share/kde4/services/searchproviders/es2en.desktop
share/kde4/services/searchproviders/ethicle.desktop
-share/kde4/services/searchproviders/excite.desktop
+share/kde4/services/searchproviders/facebook.desktop
share/kde4/services/searchproviders/feedster.desktop
+share/kde4/services/searchproviders/flickr.desktop
+share/kde4/services/searchproviders/flickrcc.desktop
share/kde4/services/searchproviders/foldoc.desktop
share/kde4/services/searchproviders/fr2de.desktop
share/kde4/services/searchproviders/fr2en.desktop
@@ -872,28 +745,39 @@ share/kde4/services/searchproviders/freedb.desktop
share/kde4/services/searchproviders/freshmeat.desktop
share/kde4/services/searchproviders/froogle.desktop
share/kde4/services/searchproviders/fsd.desktop
+share/kde4/services/searchproviders/github.desktop
+share/kde4/services/searchproviders/gitorious.desktop
share/kde4/services/searchproviders/google.desktop
share/kde4/services/searchproviders/google_advanced.desktop
+share/kde4/services/searchproviders/google_code.desktop
share/kde4/services/searchproviders/google_groups.desktop
share/kde4/services/searchproviders/google_images.desktop
share/kde4/services/searchproviders/google_lucky.desktop
+share/kde4/services/searchproviders/google_maps.desktop
share/kde4/services/searchproviders/google_movie.desktop
share/kde4/services/searchproviders/google_news.desktop
share/kde4/services/searchproviders/gracenote.desktop
share/kde4/services/searchproviders/grec.desktop
-share/kde4/services/searchproviders/hotbot.desktop
share/kde4/services/searchproviders/hyperdictionary.desktop
share/kde4/services/searchproviders/hyperdictionary_thesaurus.desktop
share/kde4/services/searchproviders/ibl.desktop
+share/kde4/services/searchproviders/identica_groups.desktop
+share/kde4/services/searchproviders/identica_notices.desktop
+share/kde4/services/searchproviders/identica_people.desktop
share/kde4/services/searchproviders/imdb.desktop
share/kde4/services/searchproviders/it2en.desktop
+share/kde4/services/searchproviders/jamendo.desktop
share/kde4/services/searchproviders/jeeves.desktop
share/kde4/services/searchproviders/katatudo.desktop
share/kde4/services/searchproviders/kde.desktop
+share/kde4/services/searchproviders/kde_apps.desktop
+share/kde4/services/searchproviders/kde_forums.desktop
+share/kde4/services/searchproviders/kde_look.desktop
+share/kde4/services/searchproviders/kde_techbase.desktop
+share/kde4/services/searchproviders/kde_userbase.desktop
share/kde4/services/searchproviders/kde_websvn.desktop
share/kde4/services/searchproviders/leo.desktop
-share/kde4/services/searchproviders/lycos.desktop
-share/kde4/services/searchproviders/mamma.desktop
+share/kde4/services/searchproviders/magnatune.desktop
share/kde4/services/searchproviders/metacrawler.desktop
share/kde4/services/searchproviders/msdn.desktop
share/kde4/services/searchproviders/multitran-deru.desktop
@@ -905,6 +789,7 @@ share/kde4/services/searchproviders/multitran-nlru.desktop
share/kde4/services/searchproviders/netcraft.desktop
share/kde4/services/searchproviders/nl-telephone.desktop
share/kde4/services/searchproviders/nl-teletekst.desktop
+share/kde4/services/searchproviders/opendesktop.desktop
share/kde4/services/searchproviders/pgpkeys.desktop
share/kde4/services/searchproviders/php.desktop
share/kde4/services/searchproviders/python.desktop
@@ -914,21 +799,28 @@ share/kde4/services/searchproviders/rae.desktop
share/kde4/services/searchproviders/rfc.desktop
share/kde4/services/searchproviders/rpmfind.desktop
share/kde4/services/searchproviders/ruby_application_archive.desktop
-share/kde4/services/searchproviders/seek.desktop
share/kde4/services/searchproviders/sourceforge.desktop
share/kde4/services/searchproviders/technorati.desktop
share/kde4/services/searchproviders/technoratitags.desktop
share/kde4/services/searchproviders/thesaurus.desktop
share/kde4/services/searchproviders/tvtome.desktop
+share/kde4/services/searchproviders/urbandictionary.desktop
share/kde4/services/searchproviders/uspto.desktop
+share/kde4/services/searchproviders/vimeo.desktop
share/kde4/services/searchproviders/vivisimo.desktop
share/kde4/services/searchproviders/voila.desktop
share/kde4/services/searchproviders/webster.desktop
-share/kde4/services/searchproviders/whatis.desktop
+share/kde4/services/searchproviders/wikia.desktop
share/kde4/services/searchproviders/wikipedia.desktop
share/kde4/services/searchproviders/wiktionary.desktop
share/kde4/services/searchproviders/wolfram_alpha.desktop
share/kde4/services/searchproviders/wordref.desktop
+share/kde4/services/searchproviders/yahoo.desktop
+share/kde4/services/searchproviders/yahoo_image.desktop
+share/kde4/services/searchproviders/yahoo_local.desktop
+share/kde4/services/searchproviders/yahoo_shopping.desktop
+share/kde4/services/searchproviders/yahoo_video.desktop
+share/kde4/services/searchproviders/youtube.desktop
share/kde4/services/settings.protocol
share/kde4/services/sftp.protocol
share/kde4/services/smb.protocol
@@ -937,13 +829,13 @@ share/kde4/services/svgthumbnail.desktop
share/kde4/services/tar.protocol
share/kde4/services/textthumbnail.desktop
share/kde4/services/thumbnail.protocol
-%%NEPOMUK%%share/kde4/services/timeline.protocol
+share/kde4/services/timeline.protocol
share/kde4/services/trash.protocol
share/kde4/services/windowsexethumbnail.desktop
share/kde4/services/windowsimagethumbnail.desktop
share/kde4/services/xz.protocol
share/kde4/services/zip.protocol
-%%NEPOMUK%%share/kde4/servicetypes/nepomukservice.desktop
+share/kde4/servicetypes/nepomukservice.desktop
share/kde4/servicetypes/phononbackend.desktop
share/kde4/servicetypes/searchprovider.desktop
share/kde4/servicetypes/thumbcreator.desktop
@@ -1313,6 +1205,8 @@ share/locale/l10n/gd/entry.desktop
share/locale/l10n/gd/flag.png
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/gh/entry.desktop
share/locale/l10n/gh/flag.png
share/locale/l10n/gi/entry.desktop
@@ -1516,6 +1410,8 @@ share/locale/l10n/py/entry.desktop
share/locale/l10n/py/flag.png
share/locale/l10n/qa/entry.desktop
share/locale/l10n/qa/flag.png
+share/locale/l10n/re/entry.desktop
+share/locale/l10n/re/flag.png
share/locale/l10n/ro/entry.desktop
share/locale/l10n/ro/flag.png
share/locale/l10n/rs/entry.desktop
@@ -1629,6 +1525,8 @@ share/locale/l10n/ws/entry.desktop
share/locale/l10n/ws/flag.png
share/locale/l10n/ye/entry.desktop
share/locale/l10n/ye/flag.png
+share/locale/l10n/yt/entry.desktop
+share/locale/l10n/yt/flag.png
share/locale/l10n/za/entry.desktop
share/locale/l10n/za/flag.png
share/locale/l10n/zm/entry.desktop
@@ -1637,19 +1535,26 @@ share/locale/l10n/zw/entry.desktop
share/locale/l10n/zw/flag.png
share/mime/inode/vnd.kde.device.printer.xml
share/mime/inode/vnd.kde.device.router.xml
+share/mime/inode/vnd.kde.device.scanner.xml
share/mime/inode/vnd.kde.device.server.xml
share/mime/inode/vnd.kde.device.unknown.xml
share/mime/inode/vnd.kde.device.workstation.xml
share/mime/inode/vnd.kde.network.xml
+share/mime/inode/vnd.kde.service.acrobat-server.xml
+share/mime/inode/vnd.kde.service.adobe-vc.xml
share/mime/inode/vnd.kde.service.afpovertcp.xml
share/mime/inode/vnd.kde.service.airmouse.xml
share/mime/inode/vnd.kde.service.airport.xml
+share/mime/inode/vnd.kde.service.appletv-itunes.xml
+share/mime/inode/vnd.kde.service.appletv-pair.xml
share/mime/inode/vnd.kde.service.daap.xml
+share/mime/inode/vnd.kde.service.dacp.xml
share/mime/inode/vnd.kde.service.eppc.xml
share/mime/inode/vnd.kde.service.ftp.xml
share/mime/inode/vnd.kde.service.ftps.xml
share/mime/inode/vnd.kde.service.ggz.xml
share/mime/inode/vnd.kde.service.giver.xml
+share/mime/inode/vnd.kde.service.home-sharing.xml
share/mime/inode/vnd.kde.service.http.xml
share/mime/inode/vnd.kde.service.imap.xml
share/mime/inode/vnd.kde.service.ipp.xml
@@ -1662,11 +1567,15 @@ share/mime/inode/vnd.kde.service.lobby.xml
share/mime/inode/vnd.kde.service.lskat.xml
share/mime/inode/vnd.kde.service.net-assistant.xml
share/mime/inode/vnd.kde.service.nfs.xml
+share/mime/inode/vnd.kde.service.nssocketport.xml
share/mime/inode/vnd.kde.service.ntp.xml
share/mime/inode/vnd.kde.service.odisk.xml
+share/mime/inode/vnd.kde.service.pdl-datastream.xml
share/mime/inode/vnd.kde.service.plasma.xml
share/mime/inode/vnd.kde.service.pop3.xml
+share/mime/inode/vnd.kde.service.postgresql.xml
share/mime/inode/vnd.kde.service.presence.xml
+share/mime/inode/vnd.kde.service.printer.xml
share/mime/inode/vnd.kde.service.pulse-server.xml
share/mime/inode/vnd.kde.service.pulse-sink.xml
share/mime/inode/vnd.kde.service.pulse-source.xml
@@ -1683,6 +1592,31 @@ share/mime/inode/vnd.kde.service.svn.xml
share/mime/inode/vnd.kde.service.telnet.xml
share/mime/inode/vnd.kde.service.touch-able.xml
share/mime/inode/vnd.kde.service.unknown.xml
+share/mime/inode/vnd.kde.service.upnp.BasicDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.DigitalSecurityCamera1.xml
+share/mime/inode/vnd.kde.service.upnp.HVAC1.xml
+share/mime/inode/vnd.kde.service.upnp.InternetGatewayDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.LANDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.LightingControls1.xml
+share/mime/inode/vnd.kde.service.upnp.MediaRenderer1.xml
+share/mime/inode/vnd.kde.service.upnp.MediaRenderer2.xml
+share/mime/inode/vnd.kde.service.upnp.MediaServer1.xml
+share/mime/inode/vnd.kde.service.upnp.MediaServer2.xml
+share/mime/inode/vnd.kde.service.upnp.MediaServer3.xml
+share/mime/inode/vnd.kde.service.upnp.PrinterBasic1.xml
+share/mime/inode/vnd.kde.service.upnp.PrinterEnhanced1.xml
+share/mime/inode/vnd.kde.service.upnp.RAClient1.xml
+share/mime/inode/vnd.kde.service.upnp.RADiscoveryAgent1.xml
+share/mime/inode/vnd.kde.service.upnp.RAServer1.xml
+share/mime/inode/vnd.kde.service.upnp.RemoteUIClientDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.RemoteUIServerDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.Scanner1.xml
+share/mime/inode/vnd.kde.service.upnp.SolarProtectionBlind1.xml
+share/mime/inode/vnd.kde.service.upnp.Unknown.xml
+share/mime/inode/vnd.kde.service.upnp.WANConnectionDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.WANDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.WFADevice1.xml
+share/mime/inode/vnd.kde.service.upnp.WLANAccessPointDevice1.xml
share/mime/inode/vnd.kde.service.webdav.xml
share/mime/inode/vnd.kde.service.webdavs.xml
share/mime/inode/vnd.kde.service.workstation.xml
@@ -1740,6 +1674,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/locale/l10n/zw
@dirrm share/locale/l10n/zm
@dirrm share/locale/l10n/za
+@dirrm share/locale/l10n/yt
@dirrm share/locale/l10n/ye
@dirrm share/locale/l10n/ws
@dirrm share/locale/l10n/wf
@@ -1793,6 +1728,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/locale/l10n/ru
@dirrm share/locale/l10n/rs
@dirrm share/locale/l10n/ro
+@dirrm share/locale/l10n/re
@dirrm share/locale/l10n/qa
@dirrm share/locale/l10n/py
@dirrm share/locale/l10n/pw
@@ -1892,6 +1828,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/locale/l10n/gl
@dirrm share/locale/l10n/gi
@dirrm share/locale/l10n/gh
+@dirrm share/locale/l10n/gf
@dirrm share/locale/l10n/ge
@dirrm share/locale/l10n/gd
@dirrm share/locale/l10n/gb
@@ -1972,8 +1909,10 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/locale/currency
@dirrm share/kde4/services/searchproviders
@dirrm share/emoticons/kde4
+@dirrm share/doc/HTML/en/onlinehelp
@dirrm share/doc/HTML/en/network
@dirrm share/doc/HTML/en/knetattach
+@dirrm share/doc/HTML/en/kioslave/xz
@dirrm share/doc/HTML/en/kioslave/thumbnail
@dirrm share/doc/HTML/en/kioslave/tar
@dirrm share/doc/HTML/en/kioslave/smb
@@ -1988,11 +1927,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/doc/HTML/en/kioslave/cgi
@dirrm share/doc/HTML/en/kioslave/bzip2
@dirrm share/doc/HTML/en/kioslave/bookmarks
-@dirrm share/doc/HTML/en/khelpcenter/visualdict
-@dirrm share/doc/HTML/en/khelpcenter/userguide
-@dirrm share/doc/HTML/en/khelpcenter/quickstart
@dirrm share/doc/HTML/en/khelpcenter/glossary
-@dirrm share/doc/HTML/en/khelpcenter/faq
@dirrm share/doc/HTML/en/khelpcenter
@dirrm share/doc/HTML/en/kdesu
@dirrm share/doc/HTML/en/kdebugdialog
@@ -2004,9 +1939,8 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/doc/HTML/en/kcontrol/proxy
@dirrm share/doc/HTML/en/kcontrol/phonon
@dirrm share/doc/HTML/en/kcontrol/performance
-@dirrm share/doc/HTML/en/kcontrol/paths
@dirrm share/doc/HTML/en/kcontrol/netpref
-%%NEPOMUK%%@dirrm share/doc/HTML/en/kcontrol/nepomuk
+@dirrm share/doc/HTML/en/kcontrol/nepomuk
@dirrm share/doc/HTML/en/kcontrol/language
@dirrm share/doc/HTML/en/kcontrol/khtml-plugins
@dirrm share/doc/HTML/en/kcontrol/khtml-java-js
@@ -2020,7 +1954,6 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/doc/HTML/en/kcontrol/kcmcgi
@dirrm share/doc/HTML/en/kcontrol/icons
@dirrm share/doc/HTML/en/kcontrol/history
-@dirrm share/doc/HTML/en/kcontrol/helpindex
@dirrm share/doc/HTML/en/kcontrol/filetypes
@dirrm share/doc/HTML/en/kcontrol/filemanager
@dirrm share/doc/HTML/en/kcontrol/emoticons
@@ -2032,8 +1965,8 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/doc/HTML/en/kcontrol/attica
@dirrm share/desktop-directories
@dirrm share/apps/phonon
-%%NEPOMUK%%@dirrm share/apps/nepomukstrigiservice
-%%NEPOMUK%%@dirrm share/apps/nepomukstorage
+@dirrm share/apps/nepomukstrigiservice
+@dirrm share/apps/nepomukstorage
@dirrm share/apps/libphonon
@dirrm share/apps/kwalletd
@dirrm share/apps/ksmserver/windowmanagers
@@ -2049,7 +1982,6 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/apps/kio_bookmarks
@dirrm share/apps/khelpcenter/searchhandlers/htdig
@dirrm share/apps/khelpcenter/searchhandlers
-@dirrm share/apps/khelpcenter/plugins/Tutorials
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
@@ -2058,6 +1990,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/apps/kcmlocale/pics
@dirrm share/apps/kcmlocale
@dirrm share/apps/kcm_phonon
+@dirrm share/apps/hardwarenotifications
@dirrm share/apps/drkonqi/pics
@dirrm share/apps/drkonqi/debuggers/internal
@dirrm share/apps/drkonqi/debuggers/external
@@ -2069,12 +2002,14 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/apps/desktoptheme/oxygen/opaque
@dirrm share/apps/desktoptheme/oxygen/dialogs
@dirrmtry share/apps/desktoptheme/oxygen
+@dirrm share/apps/desktoptheme/default/translucent/widgets
+@dirrm share/apps/desktoptheme/default/translucent/dialogs
+@dirrm share/apps/desktoptheme/default/translucent
@dirrm share/apps/desktoptheme/default/opaque/widgets
@dirrm share/apps/desktoptheme/default/opaque/dialogs
@dirrm share/apps/desktoptheme/default/opaque
+@dirrm share/apps/desktoptheme/default/icons
@dirrm share/apps/desktoptheme/default/dialogs
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
@dirrm lib/kde4/plugins/phonon_platform
@dirrmtry etc/xdg/menus
@dirrmtry etc/xdg
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 366479afb19d..f1a271da8a56 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -16,12 +16,14 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
+BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
LIB_DEPENDS= qimageblitz.4:${PORTSDIR}/x11/qimageblitz\
dbus-1.3:${PORTSDIR}/devel/dbus \
hal.1:${PORTSDIR}/sysutils/hal \
polkit-qt-core.0:${PORTSDIR}/sysutils/policykit-qt \
xklavier.12:${PORTSDIR}/x11/libxklavier \
- gps.19:${PORTSDIR}/astro/gpsd
+ gps.19:${PORTSDIR}/astro/gpsd \
+ qalculate.5:${PORTSDIR}/math/libqalculate
RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
xprop:${PORTSDIR}/x11/xprop \
@@ -48,7 +50,7 @@ MAKE_JOBS_SAFE= yes
MAN1= plasmaengineexplorer.1
-CONFLICTS= kde4-windeco-aurorae-*
+CONFLICTS= kde4-windeco-aurorae-* kdebase-runtime-4.4.*
CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
-DWITH_BlueZ:BOOL=OFF \
@@ -83,18 +85,20 @@ LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's,/usr/lib/X11,${LOCALBASE}/lib/X11,g' \
+ -e 's,/usr/share/X11,${LOCALBASE}/share/X11,g' \
+ ${PATCH_WRKSRC}/kcontrol/keyboard/xkb_rules.cpp
@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
${PATCH_WRKSRC}/startkde.cmake \
${PATCH_WRKSRC}/kcontrol/kfontinst/lib/KfiConstants.h \
${PATCH_WRKSRC}/kcontrol/kfontinst/kio/KioFonts.cpp \
- ${PATCH_WRKSRC}/kcontrol/kxkb/x11helper.cpp \
+ ${PATCH_WRKSRC}/kcontrol/keyboard/x11_helper.cpp \
${PATCH_WRKSRC}/kdm/backend/client.c \
- ${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c
+ ${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \
+ ${PATCH_WRKSRC}/CMakeLists.txt
${CP} ${FILESDIR}/uptime.* ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/
pre-configure:
- ${REINPLACE_CMD} -e 's|sys/ptrace.h|signal.h|' \
- ${PATCH_WRKSRC}/libs/ksysguard/processui/CMakeLists.txt
${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|' \
${PATCH_WRKSRC}/kwin/effects/thumbnailaside/thumbnailaside.h
.for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp \
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 1f4bdf52951e..7b1d0873a93b 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.4.5.tar.bz2) = c2fba3b92ae82aa120ac159a3333db28
-SHA256 (KDE/kdebase-workspace-4.4.5.tar.bz2) = 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
-SIZE (KDE/kdebase-workspace-4.4.5.tar.bz2) = 77036766
+MD5 (KDE/kdebase-workspace-4.5.1.tar.bz2) = c030fa3530c3675636778d1561b012bd
+SHA256 (KDE/kdebase-workspace-4.5.1.tar.bz2) = cd0da0b493b9aeabc986bae10c3cf0f350c41e1298000a263a12a7a5d7003d57
+SIZE (KDE/kdebase-workspace-4.5.1.tar.bz2) = 65680180
diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt
index b0a9a4744f7e..69647cafd4f2 100644
--- a/x11/kde4-workspace/files/patch-CMakeLists.txt
+++ b/x11/kde4-workspace/files/patch-CMakeLists.txt
@@ -1,6 +1,15 @@
---- ./CMakeLists.txt.orig 2009-01-01 19:26:09.000000000 +0300
-+++ ./CMakeLists.txt 2009-03-07 10:02:36.000000000 +0300
-@@ -220,7 +220,7 @@
+--- ./CMakeLists.txt.orig 2010-07-29 01:04:56.000000000 +0400
++++ ./CMakeLists.txt 2010-08-03 14:45:37.785806201 +0400
+@@ -79,7 +79,7 @@
+ configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
+ configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
+ if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
++ set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/local/lib/X11/icons\"; export XCURSOR_PATH")
+ endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+ configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY)
+ endif(NOT WIN32)
+@@ -231,7 +231,7 @@
macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake
${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH})
diff --git a/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp b/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
deleted file mode 100644
index 15eec2aa583d..000000000000
--- a/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./kcontrol/keyboard/kcmmisc.cpp.orig 2008-04-02 08:18:22.000000000 -0400
-+++ ./kcontrol/keyboard/kcmmisc.cpp 2008-07-07 14:02:16.000000000 -0400
-@@ -505,8 +505,10 @@
-
-
- int numlockState = config.readEntry( "NumLock", 2 );
-- if( numlockState != 2 )
-- numlockx_change_numlock_state( numlockState == 0 );
-+ if( numlockState == 2 )
-+ numlockx_change_numlock_state( TRUE );
-+ if( numlockState == 0 )
-+ numlockx_change_numlock_state( FALSE );
- }
-
-
diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt b/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
index 45f403dd292c..a4102a8029dd 100644
--- a/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
+++ b/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
@@ -1,12 +1,12 @@
--- ./kdm/kfrontend/CMakeLists.txt.orig 2008-07-30 17:02:54.000000000 +0300
+++ ./kdm/kfrontend/CMakeLists.txt 2008-07-30 17:03:26.000000000 +0300
-@@ -108,6 +108,6 @@
- build_confci()
+@@ -113,6 +113,6 @@
- ## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
+
+ # use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
-install(CODE "
-exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
-")
-+# install(CODE "
-+# exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
-+# ")
++#install(CODE "
++#exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
++#")
diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
index c81e73a83e24..ef0cea949b21 100644
--- a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,8 +1,8 @@
---- kdm/kfrontend/genkdmconf.c
-+++ kdm/kfrontend/genkdmconf.c
-@@ -44,9 +44,6 @@
- #include <limits.h>
+--- ./kdm/kfrontend/genkdmconf.c.orig 2010-07-06 10:54:31.000000000 +0400
++++ ./kdm/kfrontend/genkdmconf.c 2010-07-30 22:23:28.920432715 +0400
+@@ -45,9 +45,6 @@
#include <sys/stat.h>
+ #include <sys/wait.h>
#include <sys/param.h>
-#ifdef BSD
-# include <utmp.h>
@@ -10,21 +10,21 @@
#define WANT_CONF_GEN
#include <config.ci>
-@@ -1790,7 +1787,7 @@
+@@ -1857,7 +1854,7 @@
#else
# ifdef BSD
- delstr( file, "\n"
--"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ delstr(file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n") |
+"exec sessreg -a -l $DISPLAY -x */Xservers $USER\n" ) |
# endif
#endif /* _AIX */
- delstr( file, "\n"
-@@ -1839,7 +1836,7 @@
+ delstr(file, "\n"
+@@ -1906,7 +1903,7 @@
#else
# ifdef BSD
- delstr( file, "\n"
--"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ delstr(file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n") |
+"exec sessreg -d -l $DISPLAY -x */Xservers $USER\n" ) |
# endif
#endif /* _AIX */
- delstr( file, "\n"
+ delstr(file, "\n"
diff --git a/x11/kde4-workspace/files/patch-kdm__backend__client.c b/x11/kde4-workspace/files/patch-kdm__backend__client.c
index fe71ad1286a9..ddc34a7504ae 100644
--- a/x11/kde4-workspace/files/patch-kdm__backend__client.c
+++ b/x11/kde4-workspace/files/patch-kdm__backend__client.c
@@ -1,26 +1,26 @@
---- kdm/backend/client.c.orig 2010-03-26 18:26:49.000000000 +0100
-+++ kdm/backend/client.c 2010-06-16 00:28:31.056683006 +0200
-@@ -1271,6 +1271,9 @@
- char ckDeviceBuf[20] = "";
- const char *ckDevice = ckDeviceBuf;
- dbus_bool_t isLocal;
+--- ./kdm/backend/client.c.orig 2010-07-06 10:54:30.000000000 +0400
++++ ./kdm/backend/client.c 2010-07-30 22:23:48.264408318 +0400
+@@ -1309,6 +1309,9 @@
+ char ckDeviceBuf[20] = "";
+ const char *ckDevice = ckDeviceBuf;
+ dbus_bool_t isLocal;
+# ifdef BSD
+ FILE *proc;
+# endif
#endif
- char *failsafeArgv[2];
- char *buf, *buf2;
-@@ -1302,6 +1305,13 @@
+ char *failsafeArgv[2];
+ char *buf, *buf2;
+@@ -1340,6 +1343,13 @@
# ifdef HAVE_VTS
- if (td->serverVT > 0)
- sprintf( ckDeviceBuf, "/dev/tty%d", td->serverVT );
+ if (td->serverVT > 0)
+ sprintf(ckDeviceBuf, "/dev/tty%d", td->serverVT);
+# elif defined(BSD)
-+ if ((proc = popen( "/usr/local/libexec/ck-get-x11-display-device", "r" ))) {
++ if ((proc = popen( "/usr/local/libexec/ck-get-x11-display-device", "r" ))) {
+ fscanf( proc, "%s", ckDeviceBuf );
-+ pclose( proc );
++ pclose(proc);
+ if (strcmp( ckDeviceBuf, "usage" ) == 0 || strcmp( ckDeviceBuf, "ERROR:" ) == 0)
+ ckDeviceBuf[0] = '\0';
+ }
# endif
- isLocal = ((td->displayType & d_location) == dLocal);
+ isLocal = ((td->displayType & d_location) == dLocal);
# ifdef XDMCP
diff --git a/x11/kde4-baseapps/files/patch-apps__kinfocenter__base__CMakeLists.txt b/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt
index 72b28620dcec..c119c41f92ee 100644
--- a/x11/kde4-baseapps/files/patch-apps__kinfocenter__base__CMakeLists.txt
+++ b/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt
@@ -1,5 +1,5 @@
---- ./apps/kinfocenter/base/CMakeLists.txt.orig 2008-04-18 11:21:39.000000000 +0400
-+++ ./apps/kinfocenter/base/CMakeLists.txt 2009-09-04 00:32:17.000000000 +0400
+--- ./kinfocenter/Modules/base/CMakeLists.txt.orig 2008-04-18 11:21:39.000000000 +0400
++++ ./kinfocenter/Modules/base/CMakeLists.txt 2009-09-04 00:32:17.000000000 +0400
@@ -2,7 +2,7 @@
# TODO: HAVE_LIBDEVINFO_H (for Solaris 7 and later)
# to be set if both -ldevinfo and libdevinfo.h exist
diff --git a/x11/kdebase4/files/patch-apps__kinfocenter__base__info_fbsd.cpp b/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__info_fbsd.cpp
index 026806449c4e..c6bd05dfd898 100644
--- a/x11/kdebase4/files/patch-apps__kinfocenter__base__info_fbsd.cpp
+++ b/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__info_fbsd.cpp
@@ -1,5 +1,5 @@
---- ./apps/kinfocenter/base/info_fbsd.cpp.orig 2009-04-15 14:25:24.000000000 +0400
-+++ ./apps/kinfocenter/base/info_fbsd.cpp 2009-09-22 21:33:38.000000000 +0400
+--- ./kinfocenter/Modules/base/info_fbsd.cpp.orig 2009-04-15 14:25:24.000000000 +0400
++++ ./kinfocenter/Modules/base/info_fbsd.cpp 2009-09-22 21:33:38.000000000 +0400
@@ -211,28 +211,17 @@
FILE *pipe;
QFile *pcicontrol;
diff --git a/x11/kdebase4/files/patch-apps__kinfocenter__info__CMakeLists.txt b/x11/kde4-workspace/files/patch-kinfocenter__Modules__info__CMakeLists.txt
index c3b3c28f59fe..eada3d9f4a53 100644
--- a/x11/kdebase4/files/patch-apps__kinfocenter__info__CMakeLists.txt
+++ b/x11/kde4-workspace/files/patch-kinfocenter__Modules__info__CMakeLists.txt
@@ -1,5 +1,11 @@
---- ./apps/kinfocenter/info/CMakeLists.txt.orig 2008-04-23 19:51:22.000000000 +0400
-+++ ./apps/kinfocenter/info/CMakeLists.txt 2009-09-04 00:42:28.000000000 +0400
+--- ./kinfocenter/Modules/info/CMakeLists.txt.orig 2008-04-23 19:51:22.000000000 +0400
++++ ./kinfocenter/Modules/info/CMakeLists.txt 2009-09-04 00:42:28.000000000 +0400
+@@ -1,4 +1,4 @@
+-
++set(CMAKE_BACKWARDS_COMPATIBILITY 2.2)
+ # OS Base includes
+ include(../base/CMakeLists.txt)
+
@@ -12,7 +12,7 @@
kde4_add_plugin(kcm_info ${kcm_info_PART_SRCS})
@@ -7,5 +13,5 @@
-target_link_libraries(kcm_info ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB})
+target_link_libraries(kcm_info ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB} devinfo)
-
install(TARGETS kcm_info DESTINATION ${PLUGIN_INSTALL_DIR} )
+
diff --git a/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt b/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
deleted file mode 100644
index de32b4591cdf..000000000000
--- a/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libs/ksysguard/CMakeLists.txt.orig 2008-04-10 13:30:14.000000000 +0400
-+++ ./libs/ksysguard/CMakeLists.txt 2008-06-28 14:04:29.000000000 +0400
-@@ -5,7 +5,7 @@
- add_subdirectory( processui )
- add_subdirectory( tests )
-
--check_include_files(sys/ptrace.h HAVE_SYS_PTRACE_H)
-+check_include_files(signal.h HAVE_SYS_PTRACE_H)
-
- configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h )
-
diff --git a/x11/kde4-workspace/files/patch-solid__CMakeLists.txt b/x11/kde4-workspace/files/patch-solid__CMakeLists.txt
deleted file mode 100644
index a4f39228f738..000000000000
--- a/x11/kde4-workspace/files/patch-solid__CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- solid/CMakeLists.txt.orig 2010-06-16 09:49:31.723645684 +0200
-+++ solid/CMakeLists.txt 2010-06-16 09:49:41.468153690 +0200
-@@ -7,8 +7,8 @@
- add_subdirectory(kcm)
- add_subdirectory(solid-actions-kcm)
-
-+add_subdirectory(hal)
- IF("${CMAKE_SYSTEM}" MATCHES "Linux")
-- add_subdirectory(hal)
- add_subdirectory(networking)
- add_subdirectory(solidshell)
- ENDIF("${CMAKE_SYSTEM}" MATCHES "Linux")
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 512b482606a4..38068c3876a4 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -11,6 +11,7 @@ bin/kdmctl
bin/kdostartupconfig4
bin/kfontinst
bin/kfontview
+bin/kinfocenter
bin/klipper
bin/kmenuedit
bin/krandom.kss
@@ -26,23 +27,23 @@ bin/ksysguard
bin/ksysguardd
bin/ksystraycmd
bin/kwin
-bin/kwin_killer_helper
-bin/kwin_rules_dialog
-bin/kxkb
+bin/oxygen-demo
+bin/oxygen-settings
bin/plasma-desktop
bin/plasma-netbook
bin/plasma-overlay
+bin/plasma-windowed
bin/plasmaengineexplorer
bin/plasmawallpaperviewer
bin/plasmoidviewer
bin/polkit-kde-authorization
-bin/safestartkde
bin/solid-action-desktop-gen
bin/startkde
bin/startkde4
bin/systemsettings
etc/dbus-1/system.d/org.kde.fontinst.conf
etc/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
+etc/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
etc/ksysguarddrc
include/KDE/Plasma/Weather/Ion
@@ -51,11 +52,6 @@ include/kcommondecoration.h
include/kdecoration.h
include/kdecorationbridge.h
include/kdecorationfactory.h
-include/kephal/configurations.h
-include/kephal/kephal.h
-include/kephal/kephal_export.h
-include/kephal/outputs.h
-include/kephal/screens.h
include/kgreeterplugin.h
include/kscreensaver.h
include/kscreensaver_vroot.h
@@ -79,6 +75,9 @@ 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
@@ -156,6 +155,7 @@ lib/kconf_update_bin/kwin_update_window_settings
lib/kconf_update_bin/plasma-add-shortcut-to-menu
lib/kconf_update_bin/plasma-to-plasma-desktop
lib/kde4/classic_mode.so
+lib/kde4/devinfo.so
lib/kde4/fontthumbnail.so
lib/kde4/icon_mode.so
lib/kde4/ion_bbcukmet.so
@@ -167,15 +167,17 @@ lib/kde4/kcm_autostart.so
lib/kde4/kcm_bell.so
lib/kde4/kcm_clock.so
lib/kde4/kcm_colors.so
-lib/kde4/kcm_desktopthemedetails.so
+lib/kde4/kcm_desktoppaths.so
+lib/kde4/kcm_desktoptheme.so
lib/kde4/kcm_display.so
lib/kde4/kcm_fontinst.so
lib/kde4/kcm_fonts.so
lib/kde4/kcm_hotkeys.so
+lib/kde4/kcm_info.so
+lib/kde4/kcm_infosummary.so
lib/kde4/kcm_input.so
lib/kde4/kcm_kdm.so
lib/kde4/kcm_keyboard.so
-lib/kde4/kcm_keyboard_layout.so
lib/kde4/kcm_keys.so
lib/kde4/kcm_krunner_kill.so
lib/kde4/kcm_ksplashthemes.so
@@ -188,23 +190,32 @@ lib/kde4/kcm_kwinrules.so
lib/kde4/kcm_kwinscreenedges.so
lib/kde4/kcm_kwintabbox.so
lib/kde4/kcm_launch.so
+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_randr.so
+lib/kde4/kcm_samba.so
lib/kde4/kcm_screensaver.so
lib/kde4/kcm_smserver.so
lib/kde4/kcm_solid.so
lib/kde4/kcm_solid_actions.so
lib/kde4/kcm_standard_actions.so
lib/kde4/kcm_style.so
+lib/kde4/kcm_usb.so
lib/kde4/kcm_workspaceoptions.so
lib/kde4/kcm_xinerama.so
+lib/kde4/kded_freespacenotifier.so
lib/kde4/kded_kephal.so
+lib/kde4/kded_keyboard.so
lib/kde4/kded_khotkeys.so
lib/kde4/kded_kwrited.so
lib/kde4/kded_powerdevil.so
lib/kde4/kded_randrmonitor.so
lib/kde4/kded_statusnotifierwatcher.so
+lib/kde4/keyboard_layout_widget.so
lib/kde4/kfontviewpart.so
lib/kde4/kgreet_classic.so
lib/kde4/kgreet_generic.so
@@ -224,8 +235,10 @@ lib/kde4/krunner_sessions.so
lib/kde4/krunner_shell.so
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
@@ -239,7 +252,6 @@ lib/kde4/kwin3_redmond.so
lib/kde4/kwin3_tabstrip.so
lib/kde4/kwin3_web.so
lib/kde4/kwin4_effect_builtins.so
-lib/kde4/kwin_aurorae_config.so
lib/kde4/kwin_b2_config.so
lib/kde4/kwin_kde2_config.so
lib/kde4/kwin_keramik_config.so
@@ -253,12 +265,16 @@ lib/kde4/libexec/fontinst_helper
lib/kde4/libexec/fontinst_x11
lib/kde4/libexec/kcheckpass
lib/kde4/libexec/kcmdatetimehelper
+lib/kde4/libexec/kcmkdmhelper
lib/kde4/libexec/kdm-bin_config
lib/kde4/libexec/kdm-bin_greet
lib/kde4/libexec/kfontprint
lib/kde4/libexec/krootimage
lib/kde4/libexec/kscreenlocker
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-gps.so
@@ -272,8 +288,10 @@ 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
lib/kde4/plasma_applet_launcher.so
lib/kde4/plasma_applet_lockout.so
+lib/kde4/plasma_applet_notifications.so
lib/kde4/plasma_applet_pager.so
lib/kde4/plasma_applet_panelspacer_internal.so
lib/kde4/plasma_applet_quicklaunch.so
@@ -310,6 +328,7 @@ lib/kde4/plasma_engine_akonadi.so
lib/kde4/plasma_engine_applicationjobs.so
lib/kde4/plasma_engine_apps.so
lib/kde4/plasma_engine_calendar.so
+lib/kde4/plasma_engine_devicenotifications.so
lib/kde4/plasma_engine_dict.so
lib/kde4/plasma_engine_executable.so
lib/kde4/plasma_engine_favicons.so
@@ -327,6 +346,7 @@ lib/kde4/plasma_engine_powermanagement.so
lib/kde4/plasma_engine_rss.so
lib/kde4/plasma_engine_searchlaunch.so
lib/kde4/plasma_engine_soliddevice.so
+lib/kde4/plasma_engine_statusnotifieritem.so
lib/kde4/plasma_engine_systemmonitor.so
lib/kde4/plasma_engine_tasks.so
lib/kde4/plasma_engine_time.so
@@ -339,6 +359,7 @@ lib/kde4/plugins/designer/ksignalplotterwidgets.so
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/solid_fakenet.so
lib/kde4/solid_hal_power.so
lib/kde4/solid_lirc.so
@@ -356,9 +377,9 @@ lib/libkdeinit4_ksmserver.so
lib/libkdeinit4_ksysguard.so
lib/libkdeinit4_kwin.so
lib/libkdeinit4_kwin_rules_dialog.so
-lib/libkdeinit4_kxkb.so
lib/libkdeinit4_plasma-desktop.so
lib/libkdeinit4_plasma-netbook.so
+lib/libkdeinit4_plasma-windowed.so
lib/libkephal.so
lib/libkephal.so.5
lib/libkephal.so.5.0.1
@@ -392,6 +413,9 @@ lib/libkworkspace.so.5.0.1
lib/liblsofui.so
lib/liblsofui.so.5
lib/liblsofui.so.5.0.1
+lib/liboxygenstyle.so
+lib/liboxygenstyle.so.5
+lib/liboxygenstyle.so.5.0.1
lib/libplasma-geolocation-interface.so
lib/libplasma-geolocation-interface.so.5
lib/libplasma-geolocation-interface.so.5.0.1
@@ -420,7 +444,7 @@ lib/libsolidcontrolifaces.so
lib/libsolidcontrolifaces.so.5
lib/libsolidcontrolifaces.so.5.0.1
lib/libsystemsettingsview.so
-lib/libsystemsettingsview.so.1
+lib/libsystemsettingsview.so.2
lib/libtaskmanager.so
lib/libtaskmanager.so.5
lib/libtaskmanager.so.5.0.1
@@ -430,8 +454,10 @@ lib/libweather_ion.so.5.0.1
lib/strigi/strigita_font.so
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/applications/kde4/kfontview.desktop
+share/applications/kde4/kinfocenter.desktop
share/applications/kde4/klipper.desktop
share/applications/kde4/kmenuedit.desktop
share/applications/kde4/krandrtray.desktop
@@ -458,12 +484,12 @@ share/apps/desktoptheme/air-netbook/colors
share/apps/desktoptheme/air-netbook/metadata.desktop
share/apps/desktoptheme/air-netbook/widgets/background.svgz
share/apps/desktoptheme/air-netbook/widgets/panel-background.svgz
-share/apps/desktoptheme/air-netbook/widgets/systemtray.svgz
share/apps/desktoptheme/default/calendar/mini-calendar.svgz
share/apps/desktoptheme/default/system-monitor/hdd_panel.svgz
share/apps/desktoptheme/default/widgets/battery-oxygen.svgz
share/apps/doc/kdm/README
share/apps/doc/kdm/greeter.dtd
+share/apps/freespacenotifier/freespacenotifier.notifyrc
share/apps/kaccess/kaccess.notifyrc
share/apps/katepart/syntax/plasma-desktop-js.xml
share/apps/kcminput/cursor_large_black.pcf.gz
@@ -479,15 +505,19 @@ share/apps/kcmkeys/win3.kksrc
share/apps/kcmkeys/win4.kksrc
share/apps/kcmkeys/wm3.kksrc
share/apps/kcmsolidactions/solid-action-template.desktop
+share/apps/kcmusb/usb.ids
share/apps/kconf_update/convertShortcuts.pl
share/apps/kconf_update/kaccel.upd
share/apps/kconf_update/kcmdisplayrc.upd
share/apps/kconf_update/klipper-kconfigxt.upd
share/apps/kconf_update/krdb.upd
share/apps/kconf_update/ksmserver.upd
+share/apps/kconf_update/ksmserver_shortcuts.upd
share/apps/kconf_update/kwin.upd
share/apps/kconf_update/kwin3_plugin.pl
share/apps/kconf_update/kwin3_plugin.upd
+share/apps/kconf_update/kwin_blacklist.sh
+share/apps/kconf_update/kwin_blacklist.upd
share/apps/kconf_update/kwin_focus1.sh
share/apps/kconf_update/kwin_focus1.upd
share/apps/kconf_update/kwin_focus2.sh
@@ -609,19 +639,30 @@ share/apps/kdm/themes/circles/flower.png
share/apps/kdm/themes/circles/help.png
share/apps/kdm/themes/circles/options.png
share/apps/kdm/themes/circles/screenshot.png
-share/apps/kdm/themes/oxygen-air/1920x1200.png
+share/apps/kdm/themes/ethais/KdmGreeterTheme.desktop
+share/apps/kdm/themes/ethais/ethais.xml
+share/apps/kdm/themes/ethais/lineedit_active.png
+share/apps/kdm/themes/ethais/lineedit_normal.png
+share/apps/kdm/themes/ethais/lock.png
+share/apps/kdm/themes/ethais/login_active.png
+share/apps/kdm/themes/ethais/login_normal.png
+share/apps/kdm/themes/ethais/pw_icon.png
+share/apps/kdm/themes/ethais/rectangle.png
+share/apps/kdm/themes/ethais/rectangle_overlay.png
+share/apps/kdm/themes/ethais/screenshot.png
+share/apps/kdm/themes/ethais/session_normal.png
+share/apps/kdm/themes/ethais/system_normal.png
+share/apps/kdm/themes/ethais/user_icon.png
share/apps/kdm/themes/oxygen-air/KdmGreeterTheme.desktop
share/apps/kdm/themes/oxygen-air/caps.png
share/apps/kdm/themes/oxygen-air/icon-kde.png
share/apps/kdm/themes/oxygen-air/oxygen-air.xml
-share/apps/kdm/themes/oxygen-air/pw-entry-li.png
share/apps/kdm/themes/oxygen-air/pw-entry.png
share/apps/kdm/themes/oxygen-air/screenshot.png
share/apps/kdm/themes/oxygen-air/session_button-li.png
share/apps/kdm/themes/oxygen-air/session_button.png
share/apps/kdm/themes/oxygen-air/system_button-li.png
share/apps/kdm/themes/oxygen-air/system_button.png
-share/apps/kdm/themes/oxygen-air/user-entry-li.png
share/apps/kdm/themes/oxygen-air/user-entry.png
share/apps/kdm/themes/oxygen-air/win-login.png
share/apps/kdm/themes/oxygen/KdmGreeterTheme.desktop
@@ -651,6 +692,7 @@ share/apps/khotkeys/defaults.khotkeys
share/apps/khotkeys/kde32b1.khotkeys
share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
share/apps/khotkeys/printscreen.khotkeys
+share/apps/kinfocenter/kinfocenterui.rc
share/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new.png
share/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new_sep.png
share/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new.png
@@ -683,11 +725,24 @@ share/apps/ksplash/Themes/Simple/Preview.png
share/apps/ksplash/Themes/Simple/Theme.rc
share/apps/ksplash/Themes/SimpleSmall/Preview.png
share/apps/ksplash/Themes/SimpleSmall/Theme.rc
+share/apps/kstyle/themes/oxygen.themerc
+share/apps/kstyle/themes/qtcde.themerc
+share/apps/kstyle/themes/qtcleanlooks.themerc
+share/apps/kstyle/themes/qtgtk.themerc
+share/apps/kstyle/themes/qtmotif.themerc
+share/apps/kstyle/themes/qtplastique.themerc
+share/apps/kstyle/themes/qtwindows.themerc
share/apps/ksysguard/ProcessTable.sgrd
share/apps/ksysguard/SystemLoad2.sgrd
share/apps/ksysguard/ksysguard.notifyrc
share/apps/ksysguard/ksysguardui.rc
share/apps/ksysguard/scripts/README
+share/apps/ksysguard/scripts/smaps/helper.js
+share/apps/ksysguard/scripts/smaps/index.html
+share/apps/ksysguard/scripts/smaps/main.js
+share/apps/ksysguard/scripts/smaps/smaps.desktop
+share/apps/ksysguard/scripts/smaps/sorttable.js
+share/apps/ksysguard/scripts/smaps/style.css
share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png
@@ -750,8 +805,10 @@ share/apps/kwin/tabstrip.desktop
share/apps/kwin/trackmouse.png
share/apps/kwin/web.desktop
share/apps/kwrited/kwrited.notifyrc
+share/apps/plasma-desktop/init/00-defaultLayout.js
share/apps/plasma-desktop/plasma-desktop.notifyrc
-share/apps/plasma-netbook/plasma-default-layoutrc
+share/apps/plasma-desktop/updates/systray-to-notifications-widget.js
+share/apps/plasma-netbook/init/00-defaultLayout.js
share/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
share/apps/plasma/dashboard/AppleClasses/AppleButton.js
share/apps/plasma/dashboard/AppleClasses/AppleInfoButton.js
@@ -759,12 +816,21 @@ share/apps/plasma/dashboard/AppleClasses/AppleScrollArea.js
share/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js
share/apps/plasma/dashboard/AppleClasses/AppleSlider.js
share/apps/plasma/dashboard/button/genericButton.js
+share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/metadata.desktop
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/metadata.desktop
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/metadata.desktop
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/metadata.desktop
share/apps/plasma/services/applicationjobs.operations
share/apps/plasma/services/apps.operations
share/apps/plasma/services/modifierkeystate.operations
share/apps/plasma/services/notifications.operations
share/apps/plasma/services/nowplaying.operations
share/apps/plasma/services/searchlaunch.operations
+share/apps/plasma/services/statusnotifieritem.operations
share/apps/plasma/services/tasks.operations
share/apps/powerdevil/default.powerdevilprofiles
share/apps/powerdevil/powerdevil.notifyrc
@@ -776,7 +842,6 @@ share/apps/solid/devices/solid-device-Block.desktop
share/apps/solid/devices/solid-device-Button.desktop
share/apps/solid/devices/solid-device-Camera.desktop
share/apps/solid/devices/solid-device-DvbInterface.desktop
-share/apps/solid/devices/solid-device-GenericInterface.desktop
share/apps/solid/devices/solid-device-NetworkInterface.desktop
share/apps/solid/devices/solid-device-OpticalDisc.desktop
share/apps/solid/devices/solid-device-OpticalDrive.desktop
@@ -797,6 +862,7 @@ share/autostart/klipper.desktop
share/autostart/krunner.desktop
share/autostart/plasma-desktop.desktop
share/autostart/plasma.desktop
+share/config.kcfg/freespacenotifier.kcfg
share/config.kcfg/klaunch.kcfg
share/config.kcfg/kscreensaversettings.kcfg
share/config.kcfg/kwin.kcfg
@@ -823,6 +889,7 @@ 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/HTML/en/PolicyKit-kde/authdialog_1.png
share/doc/HTML/en/PolicyKit-kde/authdialog_2.png
@@ -876,9 +943,6 @@ share/doc/HTML/en/kcontrol/joystick/joystick-main.png
share/doc/HTML/en/kcontrol/kcmaccess/common
share/doc/HTML/en/kcontrol/kcmaccess/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmaccess/index.docbook
-share/doc/HTML/en/kcontrol/kcmdisplay/common
-share/doc/HTML/en/kcontrol/kcmdisplay/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmdisplay/index.docbook
share/doc/HTML/en/kcontrol/kcmsmserver/common
share/doc/HTML/en/kcontrol/kcmsmserver/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmsmserver/index.docbook
@@ -896,6 +960,7 @@ share/doc/HTML/en/kcontrol/kwincompositing/index.cache.bz2
share/doc/HTML/en/kcontrol/kwincompositing/index.docbook
share/doc/HTML/en/kcontrol/kwindecoration/buttons.png
share/doc/HTML/en/kcontrol/kwindecoration/common
+share/doc/HTML/en/kcontrol/kwindecoration/decoration.png
share/doc/HTML/en/kcontrol/kwindecoration/index.cache.bz2
share/doc/HTML/en/kcontrol/kwindecoration/index.docbook
share/doc/HTML/en/kcontrol/kwindecoration/main.png
@@ -908,6 +973,10 @@ share/doc/HTML/en/kcontrol/kwintabbox/index.docbook
share/doc/HTML/en/kcontrol/mouse/common
share/doc/HTML/en/kcontrol/mouse/index.cache.bz2
share/doc/HTML/en/kcontrol/mouse/index.docbook
+share/doc/HTML/en/kcontrol/paths/common
+share/doc/HTML/en/kcontrol/paths/index.cache.bz2
+share/doc/HTML/en/kcontrol/paths/index.docbook
+share/doc/HTML/en/kcontrol/paths/paths.png
share/doc/HTML/en/kcontrol/powerdevil/common
share/doc/HTML/en/kcontrol/powerdevil/index.cache.bz2
share/doc/HTML/en/kcontrol/powerdevil/index.docbook
@@ -942,6 +1011,17 @@ share/doc/HTML/en/kdm/index.cache.bz2
share/doc/HTML/en/kdm/index.docbook
share/doc/HTML/en/kdm/kdmrc-ref.docbook
share/doc/HTML/en/kdm/theme-ref.docbook
+share/doc/HTML/en/kfontview/common
+share/doc/HTML/en/kfontview/index.cache.bz2
+share/doc/HTML/en/kfontview/index.docbook
+share/doc/HTML/en/kfontview/kfontview.png
+share/doc/HTML/en/kinfocenter/common
+share/doc/HTML/en/kinfocenter/index.cache.bz2
+share/doc/HTML/en/kinfocenter/index.docbook
+share/doc/HTML/en/kinfocenter/kinfocenter.png
+share/doc/HTML/en/kinfocenter/os_block.png
+share/doc/HTML/en/kinfocenter/pro_block.png
+share/doc/HTML/en/kinfocenter/sto_block.png
share/doc/HTML/en/klipper/common
share/doc/HTML/en/klipper/index.cache.bz2
share/doc/HTML/en/klipper/index.docbook
@@ -951,7 +1031,6 @@ share/doc/HTML/en/kmenuedit/done.png
share/doc/HTML/en/kmenuedit/index.cache.bz2
share/doc/HTML/en/kmenuedit/index.docbook
share/doc/HTML/en/kmenuedit/itemname.png
-share/doc/HTML/en/kmenuedit/kmenueditmain.png
share/doc/HTML/en/kmenuedit/new.png
share/doc/HTML/en/kmenuedit/reset.png
share/doc/HTML/en/kmenuedit/selecticon.png
@@ -959,11 +1038,8 @@ share/doc/HTML/en/kmenuedit/selectinternet.png
share/doc/HTML/en/ksysguard/common
share/doc/HTML/en/ksysguard/index.cache.bz2
share/doc/HTML/en/ksysguard/index.docbook
-share/doc/HTML/en/kxkb/common
-share/doc/HTML/en/kxkb/index.cache.bz2
-share/doc/HTML/en/kxkb/index.docbook
+share/doc/HTML/en/plasma-desktop/add-widgets.png
share/doc/HTML/en/plasma-desktop/common
-share/doc/HTML/en/plasma-desktop/favorite-widgets.png
share/doc/HTML/en/plasma-desktop/index.cache.bz2
share/doc/HTML/en/plasma-desktop/index.docbook
share/doc/HTML/en/plasma-desktop/taskbar-settings.png
@@ -998,6 +1074,7 @@ share/icons/Oxygen_Black/cursors/crossed_circle
share/icons/Oxygen_Black/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Oxygen_Black/cursors/dnd-copy
share/icons/Oxygen_Black/cursors/dnd-link
+share/icons/Oxygen_Black/cursors/dnd-move
share/icons/Oxygen_Black/cursors/dnd-no-drop
share/icons/Oxygen_Black/cursors/dnd-none
share/icons/Oxygen_Black/cursors/e-resize
@@ -1072,6 +1149,7 @@ 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
@@ -1146,6 +1224,7 @@ share/icons/Oxygen_Blue/cursors/crossed_circle
share/icons/Oxygen_Blue/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Oxygen_Blue/cursors/dnd-copy
share/icons/Oxygen_Blue/cursors/dnd-link
+share/icons/Oxygen_Blue/cursors/dnd-move
share/icons/Oxygen_Blue/cursors/dnd-no-drop
share/icons/Oxygen_Blue/cursors/dnd-none
share/icons/Oxygen_Blue/cursors/e-resize
@@ -1220,6 +1299,7 @@ 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
@@ -1294,6 +1374,7 @@ share/icons/Oxygen_White/cursors/crossed_circle
share/icons/Oxygen_White/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Oxygen_White/cursors/dnd-copy
share/icons/Oxygen_White/cursors/dnd-link
+share/icons/Oxygen_White/cursors/dnd-move
share/icons/Oxygen_White/cursors/dnd-no-drop
share/icons/Oxygen_White/cursors/dnd-none
share/icons/Oxygen_White/cursors/e-resize
@@ -1368,6 +1449,7 @@ 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
@@ -1442,6 +1524,7 @@ share/icons/Oxygen_Yellow/cursors/crossed_circle
share/icons/Oxygen_Yellow/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Oxygen_Yellow/cursors/dnd-copy
share/icons/Oxygen_Yellow/cursors/dnd-link
+share/icons/Oxygen_Yellow/cursors/dnd-move
share/icons/Oxygen_Yellow/cursors/dnd-no-drop
share/icons/Oxygen_Yellow/cursors/dnd-none
share/icons/Oxygen_Yellow/cursors/e-resize
@@ -1516,6 +1599,7 @@ 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
@@ -1590,6 +1674,7 @@ share/icons/Oxygen_Zion/cursors/crossed_circle
share/icons/Oxygen_Zion/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Oxygen_Zion/cursors/dnd-copy
share/icons/Oxygen_Zion/cursors/dnd-link
+share/icons/Oxygen_Zion/cursors/dnd-move
share/icons/Oxygen_Zion/cursors/dnd-no-drop
share/icons/Oxygen_Zion/cursors/dnd-none
share/icons/Oxygen_Zion/cursors/e-resize
@@ -1664,6 +1749,7 @@ 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
@@ -1713,15 +1799,12 @@ 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
-share/icons/hicolor/16x16/apps/kxkb.png
share/icons/hicolor/22x22/apps/kmenuedit.png
share/icons/hicolor/22x22/apps/ksplash.png
share/icons/hicolor/32x32/apps/kmenuedit.png
share/icons/hicolor/32x32/apps/ksplash.png
-share/icons/hicolor/32x32/apps/kxkb.png
share/icons/hicolor/48x48/apps/kmenuedit.png
share/icons/hicolor/48x48/apps/ksplash.png
-share/icons/hicolor/48x48/apps/kxkb.png
share/icons/hicolor/64x64/apps/ksplash.png
share/icons/oxygen/128x128/apps/kcmkwm.png
share/icons/oxygen/128x128/mimetypes/fonts-package.png
@@ -1765,36 +1848,49 @@ share/kde4/services/bell.desktop
share/kde4/services/clock.desktop
share/kde4/services/colors.desktop
share/kde4/services/desktop.desktop
-share/kde4/services/desktopthemedetails.desktop
+share/kde4/services/desktoppath.desktop
+share/kde4/services/desktoptheme.desktop
+share/kde4/services/deviceinfocategory.desktop
+share/kde4/services/devinfo.desktop
share/kde4/services/display.desktop
+share/kde4/services/dma.desktop
share/kde4/services/fontinst.desktop
share/kde4/services/fonts.desktop
share/kde4/services/fonts.protocol
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-envcan.desktop
share/kde4/services/ion-noaa.desktop
share/kde4/services/ion-wettercom.desktop
+share/kde4/services/ioports.desktop
share/kde4/services/kaccess.desktop
+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
share/kde4/services/kcmsmserver.desktop
+share/kde4/services/kcmusb.desktop
+share/kde4/services/kded/freespacenotifier.desktop
share/kde4/services/kded/kephal.desktop
+share/kde4/services/kded/keyboard.desktop
share/kde4/services/kded/khotkeys.desktop
share/kde4/services/kded/kwrited.desktop
share/kde4/services/kded/powerdevil.desktop
share/kde4/services/kded/randrmonitor.desktop
share/kde4/services/kded/statusnotifierwatcher.desktop
share/kde4/services/kdm.desktop
-share/kde4/services/keyboard.desktop
-share/kde4/services/keyboard_layout.desktop
share/kde4/services/keys.desktop
share/kde4/services/kfontviewpart.desktop
share/kde4/services/khotkeys.desktop
share/kde4/services/ksplashthememgr.desktop
+share/kde4/services/kwin/blur.desktop
+share/kde4/services/kwin/blur_config.desktop
share/kde4/services/kwin/boxswitch.desktop
share/kde4/services/kwin/boxswitch_config.desktop
share/kde4/services/kwin/coverswitch.desktop
@@ -1815,6 +1911,8 @@ share/kde4/services/kwin/fadedesktop.desktop
share/kde4/services/kwin/fallapart.desktop
share/kde4/services/kwin/flipswitch.desktop
share/kde4/services/kwin/flipswitch_config.desktop
+share/kde4/services/kwin/glide.desktop
+share/kde4/services/kwin/glide_config.desktop
share/kde4/services/kwin/highlightwindow.desktop
share/kde4/services/kwin/invert.desktop
share/kde4/services/kwin/invert_config.desktop
@@ -1868,7 +1966,11 @@ share/kde4/services/kwinoptions.desktop
share/kde4/services/kwinrules.desktop
share/kde4/services/kwinscreenedges.desktop
share/kde4/services/kwintabbox.desktop
+share/kde4/services/lostfoundcategory.desktop
share/kde4/services/mouse.desktop
+share/kde4/services/networkinfocategory.desktop
+share/kde4/services/nic.desktop
+share/kde4/services/opengl.desktop
share/kde4/services/plasma-animator-default.desktop
share/kde4/services/plasma-applet-activitybar.desktop
share/kde4/services/plasma-applet-analogclock.desktop
@@ -1879,6 +1981,7 @@ share/kde4/services/plasma-applet-digitalclock.desktop
share/kde4/services/plasma-applet-icon.desktop
share/kde4/services/plasma-applet-launcher.desktop
share/kde4/services/plasma-applet-lockout.desktop
+share/kde4/services/plasma-applet-notifications.desktop
share/kde4/services/plasma-applet-panelspacer-internal.desktop
share/kde4/services/plasma-applet-quicklaunch.desktop
share/kde4/services/plasma-applet-searchbox.desktop
@@ -1896,6 +1999,7 @@ share/kde4/services/plasma-applet-webbrowser.desktop
share/kde4/services/plasma-applet-windowlist.desktop
share/kde4/services/plasma-battery-default.desktop
share/kde4/services/plasma-containment-desktop.desktop
+share/kde4/services/plasma-containment-desktopdashboard.desktop
share/kde4/services/plasma-containment-netpanel.desktop
share/kde4/services/plasma-containment-newspaper.desktop
share/kde4/services/plasma-containment-panel.desktop
@@ -1911,6 +2015,7 @@ share/kde4/services/plasma-containmentactions-switchwindow.desktop
share/kde4/services/plasma-dataengine-applicationjobs.desktop
share/kde4/services/plasma-dataengine-apps.desktop
share/kde4/services/plasma-dataengine-calendar.desktop
+share/kde4/services/plasma-dataengine-devicenotifications.desktop
share/kde4/services/plasma-dataengine-dict.desktop
share/kde4/services/plasma-dataengine-executable.desktop
share/kde4/services/plasma-dataengine-favicons.desktop
@@ -1935,6 +2040,10 @@ share/kde4/services/plasma-engine-metadata.desktop
share/kde4/services/plasma-engine-searchlaunch.desktop
share/kde4/services/plasma-geolocation-gps.desktop
share/kde4/services/plasma-geolocation-ip.desktop
+share/kde4/services/plasma-layout-org.kde.plasma-desktop.defaultPanel.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-web.desktop
share/kde4/services/plasma-pager-default.desktop
@@ -1952,9 +2061,11 @@ share/kde4/services/plasma-runner-sessions.desktop
share/kde4/services/plasma-runner-shell.desktop
share/kde4/services/plasma-runner-solid.desktop
share/kde4/services/plasma-runner-webshortcuts.desktop
+share/kde4/services/plasma-runner-windowedwidgets.desktop
share/kde4/services/plasma-runner-windows.desktop
share/kde4/services/plasma-sal-bookmarks.desktop
share/kde4/services/plasma-sal-contacts.desktop
+share/kde4/services/plasma-sal-development.desktop
share/kde4/services/plasma-sal-education.desktop
share/kde4/services/plasma-sal-games.desktop
share/kde4/services/plasma-sal-graphics.desktop
@@ -1968,33 +2079,40 @@ share/kde4/services/plasma-scriptengine-applet-web.desktop
share/kde4/services/plasma-tasks-default.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/randr.desktop
share/kde4/services/recentdocuments.desktop
share/kde4/services/screensaver.desktop
-share/kde4/services/settings-about-me.desktop
+share/kde4/services/scsi.desktop
share/kde4/services/settings-accessibility.desktop
-share/kde4/services/settings-advanced-user-settings.desktop
-share/kde4/services/settings-advanced.desktop
-share/kde4/services/settings-appearance.desktop
+share/kde4/services/settings-account-details.desktop
+share/kde4/services/settings-application-and-system-notifications.desktop
+share/kde4/services/settings-application-appearance-and-behavior.desktop
+share/kde4/services/settings-application-appearance.desktop
+share/kde4/services/settings-audio-and-video.desktop
share/kde4/services/settings-bluetooth.desktop
share/kde4/services/settings-classic-view.desktop
-share/kde4/services/settings-computer-administration.desktop
-share/kde4/services/settings-desktop.desktop
+share/kde4/services/settings-desktop-appearance.desktop
share/kde4/services/settings-display.desktop
-share/kde4/services/settings-general.desktop
+share/kde4/services/settings-hardware.desktop
share/kde4/services/settings-icon-view.desktop
-share/kde4/services/settings-input-actions.desktop
-share/kde4/services/settings-keyboard-and-mouse.desktop
-share/kde4/services/settings-look-and-feel.desktop
+share/kde4/services/settings-input-devices.desktop
+share/kde4/services/settings-locale.desktop
+share/kde4/services/settings-lost-and-found.desktop
share/kde4/services/settings-network-and-connectivity.desktop
share/kde4/services/settings-network-settings.desktop
-share/kde4/services/settings-notifications.desktop
-share/kde4/services/settings-personal.desktop
-share/kde4/services/settings-regional-and-language.desktop
+share/kde4/services/settings-permissions.desktop
+share/kde4/services/settings-personal-information.desktop
+share/kde4/services/settings-removable-devices.desktop
share/kde4/services/settings-sharing.desktop
-share/kde4/services/settings-system.desktop
+share/kde4/services/settings-shortcuts-and-gestures.desktop
+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/smbstatus.desktop
share/kde4/services/solid-actions.desktop
share/kde4/services/solidbackends/solid_fakenet.desktop
share/kde4/services/solidbackends/solid_hal_power.desktop
@@ -2004,8 +2122,11 @@ share/kde4/services/standard_actions.desktop
share/kde4/services/style.desktop
share/kde4/services/workspaceoptions.desktop
share/kde4/services/xinerama.desktop
+share/kde4/services/xserver.desktop
+share/kde4/servicetypes/kinfocentercategory.desktop
share/kde4/servicetypes/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/screensaver.desktop
share/kde4/servicetypes/solid-device-type.desktop
@@ -2027,31 +2148,24 @@ share/wallpapers/Aghi/contents/images/1920x1200.jpg
share/wallpapers/Aghi/contents/images/800x600.jpg
share/wallpapers/Aghi/contents/screenshot.jpg
share/wallpapers/Aghi/metadata.desktop
-share/wallpapers/Air/contents/images/1024x768.jpg
share/wallpapers/Air/contents/images/1280x1024.jpg
-share/wallpapers/Air/contents/images/1280x800.jpg
-share/wallpapers/Air/contents/images/1440x900.jpg
share/wallpapers/Air/contents/images/1600x1200.jpg
share/wallpapers/Air/contents/images/1920x1080.jpg
share/wallpapers/Air/contents/images/1920x1200.jpg
share/wallpapers/Air/contents/screenshot.png
share/wallpapers/Air/metadata.desktop
-share/wallpapers/Code_Poets_Dream/contents/images/1024x768.jpg
-share/wallpapers/Code_Poets_Dream/contents/images/1280x1024.jpg
-share/wallpapers/Code_Poets_Dream/contents/images/1280x800.jpg
-share/wallpapers/Code_Poets_Dream/contents/images/1440x900.jpg
-share/wallpapers/Code_Poets_Dream/contents/images/1600x1200.jpg
-share/wallpapers/Code_Poets_Dream/contents/images/1920x1200.jpg
-share/wallpapers/Code_Poets_Dream/contents/screenshot.png
-share/wallpapers/Code_Poets_Dream/metadata.desktop
-share/wallpapers/Curls_on_Green/contents/images/1024x768.jpg
-share/wallpapers/Curls_on_Green/contents/images/1280x1024.jpg
-share/wallpapers/Curls_on_Green/contents/images/1280x800.jpg
-share/wallpapers/Curls_on_Green/contents/images/1440x900.jpg
-share/wallpapers/Curls_on_Green/contents/images/1600x1200.jpg
-share/wallpapers/Curls_on_Green/contents/images/1920x1200.jpg
-share/wallpapers/Curls_on_Green/contents/screenshot.png
-share/wallpapers/Curls_on_Green/metadata.desktop
+share/wallpapers/Autumn/contents/images/1280x1024.jpg
+share/wallpapers/Autumn/contents/images/1600x1200.jpg
+share/wallpapers/Autumn/contents/images/1920x1080.jpg
+share/wallpapers/Autumn/contents/images/1920x1200.jpg
+share/wallpapers/Autumn/contents/screenshot.png
+share/wallpapers/Autumn/metadata.desktop
+share/wallpapers/Blue_Wood/contents/images/1280x1024.jpg
+share/wallpapers/Blue_Wood/contents/images/1600x1200.jpg
+share/wallpapers/Blue_Wood/contents/images/1920x1080.jpg
+share/wallpapers/Blue_Wood/contents/images/1920x1200.jpg
+share/wallpapers/Blue_Wood/contents/screenshot.png
+share/wallpapers/Blue_Wood/metadata.desktop
share/wallpapers/Ethais/contents/images/1280x1024.png
share/wallpapers/Ethais/contents/images/1280x800.png
share/wallpapers/Ethais/contents/images/1366x768.png
@@ -2061,40 +2175,39 @@ share/wallpapers/Ethais/contents/images/1920x1080.png
share/wallpapers/Ethais/contents/images/1920x1200.png
share/wallpapers/Ethais/contents/screenshot.png
share/wallpapers/Ethais/metadata.desktop
-share/wallpapers/Evening/contents/images/1024x768.jpg
share/wallpapers/Evening/contents/images/1280x1024.jpg
-share/wallpapers/Evening/contents/images/1280x800.jpg
-share/wallpapers/Evening/contents/images/1440x900.jpg
share/wallpapers/Evening/contents/images/1600x1200.jpg
share/wallpapers/Evening/contents/images/1920x1080.jpg
share/wallpapers/Evening/contents/images/1920x1200.jpg
-share/wallpapers/Evening/contents/images/800x600.jpg
share/wallpapers/Evening/contents/screnshot.jpg
share/wallpapers/Evening/metadata.desktop
-share/wallpapers/Fields_of_Peace/contents/images/1024x768.JPG
share/wallpapers/Fields_of_Peace/contents/images/1280x1024.JPG
-share/wallpapers/Fields_of_Peace/contents/images/1280x800.JPG
-share/wallpapers/Fields_of_Peace/contents/images/1440x900.JPG
share/wallpapers/Fields_of_Peace/contents/images/1600x1200.JPG
share/wallpapers/Fields_of_Peace/contents/images/1920x1200.JPG
share/wallpapers/Fields_of_Peace/contents/screenshot.png
share/wallpapers/Fields_of_Peace/metadata.desktop
-share/wallpapers/Finally_Summer_in_Germany/contents/images/1024x768.jpg
share/wallpapers/Finally_Summer_in_Germany/contents/images/1280x1024.jpg
-share/wallpapers/Finally_Summer_in_Germany/contents/images/1280x800.jpg
-share/wallpapers/Finally_Summer_in_Germany/contents/images/1440x900.jpg
share/wallpapers/Finally_Summer_in_Germany/contents/images/1600x1200.jpg
share/wallpapers/Finally_Summer_in_Germany/contents/images/1920x1200.jpg
share/wallpapers/Finally_Summer_in_Germany/contents/screenshot.png
share/wallpapers/Finally_Summer_in_Germany/metadata.desktop
-share/wallpapers/Fresh_Morning/contents/images/1024x768.jpg
share/wallpapers/Fresh_Morning/contents/images/1280x1024.jpg
-share/wallpapers/Fresh_Morning/contents/images/1280x800.jpg
-share/wallpapers/Fresh_Morning/contents/images/1440x900.jpg
share/wallpapers/Fresh_Morning/contents/images/1600x1200.jpg
share/wallpapers/Fresh_Morning/contents/images/1920x1200.jpg
share/wallpapers/Fresh_Morning/contents/screenshot.png
share/wallpapers/Fresh_Morning/metadata.desktop
+share/wallpapers/Grass/contents/images/1280x1024.jpg
+share/wallpapers/Grass/contents/images/1600x1200.jpg
+share/wallpapers/Grass/contents/images/1920x1080.jpg
+share/wallpapers/Grass/contents/images/1920x1200.jpg
+share/wallpapers/Grass/contents/screenshot.png
+share/wallpapers/Grass/metadata.desktop
+share/wallpapers/Hanami/contents/images/1280x1024.jpg
+share/wallpapers/Hanami/contents/images/1600x1200.jpg
+share/wallpapers/Hanami/contents/images/1920x1080.jpg
+share/wallpapers/Hanami/contents/images/1920x1200.jpg
+share/wallpapers/Hanami/contents/screenshot.png
+share/wallpapers/Hanami/metadata.desktop
share/wallpapers/Media_Life/contents/images/1280x1024.jpg
share/wallpapers/Media_Life/contents/images/1280x800.jpg
share/wallpapers/Media_Life/contents/images/1440x900.jpg
@@ -2105,8 +2218,6 @@ share/wallpapers/Media_Life/contents/images/1920x1200.jpg
share/wallpapers/Media_Life/contents/screenshot.png
share/wallpapers/Media_Life/metadata.desktop
share/wallpapers/Plasmalicious/contents/images/1280x1024.jpg
-share/wallpapers/Plasmalicious/contents/images/1280x800.jpg
-share/wallpapers/Plasmalicious/contents/images/1400x900.jpg
share/wallpapers/Plasmalicious/contents/images/1600x1200.jpg
share/wallpapers/Plasmalicious/contents/images/1920x1200.jpg
share/wallpapers/Plasmalicious/contents/screenshot.png
@@ -2121,42 +2232,13 @@ share/wallpapers/Quadros/contents/images/1920x1200.jpg
share/wallpapers/Quadros/contents/images/800x600.jpg
share/wallpapers/Quadros/contents/screenshot.png
share/wallpapers/Quadros/metadata.desktop
-share/wallpapers/Red_Leaf/contents/images/1024x768.jpg
share/wallpapers/Red_Leaf/contents/images/1280x1024.jpg
-share/wallpapers/Red_Leaf/contents/images/1280x800.jpg
-share/wallpapers/Red_Leaf/contents/images/1440x900.jpg
share/wallpapers/Red_Leaf/contents/images/1600x1200.jpg
share/wallpapers/Red_Leaf/contents/images/1920x1200.jpg
share/wallpapers/Red_Leaf/contents/screenshot.png
share/wallpapers/Red_Leaf/metadata.desktop
-share/wallpapers/Spring_Sunray/contents/images/1024x768.jpg
-share/wallpapers/Spring_Sunray/contents/images/1280x1024.jpg
-share/wallpapers/Spring_Sunray/contents/images/1280x800.jpg
-share/wallpapers/Spring_Sunray/contents/images/1440x900.jpg
-share/wallpapers/Spring_Sunray/contents/images/1600x1200.jpg
-share/wallpapers/Spring_Sunray/contents/images/1920x1080.jpg
-share/wallpapers/Spring_Sunray/contents/images/1920x1200.jpg
-share/wallpapers/Spring_Sunray/contents/images/800x600.jpg
-share/wallpapers/Spring_Sunray/contents/screnshot.jpg
-share/wallpapers/Spring_Sunray/metadata.desktop
-share/wallpapers/The_Rings_of_Saturn/contents/images/1024x768.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1280x1024.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1280x800.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1440x900.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1600x1200.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1920x1080.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1920x1200.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/800x600.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/screenshot.jpg
-share/wallpapers/The_Rings_of_Saturn/metadata.desktop
-share/wallpapers/default_blue.jpg
-share/wallpapers/default_blue.jpg.desktop
-@dirrm share/wallpapers/The_Rings_of_Saturn/contents/images
-@dirrm share/wallpapers/The_Rings_of_Saturn/contents
-@dirrm share/wallpapers/The_Rings_of_Saturn
-@dirrm share/wallpapers/Spring_Sunray/contents/images
-@dirrm share/wallpapers/Spring_Sunray/contents
-@dirrm share/wallpapers/Spring_Sunray
+share/wallpapers/stripes.png
+share/wallpapers/stripes.png.desktop
@dirrm share/wallpapers/Red_Leaf/contents/images
@dirrm share/wallpapers/Red_Leaf/contents
@dirrm share/wallpapers/Red_Leaf
@@ -2166,9 +2248,15 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/wallpapers/Plasmalicious/contents/images
@dirrm share/wallpapers/Plasmalicious/contents
@dirrm share/wallpapers/Plasmalicious
-@dirrm share/wallpapers/Media_Life/contents/images
-@dirrm share/wallpapers/Media_Life/contents
+@dirrmtry share/wallpapers/Media_Life/contents/images
+@dirrmtry share/wallpapers/Media_Life/contents
@dirrmtry share/wallpapers/Media_Life
+@dirrmtry share/wallpapers/Hanami/contents/images
+@dirrmtry share/wallpapers/Hanami/contents
+@dirrmtry share/wallpapers/Hanami
+@dirrmtry share/wallpapers/Grass/contents/images
+@dirrmtry share/wallpapers/Grass/contents
+@dirrmtry share/wallpapers/Grass
@dirrm share/wallpapers/Fresh_Morning/contents/images
@dirrm share/wallpapers/Fresh_Morning/contents
@dirrm share/wallpapers/Fresh_Morning
@@ -2184,12 +2272,12 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/wallpapers/Ethais/contents/images
@dirrm share/wallpapers/Ethais/contents
@dirrm share/wallpapers/Ethais
-@dirrm share/wallpapers/Curls_on_Green/contents/images
-@dirrm share/wallpapers/Curls_on_Green/contents
-@dirrm share/wallpapers/Curls_on_Green
-@dirrm share/wallpapers/Code_Poets_Dream/contents/images
-@dirrm share/wallpapers/Code_Poets_Dream/contents
-@dirrm share/wallpapers/Code_Poets_Dream
+@dirrmtry share/wallpapers/Blue_Wood/contents/images
+@dirrmtry share/wallpapers/Blue_Wood/contents
+@dirrmtry share/wallpapers/Blue_Wood
+@dirrmtry share/wallpapers/Autumn/contents/images
+@dirrmtry share/wallpapers/Autumn/contents
+@dirrmtry share/wallpapers/Autumn
@dirrm share/wallpapers/Air/contents/images
@dirrm share/wallpapers/Air/contents
@dirrm share/wallpapers/Air
@@ -2220,10 +2308,11 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/icons/Oxygen_Black
@dirrm share/doc/HTML/en/systemsettings
@dirrm share/doc/HTML/en/plasma-desktop
-@dirrm share/doc/HTML/en/kxkb
@dirrm share/doc/HTML/en/ksysguard
@dirrm share/doc/HTML/en/kmenuedit
@dirrm share/doc/HTML/en/klipper
+@dirrm share/doc/HTML/en/kinfocenter
+@dirrm share/doc/HTML/en/kfontview
@dirrm share/doc/HTML/en/kdm
@dirrm share/doc/HTML/en/kcontrol/workspaceoptions
@dirrm share/doc/HTML/en/kcontrol/windowspecific
@@ -2233,6 +2322,7 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/doc/HTML/en/kcontrol/solid-actions
@dirrm share/doc/HTML/en/kcontrol/screensaver
@dirrm share/doc/HTML/en/kcontrol/powerdevil
+@dirrm share/doc/HTML/en/kcontrol/paths
@dirrm share/doc/HTML/en/kcontrol/mouse
@dirrm share/doc/HTML/en/kcontrol/kwintabbox
@dirrm share/doc/HTML/en/kcontrol/kwinscreenedges
@@ -2242,7 +2332,6 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/doc/HTML/en/kcontrol/keyboard
@dirrm share/doc/HTML/en/kcontrol/kcmstyle
@dirrm share/doc/HTML/en/kcontrol/kcmsmserver
-@dirrm share/doc/HTML/en/kcontrol/kcmdisplay
@dirrm share/doc/HTML/en/kcontrol/kcmaccess
@dirrm share/doc/HTML/en/kcontrol/joystick
@dirrm share/doc/HTML/en/kcontrol/fonts
@@ -2259,10 +2348,22 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/solidfakenetbackend
@dirrm share/apps/solid/devices
@dirrm share/apps/powerdevil
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel
+@dirrm share/apps/plasma/layout-templates
@dirrm share/apps/plasma/dashboard/button
@dirrm share/apps/plasma/dashboard/AppleClasses
@dirrm share/apps/plasma/dashboard
+@dirrmtry share/apps/plasma-netbook/init
@dirrmtry share/apps/plasma-netbook
+@dirrmtry share/apps/plasma-desktop/updates
+@dirrmtry share/apps/plasma-desktop/init
@dirrmtry share/apps/plasma-desktop
@dirrm share/apps/kwrited
@dirrm share/apps/kwin/default_rules
@@ -2280,6 +2381,7 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/kthememanager/themes/HighContrastDark
@dirrm share/apps/kthememanager/themes
@dirrm share/apps/kthememanager
+@dirrm share/apps/ksysguard/scripts/smaps
@dirrm share/apps/ksysguard/scripts
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/Themes/SimpleSmall
@@ -2302,6 +2404,7 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/kmenuedit/icons/oxygen
@dirrm share/apps/kmenuedit/icons
@dirrm share/apps/kmenuedit
+@dirrm share/apps/kinfocenter
@dirrm share/apps/khotkeys
@dirrm share/apps/kfontview
@dirrm share/apps/kfontinst/icons/oxygen/scalable/actions
@@ -2315,26 +2418,27 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/kfontinst
@dirrm share/apps/kdm/themes/oxygen-air
@dirrm share/apps/kdm/themes/oxygen
+@dirrm share/apps/kdm/themes/ethais
@dirrm share/apps/kdm/themes/circles
-@dirrm share/apps/kdm/themes
+@dirrmtry share/apps/kdm/themes
@dirrm share/apps/kdm/sessions
@dirrm share/apps/kdm/programs
@dirrm share/apps/kdm/patterns
@dirrm share/apps/kdisplay/app-defaults
@dirrm share/apps/kdisplay
+@dirrm share/apps/kcmusb
@dirrm share/apps/kcmsolidactions
@dirrm share/apps/kcmkeys
@dirrm share/apps/kcminput/pics
@dirrm share/apps/kcminput
@dirrm share/apps/kaccess
+@dirrm share/apps/freespacenotifier
@dirrm share/apps/doc/kdm
@dirrm share/apps/doc
@dirrm share/apps/desktoptheme/default/system-monitor
@dirrm share/apps/desktoptheme/default/calendar
@dirrm share/apps/desktoptheme/air-netbook/widgets
@dirrm share/apps/desktoptheme/air-netbook
-@dirrmtry share/PolicyKit/policy
-@dirrmtry share/PolicyKit
@dirrm lib/kde4/plugins/gui_platform
@dirrm lib/KDE4Workspace/cmake
@dirrm lib/KDE4Workspace
@@ -2350,6 +2454,5 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm include/kworkspace
@dirrm include/ksysguard
@dirrm include/ksgrd
-@dirrm include/kephal
@dirrm include/KDE/Plasma/Weather
@dirrmtry include/KDE/Plasma
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 23a0ba0cfb38..b9fe9c089839 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -7,7 +7,6 @@
PORTNAME= kde4
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
@@ -87,7 +86,7 @@ RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kcalc:${PORTSDIR}/misc/kdeutils4
RUN_DEPENDS+= ${KDE4_PREFIX}/bin/klinkstatus:${PORTSDIR}/www/kdewebdev4
.endif
.if !defined(WITHOUT_KTTS)
-RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kttsd:${PORTSDIR}/accessibility/ktts
+RUN_DEPENDS+= ${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/ktts
.endif
.if !defined(WITHOUT_MARBLE)
RUN_DEPENDS+= ${KDE4_PREFIX}/bin/marble:${PORTSDIR}/astro/marble
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 41e0a9134c0e..213bc04c4e80 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -25,9 +24,11 @@ LIB_DEPENDS= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
ssh.4:${PORTSDIR}/security/libssh \
attica.0:${PORTSDIR}/x11-toolkits/attica
#explicitly depend on libssh to avoid interference with ssh.4 from compat7x
-BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
+BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh \
+ ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
+RUN_DEPENDS= cagibid:${PORTSDIR}/net/cagibi
-USE_KDE4= kdelibs kdeprefix kdehier automoc4 #pimlibs
+USE_KDE4= kdelibs kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
@@ -37,10 +38,11 @@ USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
MAN1= kdesu.1
+MAN8= nepomukserver.8 nepomukservicestub.8
SUB_FILES= nepomuk-env.sh
-OPTIONS= PULSEAUDIO "Enable playback via PulseAudio soundserver" off \
+OPTIONS= PULSEAUDIO "Enable playback via PulseAudio sound server" off \
VIRTUOSO "Install Virtuoso server (required for Nepomuk)" off
# Explicitly disable alsa, see for details:
@@ -64,15 +66,6 @@ CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
RUN_DEPENDS+= ${LOCALBASE}/bin/virtuoso-t:${PORTSDIR}/databases/virtuoso
.endif
-.if exists(${LOCALBASE}/lib/soprano/libsoprano_virtuosobackend.so)
-CMAKE_ARGS+= -DWITH_Nepomuk:BOOL=ON
-MAN8= nepomukserver.8 nepomukservicestub.8
-PLIST_SUB+= NEPOMUK=""
-.else
-CMAKE_ARGS+= -DWITH_Nepomuk:BOOL=OFF
-PLIST_SUB+= NEPOMUK="@comment "
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
${PATCH_WRKSRC}/khelpcenter/infotree.cpp \
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 35861ff8dc78..253a1cbeff89 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.4.5.tar.bz2) = 6f2bfc771ff5143b89f5a5709d4cca69
-SHA256 (KDE/kdebase-runtime-4.4.5.tar.bz2) = 3d3be43d2f53b40dea7fc566f1f5b07b30fcc6b4c69ad77c1e1be13637781428
-SIZE (KDE/kdebase-runtime-4.4.5.tar.bz2) = 7332344
+MD5 (KDE/kdebase-runtime-4.5.1.tar.bz2) = 83542744f8a23ff2b2621d152ce38fcc
+SHA256 (KDE/kdebase-runtime-4.5.1.tar.bz2) = 3f975db0f6b165f24d53495294fce4f317aeb036653d16fd561950e77ef757ba
+SIZE (KDE/kdebase-runtime-4.5.1.tar.bz2) = 5750512
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index 1db3aa271f1d..a0fcaa9eb4d0 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -24,11 +24,12 @@ bin/ktrash
bin/kuiserver
bin/kwalletd
bin/kwriteconfig
-%%NEPOMUK%%bin/nepomukserver
-%%NEPOMUK%%bin/nepomukservicestub
+bin/nepomukserver
+bin/nepomukservicestub
bin/plasmapkg
bin/solid-hardware
env/nepomuk-env.sh
+etc/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
etc/xdg/menus/kde-information.menu
lib/attica_kde.so
lib/kconf_update_bin/phonon_devicepreference_update
@@ -52,16 +53,17 @@ lib/kde4/kcm_kded.so
lib/kde4/kcm_kdnssd.so
lib/kde4/kcm_knotify.so
lib/kde4/kcm_locale.so
-%%NEPOMUK%%lib/kde4/kcm_nepomuk.so
+lib/kde4/kcm_nepomuk.so
lib/kde4/kcm_phonon.so
lib/kde4/kcm_phononxine.so
lib/kde4/kcm_trash.so
lib/kde4/kcmspellchecking.so
+lib/kde4/kded_activitymanager.so
lib/kde4/kded_desktopnotifier.so
lib/kde4/kded_device_automounter.so
lib/kde4/kded_kpasswdserver.so
lib/kde4/kded_ktimezoned.so
-%%NEPOMUK%%lib/kde4/kded_nepomuksearchmodule.so
+lib/kde4/kded_nepomuksearchmodule.so
lib/kde4/kded_networkwatcher.so
lib/kde4/kded_phononserver.so
lib/kde4/kded_remotedirnotify.so
@@ -79,8 +81,8 @@ lib/kde4/kio_fish.so
lib/kde4/kio_floppy.so
lib/kde4/kio_info.so
lib/kde4/kio_man.so
-%%NEPOMUK%%lib/kde4/kio_nepomuk.so
-%%NEPOMUK%%lib/kde4/kio_nepomuksearch.so
+lib/kde4/kio_nepomuk.so
+lib/kde4/kio_nepomuksearch.so
lib/kde4/kio_network.so
lib/kde4/kio_nfs.so
lib/kde4/kio_remote.so
@@ -88,16 +90,17 @@ lib/kde4/kio_settings.so
lib/kde4/kio_sftp.so
lib/kde4/kio_smb.so
lib/kde4/kio_thumbnail.so
-%%NEPOMUK%%lib/kde4/kio_timeline.so
+lib/kde4/kio_timeline.so
lib/kde4/kio_trash.so
lib/kde4/kshorturifilter.so
-lib/kde4/kstyle_oxygen_config.so
lib/kde4/kuriikwsfilter.so
lib/kde4/kurisearchfilter.so
lib/kde4/libexec/drkonqi
+lib/kde4/libexec/kcmremotewidgetshelper
lib/kde4/libexec/kdeeject
lib/kde4/libexec/kdesu
lib/kde4/libexec/kdesud
+lib/kde4/libexec/kdontchangethehostname
lib/kde4/libexec/khc_docbookdig.pl
lib/kde4/libexec/khc_htdig.pl
lib/kde4/libexec/khc_htsearch.pl
@@ -110,18 +113,18 @@ lib/kde4/libkmanpart.so
lib/kde4/librenaudioplugin.so
lib/kde4/librenimageplugin.so
lib/kde4/localdomainurifilter.so
-%%NEPOMUK%%lib/kde4/nepomukfilewatch.so
-%%NEPOMUK%%lib/kde4/nepomukmigration1.so
-%%NEPOMUK%%lib/kde4/nepomukontologyloader.so
-%%NEPOMUK%%lib/kde4/nepomukqueryservice.so
-%%NEPOMUK%%lib/kde4/nepomukremovablestorageservice.so
-%%NEPOMUK%%lib/kde4/nepomukstorage.so
-%%NEPOMUK%%lib/kde4/nepomukstrigiservice.so
+lib/kde4/nepomukactivitiesservice.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_appletscript_simple_javascript.so
lib/kde4/plasma_dataenginescript_javascript.so
lib/kde4/plasma_runnerscript_javascript.so
lib/kde4/plugins/phonon_platform/kde.so
-lib/kde4/plugins/styles/oxygen.so
lib/kde4/svgthumbnail.so
lib/kde4/textthumbnail.so
lib/kde4/windowsexethumbnail.so
@@ -131,14 +134,15 @@ lib/libkdeinit4_kglobalaccel.so
lib/libkdeinit4_khelpcenter.so
lib/libkdeinit4_kuiserver.so
lib/libkdeinit4_kwalletd.so
-%%NEPOMUK%%lib/libkdeinit4_nepomukserver.so
+lib/libkdeinit4_nepomukserver.so
lib/libkwalletbackend.so
lib/libkwalletbackend.so.5
lib/libkwalletbackend.so.5.0.1
lib/libmolletnetwork.so
lib/libmolletnetwork.so.5
lib/libmolletnetwork.so.5.0.1
-%%NEPOMUK%%lib/strigi/strigiindex_nepomukbackend.so
+lib/strigi/strigiindex_nepomukbackend.so
+share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
share/applications/kde4/Help.desktop
share/applications/kde4/knetattach.desktop
share/apps/cmake/modules/FindCLucene.cmake
@@ -148,6 +152,15 @@ share/apps/desktoptheme/default/dialogs/background.svgz
share/apps/desktoptheme/default/dialogs/kickoff.svgz
share/apps/desktoptheme/default/dialogs/krunner.svgz
share/apps/desktoptheme/default/dialogs/shutdowndialog.svgz
+share/apps/desktoptheme/default/icons/audio.svgz
+share/apps/desktoptheme/default/icons/battery.svgz
+share/apps/desktoptheme/default/icons/device.svgz
+share/apps/desktoptheme/default/icons/klipper.svgz
+share/apps/desktoptheme/default/icons/nepomuk.svgz
+share/apps/desktoptheme/default/icons/network.svgz
+share/apps/desktoptheme/default/icons/notification.svgz
+share/apps/desktoptheme/default/icons/preferences.svgz
+share/apps/desktoptheme/default/icons/wallet.svgz
share/apps/desktoptheme/default/metadata.desktop
share/apps/desktoptheme/default/opaque/dialogs/background.svgz
share/apps/desktoptheme/default/opaque/dialogs/krunner.svgz
@@ -155,6 +168,10 @@ share/apps/desktoptheme/default/opaque/dialogs/shutdowndialog.svgz
share/apps/desktoptheme/default/opaque/widgets/extender-background.svgz
share/apps/desktoptheme/default/opaque/widgets/panel-background.svgz
share/apps/desktoptheme/default/opaque/widgets/tooltip.svgz
+share/apps/desktoptheme/default/translucent/dialogs/background.svgz
+share/apps/desktoptheme/default/translucent/dialogs/krunner.svgz
+share/apps/desktoptheme/default/translucent/widgets/panel-background.svgz
+share/apps/desktoptheme/default/translucent/widgets/tooltip.svgz
share/apps/desktoptheme/default/widgets/action-overlays.svgz
share/apps/desktoptheme/default/widgets/analog_meter.svgz
share/apps/desktoptheme/default/widgets/arrows.svgz
@@ -173,6 +190,7 @@ share/apps/desktoptheme/default/widgets/extender-background.svgz
share/apps/desktoptheme/default/widgets/extender-dragger.svgz
share/apps/desktoptheme/default/widgets/frame.svgz
share/apps/desktoptheme/default/widgets/glowbar.svgz
+share/apps/desktoptheme/default/widgets/identiconshapes.svgz
share/apps/desktoptheme/default/widgets/line.svgz
share/apps/desktoptheme/default/widgets/lineedit.svgz
share/apps/desktoptheme/default/widgets/monitor.svgz
@@ -240,6 +258,7 @@ share/apps/drkonqi/debuggers/external/kdbgrc
share/apps/drkonqi/debuggers/internal/gdbrc
share/apps/drkonqi/mappings
share/apps/drkonqi/pics/crash.png
+share/apps/hardwarenotifications/hardwarenotifications.notifyrc
share/apps/kcm_componentchooser/kcm_browser.desktop
share/apps/kcm_componentchooser/kcm_filemanager.desktop
share/apps/kcm_componentchooser/kcm_kemail.desktop
@@ -269,20 +288,12 @@ share/apps/khelpcenter/plugins/Manpages/man9.desktop
share/apps/khelpcenter/plugins/Manpages/mann.desktop
share/apps/khelpcenter/plugins/Scrollkeeper/.directory
share/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop
-share/apps/khelpcenter/plugins/Tutorials/.directory
-share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
-share/apps/khelpcenter/plugins/Tutorials/visualdict.desktop
-share/apps/khelpcenter/plugins/contact.desktop
-share/apps/khelpcenter/plugins/faq.desktop
share/apps/khelpcenter/plugins/info.desktop
share/apps/khelpcenter/plugins/kcontrolmodules.desktop
share/apps/khelpcenter/plugins/kicmodules.desktop
share/apps/khelpcenter/plugins/kioslaves.desktop
-share/apps/khelpcenter/plugins/links.desktop
+share/apps/khelpcenter/plugins/onlinehelp.desktop
share/apps/khelpcenter/plugins/plasma.desktop
-share/apps/khelpcenter/plugins/support.desktop
-share/apps/khelpcenter/plugins/userguide.desktop
-share/apps/khelpcenter/plugins/welcome.desktop
share/apps/khelpcenter/searchhandlers/docbook.desktop
share/apps/khelpcenter/searchhandlers/htdig.desktop
share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
@@ -303,21 +314,14 @@ share/apps/ksmserver/windowmanagers/compiz-custom.desktop
share/apps/ksmserver/windowmanagers/compiz.desktop
share/apps/ksmserver/windowmanagers/metacity.desktop
share/apps/ksmserver/windowmanagers/openbox.desktop
-share/apps/kstyle/themes/oxygen.themerc
-share/apps/kstyle/themes/qtcde.themerc
-share/apps/kstyle/themes/qtcleanlooks.themerc
-share/apps/kstyle/themes/qtgtk.themerc
-share/apps/kstyle/themes/qtmotif.themerc
-share/apps/kstyle/themes/qtplastique.themerc
-share/apps/kstyle/themes/qtwindows.themerc
share/apps/kwalletd/kwalletd.notifyrc
share/apps/libphonon/hardwaredatabase
-%%NEPOMUK%%share/apps/nepomukstorage/nepomukstorage.notifyrc
-%%NEPOMUK%%share/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
+share/apps/nepomukstorage/nepomukstorage.notifyrc
+share/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
share/apps/phonon/phonon.notifyrc
share/apps/remoteview/network.desktop
share/apps/remoteview/smb-network.desktop
-%%NEPOMUK%%share/autostart/nepomukserver.desktop
+share/autostart/nepomukserver.desktop
share/config.kcfg/khelpcenter.kcfg
share/config/emoticons.knsrc
share/config/icons.knsrc
@@ -325,18 +329,20 @@ share/config/khotnewstuff.knsrc
share/config/khotnewstuff_upload.knsrc
share/config/kshorturifilterrc
share/dbus-1/interfaces/org.kde.KTimeZoned.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.NepomukServer.xml
+share/dbus-1/interfaces/org.kde.NepomukServer.xml
share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.Query.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.RemovableStorage.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
-%%NEPOMUK%%share/dbus-1/interfaces/org.kde.nepomuk.Strigi.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.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.network.kioslavenotifier.xml
share/dbus-1/services/org.kde.knotify.service
+share/dbus-1/services/org.kde.kuiserver.service
+share/dbus-1/system-services/org.kde.kcontrol.kcmremotewidgets.service
share/desktop-directories/kde-development-translation.directory
share/desktop-directories/kde-development-webdevelopment.directory
share/desktop-directories/kde-development.directory
@@ -404,9 +410,6 @@ share/doc/HTML/en/kcontrol/filemanager/index.docbook
share/doc/HTML/en/kcontrol/filetypes/common
share/doc/HTML/en/kcontrol/filetypes/index.cache.bz2
share/doc/HTML/en/kcontrol/filetypes/index.docbook
-share/doc/HTML/en/kcontrol/helpindex/common
-share/doc/HTML/en/kcontrol/helpindex/index.cache.bz2
-share/doc/HTML/en/kcontrol/helpindex/index.docbook
share/doc/HTML/en/kcontrol/history/common
share/doc/HTML/en/kcontrol/history/index.cache.bz2
share/doc/HTML/en/kcontrol/history/index.docbook
@@ -453,16 +456,12 @@ share/doc/HTML/en/kcontrol/khtml-plugins/index.docbook
share/doc/HTML/en/kcontrol/language/common
share/doc/HTML/en/kcontrol/language/index.cache.bz2
share/doc/HTML/en/kcontrol/language/index.docbook
-%%NEPOMUK%%share/doc/HTML/en/kcontrol/nepomuk/common
-%%NEPOMUK%%share/doc/HTML/en/kcontrol/nepomuk/index.cache.bz2
-%%NEPOMUK%%share/doc/HTML/en/kcontrol/nepomuk/index.docbook
+share/doc/HTML/en/kcontrol/nepomuk/common
+share/doc/HTML/en/kcontrol/nepomuk/index.cache.bz2
+share/doc/HTML/en/kcontrol/nepomuk/index.docbook
share/doc/HTML/en/kcontrol/netpref/common
share/doc/HTML/en/kcontrol/netpref/index.cache.bz2
share/doc/HTML/en/kcontrol/netpref/index.docbook
-share/doc/HTML/en/kcontrol/paths/common
-share/doc/HTML/en/kcontrol/paths/index.cache.bz2
-share/doc/HTML/en/kcontrol/paths/index.docbook
-share/doc/HTML/en/kcontrol/paths/paths.png
share/doc/HTML/en/kcontrol/performance/common
share/doc/HTML/en/kcontrol/performance/index.cache.bz2
share/doc/HTML/en/kcontrol/performance/index.docbook
@@ -497,35 +496,10 @@ share/doc/HTML/en/kdesu/man-kdesu.1.docbook
share/doc/HTML/en/khelpcenter/background.png
share/doc/HTML/en/khelpcenter/bgtable.png
share/doc/HTML/en/khelpcenter/common
-share/doc/HTML/en/khelpcenter/contact.docbook
-share/doc/HTML/en/khelpcenter/faq/about.docbook
-share/doc/HTML/en/khelpcenter/faq/common
-share/doc/HTML/en/khelpcenter/faq/configkde.docbook
-share/doc/HTML/en/khelpcenter/faq/contrib.docbook
-share/doc/HTML/en/khelpcenter/faq/desktop.docbook
-share/doc/HTML/en/khelpcenter/faq/filemng.docbook
-share/doc/HTML/en/khelpcenter/faq/getkde.docbook
-share/doc/HTML/en/khelpcenter/faq/index.cache.bz2
-share/doc/HTML/en/khelpcenter/faq/index.docbook
-share/doc/HTML/en/khelpcenter/faq/install.docbook
-share/doc/HTML/en/khelpcenter/faq/intro.docbook
-share/doc/HTML/en/khelpcenter/faq/kdeapps.docbook
-share/doc/HTML/en/khelpcenter/faq/misc.docbook
-share/doc/HTML/en/khelpcenter/faq/moreinfo.docbook
-share/doc/HTML/en/khelpcenter/faq/nonkdeapps.docbook
-share/doc/HTML/en/khelpcenter/faq/notrelated.docbook
-share/doc/HTML/en/khelpcenter/faq/panel.docbook
-share/doc/HTML/en/khelpcenter/faq/qt.docbook
-share/doc/HTML/en/khelpcenter/faq/questions.docbook
-share/doc/HTML/en/khelpcenter/faq/sound.docbook
-share/doc/HTML/en/khelpcenter/faq/tips.docbook
-share/doc/HTML/en/khelpcenter/faq/webbrowse.docbook
-share/doc/HTML/en/khelpcenter/faq/winmng.docbook
share/doc/HTML/en/khelpcenter/glossary/common
share/doc/HTML/en/khelpcenter/glossary/index.cache.bz2
share/doc/HTML/en/khelpcenter/glossary/index.docbook
share/doc/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook
-share/doc/HTML/en/khelpcenter/help.docbook
share/doc/HTML/en/khelpcenter/index.cache.bz2
share/doc/HTML/en/khelpcenter/index.docbook
share/doc/HTML/en/khelpcenter/kdelogo2.png
@@ -533,123 +507,7 @@ share/doc/HTML/en/khelpcenter/khelpcenter.png
share/doc/HTML/en/khelpcenter/lines.png
share/doc/HTML/en/khelpcenter/lines2.png
share/doc/HTML/en/khelpcenter/pointers.png
-share/doc/HTML/en/khelpcenter/quickstart/common
-share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2
-share/doc/HTML/en/khelpcenter/quickstart/index.docbook
share/doc/HTML/en/khelpcenter/shadow1.png
-share/doc/HTML/en/khelpcenter/support.docbook
-share/doc/HTML/en/khelpcenter/userguide/a-window.png
-share/doc/HTML/en/khelpcenter/userguide/accessibility.docbook
-share/doc/HTML/en/khelpcenter/userguide/amarok-icon.png
-share/doc/HTML/en/khelpcenter/userguide/amarok.png
-share/doc/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
-share/doc/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
-share/doc/HTML/en/khelpcenter/userguide/burning-cds.docbook
-share/doc/HTML/en/khelpcenter/userguide/common
-share/doc/HTML/en/khelpcenter/userguide/control-center.docbook
-share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook
-share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook
-share/doc/HTML/en/khelpcenter/userguide/customizing-desktop.docbook
-share/doc/HTML/en/khelpcenter/userguide/desktop.png
-share/doc/HTML/en/khelpcenter/userguide/email.docbook
-share/doc/HTML/en/khelpcenter/userguide/extragear-applications.docbook
-share/doc/HTML/en/khelpcenter/userguide/file-sharing.docbook
-share/doc/HTML/en/khelpcenter/userguide/font-installation.docbook
-share/doc/HTML/en/khelpcenter/userguide/getting-help.docbook
-share/doc/HTML/en/khelpcenter/userguide/glossary.docbook
-share/doc/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
-share/doc/HTML/en/khelpcenter/userguide/index.cache.bz2
-share/doc/HTML/en/khelpcenter/userguide/index.docbook
-share/doc/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
-share/doc/HTML/en/khelpcenter/userguide/juk-icon.png
-share/doc/HTML/en/khelpcenter/userguide/juk.png
-share/doc/HTML/en/khelpcenter/userguide/kaboodle-icon.png
-share/doc/HTML/en/khelpcenter/userguide/kaboodle.png
-share/doc/HTML/en/khelpcenter/userguide/kcalc-systray.png
-share/doc/HTML/en/khelpcenter/userguide/kcontrol.png
-share/doc/HTML/en/khelpcenter/userguide/kde-as-root.docbook
-share/doc/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
-share/doc/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
-share/doc/HTML/en/khelpcenter/userguide/kde-office.docbook
-share/doc/HTML/en/khelpcenter/userguide/kmag.png
-share/doc/HTML/en/khelpcenter/userguide/kmousetool.png
-share/doc/HTML/en/khelpcenter/userguide/kmouth.png
-share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
-share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
-share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
-share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
-share/doc/HTML/en/khelpcenter/userguide/knode-news-account.png
-share/doc/HTML/en/khelpcenter/userguide/knode-start.png
-share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
-share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
-share/doc/HTML/en/khelpcenter/userguide/konsole-intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/kopete.png
-share/doc/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
-share/doc/HTML/en/khelpcenter/userguide/kppp-wizard.png
-share/doc/HTML/en/khelpcenter/userguide/messaging-intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/migrator-applications.docbook
-share/doc/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
-share/doc/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
-share/doc/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
-share/doc/HTML/en/khelpcenter/userguide/noatun-icon.png
-share/doc/HTML/en/khelpcenter/userguide/noatun.png
-share/doc/HTML/en/khelpcenter/userguide/oggfolder.png
-share/doc/HTML/en/khelpcenter/userguide/open-file-dialog.png
-share/doc/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
-share/doc/HTML/en/khelpcenter/userguide/pdf-files.docbook
-share/doc/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
-share/doc/HTML/en/khelpcenter/userguide/playing-movies.docbook
-share/doc/HTML/en/khelpcenter/userguide/playing-music.docbook
-share/doc/HTML/en/khelpcenter/userguide/printer-setup.docbook
-share/doc/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
-share/doc/HTML/en/khelpcenter/userguide/programs-controlling.docbook
-share/doc/HTML/en/khelpcenter/userguide/removable-disks.docbook
-share/doc/HTML/en/khelpcenter/userguide/rip.png
-share/doc/HTML/en/khelpcenter/userguide/ripsettings.png
-share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook
-share/doc/HTML/en/khelpcenter/userguide/services.png
-share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook
-share/doc/HTML/en/khelpcenter/userguide/splash-screen.png
-share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
-share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook
-share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook
-share/doc/HTML/en/khelpcenter/userguide/titlebar-menu.png
-share/doc/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
-share/doc/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
-share/doc/HTML/en/khelpcenter/userguide/under-the-hood.docbook
-share/doc/HTML/en/khelpcenter/userguide/usenet.docbook
-share/doc/HTML/en/khelpcenter/userguide/where-next.docbook
-share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook
-share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook
-share/doc/HTML/en/khelpcenter/visualdict/common
-share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2
-share/doc/HTML/en/khelpcenter/visualdict/index.docbook
-share/doc/HTML/en/khelpcenter/visualdict/pict1.png
-share/doc/HTML/en/khelpcenter/visualdict/pict10.png
-share/doc/HTML/en/khelpcenter/visualdict/pict11.png
-share/doc/HTML/en/khelpcenter/visualdict/pict12.png
-share/doc/HTML/en/khelpcenter/visualdict/pict13.png
-share/doc/HTML/en/khelpcenter/visualdict/pict14.png
-share/doc/HTML/en/khelpcenter/visualdict/pict15.png
-share/doc/HTML/en/khelpcenter/visualdict/pict16.png
-share/doc/HTML/en/khelpcenter/visualdict/pict17.png
-share/doc/HTML/en/khelpcenter/visualdict/pict18.png
-share/doc/HTML/en/khelpcenter/visualdict/pict19.png
-share/doc/HTML/en/khelpcenter/visualdict/pict2.png
-share/doc/HTML/en/khelpcenter/visualdict/pict20.png
-share/doc/HTML/en/khelpcenter/visualdict/pict21.png
-share/doc/HTML/en/khelpcenter/visualdict/pict22.png
-share/doc/HTML/en/khelpcenter/visualdict/pict23.png
-share/doc/HTML/en/khelpcenter/visualdict/pict3.png
-share/doc/HTML/en/khelpcenter/visualdict/pict4.png
-share/doc/HTML/en/khelpcenter/visualdict/pict5.png
-share/doc/HTML/en/khelpcenter/visualdict/pict6.png
-share/doc/HTML/en/khelpcenter/visualdict/pict7.png
-share/doc/HTML/en/khelpcenter/visualdict/pict8.png
-share/doc/HTML/en/khelpcenter/visualdict/pict9.png
-share/doc/HTML/en/khelpcenter/welcome.docbook
-share/doc/HTML/en/khelpcenter/whatiskde.docbook
share/doc/HTML/en/kioslave/bookmarks/common
share/doc/HTML/en/kioslave/bookmarks/index.cache.bz2
share/doc/HTML/en/kioslave/bookmarks/index.docbook
@@ -692,6 +550,9 @@ share/doc/HTML/en/kioslave/tar/index.docbook
share/doc/HTML/en/kioslave/thumbnail/common
share/doc/HTML/en/kioslave/thumbnail/index.cache.bz2
share/doc/HTML/en/kioslave/thumbnail/index.docbook
+share/doc/HTML/en/kioslave/xz/common
+share/doc/HTML/en/kioslave/xz/index.cache.bz2
+share/doc/HTML/en/kioslave/xz/index.docbook
share/doc/HTML/en/knetattach/common
share/doc/HTML/en/knetattach/index.cache.bz2
share/doc/HTML/en/knetattach/index.docbook
@@ -703,6 +564,9 @@ share/doc/HTML/en/knetattach/screenshot4.png
share/doc/HTML/en/network/common
share/doc/HTML/en/network/index.cache.bz2
share/doc/HTML/en/network/index.docbook
+share/doc/HTML/en/onlinehelp/common
+share/doc/HTML/en/onlinehelp/index.cache.bz2
+share/doc/HTML/en/onlinehelp/index.docbook
share/emoticons/kde4/angry.png
share/emoticons/kde4/bat.png
share/emoticons/kde4/beer.png
@@ -784,18 +648,19 @@ share/kde4/services/info.protocol
share/kde4/services/jpegthumbnail.desktop
share/kde4/services/kcm_attica.desktop
share/kde4/services/kcm_kdnssd.desktop
-%%NEPOMUK%%share/kde4/services/kcm_nepomuk.desktop
+share/kde4/services/kcm_nepomuk.desktop
share/kde4/services/kcm_phonon.desktop
share/kde4/services/kcm_phononxine.desktop
share/kde4/services/kcmcgi.desktop
share/kde4/services/kcmkded.desktop
share/kde4/services/kcmnotify.desktop
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
-%%NEPOMUK%%share/kde4/services/kded/nepomuksearchmodule.desktop
+share/kde4/services/kded/nepomuksearchmodule.desktop
share/kde4/services/kded/networkwatcher.desktop
share/kde4/services/kded/phononserver.desktop
share/kde4/services/kded/remotedirnotify.desktop
@@ -814,15 +679,16 @@ share/kde4/services/language.desktop
share/kde4/services/localdomainurifilter.desktop
share/kde4/services/lzma.protocol
share/kde4/services/man.protocol
-%%NEPOMUK%%share/kde4/services/nepomuk.protocol
-%%NEPOMUK%%share/kde4/services/nepomukfilewatch.desktop
-%%NEPOMUK%%share/kde4/services/nepomukmigration1.desktop
-%%NEPOMUK%%share/kde4/services/nepomukontologyloader.desktop
-%%NEPOMUK%%share/kde4/services/nepomukqueryservice.desktop
-%%NEPOMUK%%share/kde4/services/nepomukremovablestorageservice.desktop
-%%NEPOMUK%%share/kde4/services/nepomuksearch.protocol
-%%NEPOMUK%%share/kde4/services/nepomukstorage.desktop
-%%NEPOMUK%%share/kde4/services/nepomukstrigiservice.desktop
+share/kde4/services/nepomuk.protocol
+share/kde4/services/nepomukactivitiesservice.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
+share/kde4/services/nepomuksearch.protocol
+share/kde4/services/nepomukstorage.desktop
+share/kde4/services/nepomukstrigiservice.desktop
share/kde4/services/network.protocol
share/kde4/services/nfs.protocol
share/kde4/services/plasma-scriptengine-applet-simple-javascript.desktop
@@ -832,15 +698,16 @@ share/kde4/services/programs.protocol
share/kde4/services/remote.protocol
share/kde4/services/renaudiodlg.desktop
share/kde4/services/renimagedlg.desktop
+share/kde4/services/searchproviders/7digital.desktop
share/kde4/services/searchproviders/acronym.desktop
-share/kde4/services/searchproviders/alexa.desktop
-share/kde4/services/searchproviders/alexa_url.desktop
-share/kde4/services/searchproviders/alltheweb.desktop
share/kde4/services/searchproviders/altavista.desktop
+share/kde4/services/searchproviders/amazon.desktop
+share/kde4/services/searchproviders/amazon_mp3.desktop
share/kde4/services/searchproviders/amg.desktop
-share/kde4/services/searchproviders/appsy.desktop
share/kde4/services/searchproviders/austronaut.desktop
share/kde4/services/searchproviders/backports.desktop
+share/kde4/services/searchproviders/beolingus.desktop
+share/kde4/services/searchproviders/blip.desktop
share/kde4/services/searchproviders/bugft.desktop
share/kde4/services/searchproviders/bugno.desktop
share/kde4/services/searchproviders/call.desktop
@@ -857,14 +724,20 @@ share/kde4/services/searchproviders/dictfr.desktop
share/kde4/services/searchproviders/dmoz.desktop
share/kde4/services/searchproviders/docbook.desktop
share/kde4/services/searchproviders/doi.desktop
+share/kde4/services/searchproviders/duckduckgo.desktop
+share/kde4/services/searchproviders/duckduckgo_info.desktop
+share/kde4/services/searchproviders/duckduckgo_shopping.desktop
+share/kde4/services/searchproviders/ecosia.desktop
share/kde4/services/searchproviders/en2de.desktop
share/kde4/services/searchproviders/en2es.desktop
share/kde4/services/searchproviders/en2fr.desktop
share/kde4/services/searchproviders/en2it.desktop
share/kde4/services/searchproviders/es2en.desktop
share/kde4/services/searchproviders/ethicle.desktop
-share/kde4/services/searchproviders/excite.desktop
+share/kde4/services/searchproviders/facebook.desktop
share/kde4/services/searchproviders/feedster.desktop
+share/kde4/services/searchproviders/flickr.desktop
+share/kde4/services/searchproviders/flickrcc.desktop
share/kde4/services/searchproviders/foldoc.desktop
share/kde4/services/searchproviders/fr2de.desktop
share/kde4/services/searchproviders/fr2en.desktop
@@ -872,28 +745,39 @@ share/kde4/services/searchproviders/freedb.desktop
share/kde4/services/searchproviders/freshmeat.desktop
share/kde4/services/searchproviders/froogle.desktop
share/kde4/services/searchproviders/fsd.desktop
+share/kde4/services/searchproviders/github.desktop
+share/kde4/services/searchproviders/gitorious.desktop
share/kde4/services/searchproviders/google.desktop
share/kde4/services/searchproviders/google_advanced.desktop
+share/kde4/services/searchproviders/google_code.desktop
share/kde4/services/searchproviders/google_groups.desktop
share/kde4/services/searchproviders/google_images.desktop
share/kde4/services/searchproviders/google_lucky.desktop
+share/kde4/services/searchproviders/google_maps.desktop
share/kde4/services/searchproviders/google_movie.desktop
share/kde4/services/searchproviders/google_news.desktop
share/kde4/services/searchproviders/gracenote.desktop
share/kde4/services/searchproviders/grec.desktop
-share/kde4/services/searchproviders/hotbot.desktop
share/kde4/services/searchproviders/hyperdictionary.desktop
share/kde4/services/searchproviders/hyperdictionary_thesaurus.desktop
share/kde4/services/searchproviders/ibl.desktop
+share/kde4/services/searchproviders/identica_groups.desktop
+share/kde4/services/searchproviders/identica_notices.desktop
+share/kde4/services/searchproviders/identica_people.desktop
share/kde4/services/searchproviders/imdb.desktop
share/kde4/services/searchproviders/it2en.desktop
+share/kde4/services/searchproviders/jamendo.desktop
share/kde4/services/searchproviders/jeeves.desktop
share/kde4/services/searchproviders/katatudo.desktop
share/kde4/services/searchproviders/kde.desktop
+share/kde4/services/searchproviders/kde_apps.desktop
+share/kde4/services/searchproviders/kde_forums.desktop
+share/kde4/services/searchproviders/kde_look.desktop
+share/kde4/services/searchproviders/kde_techbase.desktop
+share/kde4/services/searchproviders/kde_userbase.desktop
share/kde4/services/searchproviders/kde_websvn.desktop
share/kde4/services/searchproviders/leo.desktop
-share/kde4/services/searchproviders/lycos.desktop
-share/kde4/services/searchproviders/mamma.desktop
+share/kde4/services/searchproviders/magnatune.desktop
share/kde4/services/searchproviders/metacrawler.desktop
share/kde4/services/searchproviders/msdn.desktop
share/kde4/services/searchproviders/multitran-deru.desktop
@@ -905,6 +789,7 @@ share/kde4/services/searchproviders/multitran-nlru.desktop
share/kde4/services/searchproviders/netcraft.desktop
share/kde4/services/searchproviders/nl-telephone.desktop
share/kde4/services/searchproviders/nl-teletekst.desktop
+share/kde4/services/searchproviders/opendesktop.desktop
share/kde4/services/searchproviders/pgpkeys.desktop
share/kde4/services/searchproviders/php.desktop
share/kde4/services/searchproviders/python.desktop
@@ -914,21 +799,28 @@ share/kde4/services/searchproviders/rae.desktop
share/kde4/services/searchproviders/rfc.desktop
share/kde4/services/searchproviders/rpmfind.desktop
share/kde4/services/searchproviders/ruby_application_archive.desktop
-share/kde4/services/searchproviders/seek.desktop
share/kde4/services/searchproviders/sourceforge.desktop
share/kde4/services/searchproviders/technorati.desktop
share/kde4/services/searchproviders/technoratitags.desktop
share/kde4/services/searchproviders/thesaurus.desktop
share/kde4/services/searchproviders/tvtome.desktop
+share/kde4/services/searchproviders/urbandictionary.desktop
share/kde4/services/searchproviders/uspto.desktop
+share/kde4/services/searchproviders/vimeo.desktop
share/kde4/services/searchproviders/vivisimo.desktop
share/kde4/services/searchproviders/voila.desktop
share/kde4/services/searchproviders/webster.desktop
-share/kde4/services/searchproviders/whatis.desktop
+share/kde4/services/searchproviders/wikia.desktop
share/kde4/services/searchproviders/wikipedia.desktop
share/kde4/services/searchproviders/wiktionary.desktop
share/kde4/services/searchproviders/wolfram_alpha.desktop
share/kde4/services/searchproviders/wordref.desktop
+share/kde4/services/searchproviders/yahoo.desktop
+share/kde4/services/searchproviders/yahoo_image.desktop
+share/kde4/services/searchproviders/yahoo_local.desktop
+share/kde4/services/searchproviders/yahoo_shopping.desktop
+share/kde4/services/searchproviders/yahoo_video.desktop
+share/kde4/services/searchproviders/youtube.desktop
share/kde4/services/settings.protocol
share/kde4/services/sftp.protocol
share/kde4/services/smb.protocol
@@ -937,13 +829,13 @@ share/kde4/services/svgthumbnail.desktop
share/kde4/services/tar.protocol
share/kde4/services/textthumbnail.desktop
share/kde4/services/thumbnail.protocol
-%%NEPOMUK%%share/kde4/services/timeline.protocol
+share/kde4/services/timeline.protocol
share/kde4/services/trash.protocol
share/kde4/services/windowsexethumbnail.desktop
share/kde4/services/windowsimagethumbnail.desktop
share/kde4/services/xz.protocol
share/kde4/services/zip.protocol
-%%NEPOMUK%%share/kde4/servicetypes/nepomukservice.desktop
+share/kde4/servicetypes/nepomukservice.desktop
share/kde4/servicetypes/phononbackend.desktop
share/kde4/servicetypes/searchprovider.desktop
share/kde4/servicetypes/thumbcreator.desktop
@@ -1313,6 +1205,8 @@ share/locale/l10n/gd/entry.desktop
share/locale/l10n/gd/flag.png
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/gh/entry.desktop
share/locale/l10n/gh/flag.png
share/locale/l10n/gi/entry.desktop
@@ -1516,6 +1410,8 @@ share/locale/l10n/py/entry.desktop
share/locale/l10n/py/flag.png
share/locale/l10n/qa/entry.desktop
share/locale/l10n/qa/flag.png
+share/locale/l10n/re/entry.desktop
+share/locale/l10n/re/flag.png
share/locale/l10n/ro/entry.desktop
share/locale/l10n/ro/flag.png
share/locale/l10n/rs/entry.desktop
@@ -1629,6 +1525,8 @@ share/locale/l10n/ws/entry.desktop
share/locale/l10n/ws/flag.png
share/locale/l10n/ye/entry.desktop
share/locale/l10n/ye/flag.png
+share/locale/l10n/yt/entry.desktop
+share/locale/l10n/yt/flag.png
share/locale/l10n/za/entry.desktop
share/locale/l10n/za/flag.png
share/locale/l10n/zm/entry.desktop
@@ -1637,19 +1535,26 @@ share/locale/l10n/zw/entry.desktop
share/locale/l10n/zw/flag.png
share/mime/inode/vnd.kde.device.printer.xml
share/mime/inode/vnd.kde.device.router.xml
+share/mime/inode/vnd.kde.device.scanner.xml
share/mime/inode/vnd.kde.device.server.xml
share/mime/inode/vnd.kde.device.unknown.xml
share/mime/inode/vnd.kde.device.workstation.xml
share/mime/inode/vnd.kde.network.xml
+share/mime/inode/vnd.kde.service.acrobat-server.xml
+share/mime/inode/vnd.kde.service.adobe-vc.xml
share/mime/inode/vnd.kde.service.afpovertcp.xml
share/mime/inode/vnd.kde.service.airmouse.xml
share/mime/inode/vnd.kde.service.airport.xml
+share/mime/inode/vnd.kde.service.appletv-itunes.xml
+share/mime/inode/vnd.kde.service.appletv-pair.xml
share/mime/inode/vnd.kde.service.daap.xml
+share/mime/inode/vnd.kde.service.dacp.xml
share/mime/inode/vnd.kde.service.eppc.xml
share/mime/inode/vnd.kde.service.ftp.xml
share/mime/inode/vnd.kde.service.ftps.xml
share/mime/inode/vnd.kde.service.ggz.xml
share/mime/inode/vnd.kde.service.giver.xml
+share/mime/inode/vnd.kde.service.home-sharing.xml
share/mime/inode/vnd.kde.service.http.xml
share/mime/inode/vnd.kde.service.imap.xml
share/mime/inode/vnd.kde.service.ipp.xml
@@ -1662,11 +1567,15 @@ share/mime/inode/vnd.kde.service.lobby.xml
share/mime/inode/vnd.kde.service.lskat.xml
share/mime/inode/vnd.kde.service.net-assistant.xml
share/mime/inode/vnd.kde.service.nfs.xml
+share/mime/inode/vnd.kde.service.nssocketport.xml
share/mime/inode/vnd.kde.service.ntp.xml
share/mime/inode/vnd.kde.service.odisk.xml
+share/mime/inode/vnd.kde.service.pdl-datastream.xml
share/mime/inode/vnd.kde.service.plasma.xml
share/mime/inode/vnd.kde.service.pop3.xml
+share/mime/inode/vnd.kde.service.postgresql.xml
share/mime/inode/vnd.kde.service.presence.xml
+share/mime/inode/vnd.kde.service.printer.xml
share/mime/inode/vnd.kde.service.pulse-server.xml
share/mime/inode/vnd.kde.service.pulse-sink.xml
share/mime/inode/vnd.kde.service.pulse-source.xml
@@ -1683,6 +1592,31 @@ share/mime/inode/vnd.kde.service.svn.xml
share/mime/inode/vnd.kde.service.telnet.xml
share/mime/inode/vnd.kde.service.touch-able.xml
share/mime/inode/vnd.kde.service.unknown.xml
+share/mime/inode/vnd.kde.service.upnp.BasicDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.DigitalSecurityCamera1.xml
+share/mime/inode/vnd.kde.service.upnp.HVAC1.xml
+share/mime/inode/vnd.kde.service.upnp.InternetGatewayDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.LANDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.LightingControls1.xml
+share/mime/inode/vnd.kde.service.upnp.MediaRenderer1.xml
+share/mime/inode/vnd.kde.service.upnp.MediaRenderer2.xml
+share/mime/inode/vnd.kde.service.upnp.MediaServer1.xml
+share/mime/inode/vnd.kde.service.upnp.MediaServer2.xml
+share/mime/inode/vnd.kde.service.upnp.MediaServer3.xml
+share/mime/inode/vnd.kde.service.upnp.PrinterBasic1.xml
+share/mime/inode/vnd.kde.service.upnp.PrinterEnhanced1.xml
+share/mime/inode/vnd.kde.service.upnp.RAClient1.xml
+share/mime/inode/vnd.kde.service.upnp.RADiscoveryAgent1.xml
+share/mime/inode/vnd.kde.service.upnp.RAServer1.xml
+share/mime/inode/vnd.kde.service.upnp.RemoteUIClientDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.RemoteUIServerDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.Scanner1.xml
+share/mime/inode/vnd.kde.service.upnp.SolarProtectionBlind1.xml
+share/mime/inode/vnd.kde.service.upnp.Unknown.xml
+share/mime/inode/vnd.kde.service.upnp.WANConnectionDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.WANDevice1.xml
+share/mime/inode/vnd.kde.service.upnp.WFADevice1.xml
+share/mime/inode/vnd.kde.service.upnp.WLANAccessPointDevice1.xml
share/mime/inode/vnd.kde.service.webdav.xml
share/mime/inode/vnd.kde.service.webdavs.xml
share/mime/inode/vnd.kde.service.workstation.xml
@@ -1740,6 +1674,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/locale/l10n/zw
@dirrm share/locale/l10n/zm
@dirrm share/locale/l10n/za
+@dirrm share/locale/l10n/yt
@dirrm share/locale/l10n/ye
@dirrm share/locale/l10n/ws
@dirrm share/locale/l10n/wf
@@ -1793,6 +1728,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/locale/l10n/ru
@dirrm share/locale/l10n/rs
@dirrm share/locale/l10n/ro
+@dirrm share/locale/l10n/re
@dirrm share/locale/l10n/qa
@dirrm share/locale/l10n/py
@dirrm share/locale/l10n/pw
@@ -1892,6 +1828,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/locale/l10n/gl
@dirrm share/locale/l10n/gi
@dirrm share/locale/l10n/gh
+@dirrm share/locale/l10n/gf
@dirrm share/locale/l10n/ge
@dirrm share/locale/l10n/gd
@dirrm share/locale/l10n/gb
@@ -1972,8 +1909,10 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/locale/currency
@dirrm share/kde4/services/searchproviders
@dirrm share/emoticons/kde4
+@dirrm share/doc/HTML/en/onlinehelp
@dirrm share/doc/HTML/en/network
@dirrm share/doc/HTML/en/knetattach
+@dirrm share/doc/HTML/en/kioslave/xz
@dirrm share/doc/HTML/en/kioslave/thumbnail
@dirrm share/doc/HTML/en/kioslave/tar
@dirrm share/doc/HTML/en/kioslave/smb
@@ -1988,11 +1927,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/doc/HTML/en/kioslave/cgi
@dirrm share/doc/HTML/en/kioslave/bzip2
@dirrm share/doc/HTML/en/kioslave/bookmarks
-@dirrm share/doc/HTML/en/khelpcenter/visualdict
-@dirrm share/doc/HTML/en/khelpcenter/userguide
-@dirrm share/doc/HTML/en/khelpcenter/quickstart
@dirrm share/doc/HTML/en/khelpcenter/glossary
-@dirrm share/doc/HTML/en/khelpcenter/faq
@dirrm share/doc/HTML/en/khelpcenter
@dirrm share/doc/HTML/en/kdesu
@dirrm share/doc/HTML/en/kdebugdialog
@@ -2004,9 +1939,8 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/doc/HTML/en/kcontrol/proxy
@dirrm share/doc/HTML/en/kcontrol/phonon
@dirrm share/doc/HTML/en/kcontrol/performance
-@dirrm share/doc/HTML/en/kcontrol/paths
@dirrm share/doc/HTML/en/kcontrol/netpref
-%%NEPOMUK%%@dirrm share/doc/HTML/en/kcontrol/nepomuk
+@dirrm share/doc/HTML/en/kcontrol/nepomuk
@dirrm share/doc/HTML/en/kcontrol/language
@dirrm share/doc/HTML/en/kcontrol/khtml-plugins
@dirrm share/doc/HTML/en/kcontrol/khtml-java-js
@@ -2020,7 +1954,6 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/doc/HTML/en/kcontrol/kcmcgi
@dirrm share/doc/HTML/en/kcontrol/icons
@dirrm share/doc/HTML/en/kcontrol/history
-@dirrm share/doc/HTML/en/kcontrol/helpindex
@dirrm share/doc/HTML/en/kcontrol/filetypes
@dirrm share/doc/HTML/en/kcontrol/filemanager
@dirrm share/doc/HTML/en/kcontrol/emoticons
@@ -2032,8 +1965,8 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/doc/HTML/en/kcontrol/attica
@dirrm share/desktop-directories
@dirrm share/apps/phonon
-%%NEPOMUK%%@dirrm share/apps/nepomukstrigiservice
-%%NEPOMUK%%@dirrm share/apps/nepomukstorage
+@dirrm share/apps/nepomukstrigiservice
+@dirrm share/apps/nepomukstorage
@dirrm share/apps/libphonon
@dirrm share/apps/kwalletd
@dirrm share/apps/ksmserver/windowmanagers
@@ -2049,7 +1982,6 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/apps/kio_bookmarks
@dirrm share/apps/khelpcenter/searchhandlers/htdig
@dirrm share/apps/khelpcenter/searchhandlers
-@dirrm share/apps/khelpcenter/plugins/Tutorials
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
@@ -2058,6 +1990,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/apps/kcmlocale/pics
@dirrm share/apps/kcmlocale
@dirrm share/apps/kcm_phonon
+@dirrm share/apps/hardwarenotifications
@dirrm share/apps/drkonqi/pics
@dirrm share/apps/drkonqi/debuggers/internal
@dirrm share/apps/drkonqi/debuggers/external
@@ -2069,12 +2002,14 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/apps/desktoptheme/oxygen/opaque
@dirrm share/apps/desktoptheme/oxygen/dialogs
@dirrmtry share/apps/desktoptheme/oxygen
+@dirrm share/apps/desktoptheme/default/translucent/widgets
+@dirrm share/apps/desktoptheme/default/translucent/dialogs
+@dirrm share/apps/desktoptheme/default/translucent
@dirrm share/apps/desktoptheme/default/opaque/widgets
@dirrm share/apps/desktoptheme/default/opaque/dialogs
@dirrm share/apps/desktoptheme/default/opaque
+@dirrm share/apps/desktoptheme/default/icons
@dirrm share/apps/desktoptheme/default/dialogs
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
@dirrm lib/kde4/plugins/phonon_platform
@dirrmtry etc/xdg/menus
@dirrmtry etc/xdg
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 366479afb19d..f1a271da8a56 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -16,12 +16,14 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
+BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
LIB_DEPENDS= qimageblitz.4:${PORTSDIR}/x11/qimageblitz\
dbus-1.3:${PORTSDIR}/devel/dbus \
hal.1:${PORTSDIR}/sysutils/hal \
polkit-qt-core.0:${PORTSDIR}/sysutils/policykit-qt \
xklavier.12:${PORTSDIR}/x11/libxklavier \
- gps.19:${PORTSDIR}/astro/gpsd
+ gps.19:${PORTSDIR}/astro/gpsd \
+ qalculate.5:${PORTSDIR}/math/libqalculate
RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
xprop:${PORTSDIR}/x11/xprop \
@@ -48,7 +50,7 @@ MAKE_JOBS_SAFE= yes
MAN1= plasmaengineexplorer.1
-CONFLICTS= kde4-windeco-aurorae-*
+CONFLICTS= kde4-windeco-aurorae-* kdebase-runtime-4.4.*
CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
-DWITH_BlueZ:BOOL=OFF \
@@ -83,18 +85,20 @@ LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's,/usr/lib/X11,${LOCALBASE}/lib/X11,g' \
+ -e 's,/usr/share/X11,${LOCALBASE}/share/X11,g' \
+ ${PATCH_WRKSRC}/kcontrol/keyboard/xkb_rules.cpp
@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
${PATCH_WRKSRC}/startkde.cmake \
${PATCH_WRKSRC}/kcontrol/kfontinst/lib/KfiConstants.h \
${PATCH_WRKSRC}/kcontrol/kfontinst/kio/KioFonts.cpp \
- ${PATCH_WRKSRC}/kcontrol/kxkb/x11helper.cpp \
+ ${PATCH_WRKSRC}/kcontrol/keyboard/x11_helper.cpp \
${PATCH_WRKSRC}/kdm/backend/client.c \
- ${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c
+ ${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \
+ ${PATCH_WRKSRC}/CMakeLists.txt
${CP} ${FILESDIR}/uptime.* ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/
pre-configure:
- ${REINPLACE_CMD} -e 's|sys/ptrace.h|signal.h|' \
- ${PATCH_WRKSRC}/libs/ksysguard/processui/CMakeLists.txt
${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|' \
${PATCH_WRKSRC}/kwin/effects/thumbnailaside/thumbnailaside.h
.for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp \
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 1f4bdf52951e..7b1d0873a93b 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.4.5.tar.bz2) = c2fba3b92ae82aa120ac159a3333db28
-SHA256 (KDE/kdebase-workspace-4.4.5.tar.bz2) = 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
-SIZE (KDE/kdebase-workspace-4.4.5.tar.bz2) = 77036766
+MD5 (KDE/kdebase-workspace-4.5.1.tar.bz2) = c030fa3530c3675636778d1561b012bd
+SHA256 (KDE/kdebase-workspace-4.5.1.tar.bz2) = cd0da0b493b9aeabc986bae10c3cf0f350c41e1298000a263a12a7a5d7003d57
+SIZE (KDE/kdebase-workspace-4.5.1.tar.bz2) = 65680180
diff --git a/x11/kdebase4-workspace/files/patch-CMakeLists.txt b/x11/kdebase4-workspace/files/patch-CMakeLists.txt
index b0a9a4744f7e..69647cafd4f2 100644
--- a/x11/kdebase4-workspace/files/patch-CMakeLists.txt
+++ b/x11/kdebase4-workspace/files/patch-CMakeLists.txt
@@ -1,6 +1,15 @@
---- ./CMakeLists.txt.orig 2009-01-01 19:26:09.000000000 +0300
-+++ ./CMakeLists.txt 2009-03-07 10:02:36.000000000 +0300
-@@ -220,7 +220,7 @@
+--- ./CMakeLists.txt.orig 2010-07-29 01:04:56.000000000 +0400
++++ ./CMakeLists.txt 2010-08-03 14:45:37.785806201 +0400
+@@ -79,7 +79,7 @@
+ configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
+ configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
+ if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
++ set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/local/lib/X11/icons\"; export XCURSOR_PATH")
+ endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+ configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY)
+ endif(NOT WIN32)
+@@ -231,7 +231,7 @@
macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake
${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH})
diff --git a/x11/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp b/x11/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
deleted file mode 100644
index 15eec2aa583d..000000000000
--- a/x11/kdebase4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./kcontrol/keyboard/kcmmisc.cpp.orig 2008-04-02 08:18:22.000000000 -0400
-+++ ./kcontrol/keyboard/kcmmisc.cpp 2008-07-07 14:02:16.000000000 -0400
-@@ -505,8 +505,10 @@
-
-
- int numlockState = config.readEntry( "NumLock", 2 );
-- if( numlockState != 2 )
-- numlockx_change_numlock_state( numlockState == 0 );
-+ if( numlockState == 2 )
-+ numlockx_change_numlock_state( TRUE );
-+ if( numlockState == 0 )
-+ numlockx_change_numlock_state( FALSE );
- }
-
-
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
index 45f403dd292c..a4102a8029dd 100644
--- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
+++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
@@ -1,12 +1,12 @@
--- ./kdm/kfrontend/CMakeLists.txt.orig 2008-07-30 17:02:54.000000000 +0300
+++ ./kdm/kfrontend/CMakeLists.txt 2008-07-30 17:03:26.000000000 +0300
-@@ -108,6 +108,6 @@
- build_confci()
+@@ -113,6 +113,6 @@
- ## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
+
+ # use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
-install(CODE "
-exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
-")
-+# install(CODE "
-+# exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
-+# ")
++#install(CODE "
++#exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
++#")
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
index c81e73a83e24..ef0cea949b21 100644
--- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,8 +1,8 @@
---- kdm/kfrontend/genkdmconf.c
-+++ kdm/kfrontend/genkdmconf.c
-@@ -44,9 +44,6 @@
- #include <limits.h>
+--- ./kdm/kfrontend/genkdmconf.c.orig 2010-07-06 10:54:31.000000000 +0400
++++ ./kdm/kfrontend/genkdmconf.c 2010-07-30 22:23:28.920432715 +0400
+@@ -45,9 +45,6 @@
#include <sys/stat.h>
+ #include <sys/wait.h>
#include <sys/param.h>
-#ifdef BSD
-# include <utmp.h>
@@ -10,21 +10,21 @@
#define WANT_CONF_GEN
#include <config.ci>
-@@ -1790,7 +1787,7 @@
+@@ -1857,7 +1854,7 @@
#else
# ifdef BSD
- delstr( file, "\n"
--"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ delstr(file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n") |
+"exec sessreg -a -l $DISPLAY -x */Xservers $USER\n" ) |
# endif
#endif /* _AIX */
- delstr( file, "\n"
-@@ -1839,7 +1836,7 @@
+ delstr(file, "\n"
+@@ -1906,7 +1903,7 @@
#else
# ifdef BSD
- delstr( file, "\n"
--"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ delstr(file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n") |
+"exec sessreg -d -l $DISPLAY -x */Xservers $USER\n" ) |
# endif
#endif /* _AIX */
- delstr( file, "\n"
+ delstr(file, "\n"
diff --git a/x11/kdebase4-workspace/files/patch-kdm__backend__client.c b/x11/kdebase4-workspace/files/patch-kdm__backend__client.c
index fe71ad1286a9..ddc34a7504ae 100644
--- a/x11/kdebase4-workspace/files/patch-kdm__backend__client.c
+++ b/x11/kdebase4-workspace/files/patch-kdm__backend__client.c
@@ -1,26 +1,26 @@
---- kdm/backend/client.c.orig 2010-03-26 18:26:49.000000000 +0100
-+++ kdm/backend/client.c 2010-06-16 00:28:31.056683006 +0200
-@@ -1271,6 +1271,9 @@
- char ckDeviceBuf[20] = "";
- const char *ckDevice = ckDeviceBuf;
- dbus_bool_t isLocal;
+--- ./kdm/backend/client.c.orig 2010-07-06 10:54:30.000000000 +0400
++++ ./kdm/backend/client.c 2010-07-30 22:23:48.264408318 +0400
+@@ -1309,6 +1309,9 @@
+ char ckDeviceBuf[20] = "";
+ const char *ckDevice = ckDeviceBuf;
+ dbus_bool_t isLocal;
+# ifdef BSD
+ FILE *proc;
+# endif
#endif
- char *failsafeArgv[2];
- char *buf, *buf2;
-@@ -1302,6 +1305,13 @@
+ char *failsafeArgv[2];
+ char *buf, *buf2;
+@@ -1340,6 +1343,13 @@
# ifdef HAVE_VTS
- if (td->serverVT > 0)
- sprintf( ckDeviceBuf, "/dev/tty%d", td->serverVT );
+ if (td->serverVT > 0)
+ sprintf(ckDeviceBuf, "/dev/tty%d", td->serverVT);
+# elif defined(BSD)
-+ if ((proc = popen( "/usr/local/libexec/ck-get-x11-display-device", "r" ))) {
++ if ((proc = popen( "/usr/local/libexec/ck-get-x11-display-device", "r" ))) {
+ fscanf( proc, "%s", ckDeviceBuf );
-+ pclose( proc );
++ pclose(proc);
+ if (strcmp( ckDeviceBuf, "usage" ) == 0 || strcmp( ckDeviceBuf, "ERROR:" ) == 0)
+ ckDeviceBuf[0] = '\0';
+ }
# endif
- isLocal = ((td->displayType & d_location) == dLocal);
+ isLocal = ((td->displayType & d_location) == dLocal);
# ifdef XDMCP
diff --git a/x11/kdebase4/files/patch-apps__kinfocenter__base__CMakeLists.txt b/x11/kdebase4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt
index 72b28620dcec..c119c41f92ee 100644
--- a/x11/kdebase4/files/patch-apps__kinfocenter__base__CMakeLists.txt
+++ b/x11/kdebase4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt
@@ -1,5 +1,5 @@
---- ./apps/kinfocenter/base/CMakeLists.txt.orig 2008-04-18 11:21:39.000000000 +0400
-+++ ./apps/kinfocenter/base/CMakeLists.txt 2009-09-04 00:32:17.000000000 +0400
+--- ./kinfocenter/Modules/base/CMakeLists.txt.orig 2008-04-18 11:21:39.000000000 +0400
++++ ./kinfocenter/Modules/base/CMakeLists.txt 2009-09-04 00:32:17.000000000 +0400
@@ -2,7 +2,7 @@
# TODO: HAVE_LIBDEVINFO_H (for Solaris 7 and later)
# to be set if both -ldevinfo and libdevinfo.h exist
diff --git a/x11/kde4-baseapps/files/patch-apps__kinfocenter__base__info_fbsd.cpp b/x11/kdebase4-workspace/files/patch-kinfocenter__Modules__base__info_fbsd.cpp
index 026806449c4e..c6bd05dfd898 100644
--- a/x11/kde4-baseapps/files/patch-apps__kinfocenter__base__info_fbsd.cpp
+++ b/x11/kdebase4-workspace/files/patch-kinfocenter__Modules__base__info_fbsd.cpp
@@ -1,5 +1,5 @@
---- ./apps/kinfocenter/base/info_fbsd.cpp.orig 2009-04-15 14:25:24.000000000 +0400
-+++ ./apps/kinfocenter/base/info_fbsd.cpp 2009-09-22 21:33:38.000000000 +0400
+--- ./kinfocenter/Modules/base/info_fbsd.cpp.orig 2009-04-15 14:25:24.000000000 +0400
++++ ./kinfocenter/Modules/base/info_fbsd.cpp 2009-09-22 21:33:38.000000000 +0400
@@ -211,28 +211,17 @@
FILE *pipe;
QFile *pcicontrol;
diff --git a/x11/kde4-baseapps/files/patch-apps__kinfocenter__info__CMakeLists.txt b/x11/kdebase4-workspace/files/patch-kinfocenter__Modules__info__CMakeLists.txt
index c3b3c28f59fe..eada3d9f4a53 100644
--- a/x11/kde4-baseapps/files/patch-apps__kinfocenter__info__CMakeLists.txt
+++ b/x11/kdebase4-workspace/files/patch-kinfocenter__Modules__info__CMakeLists.txt
@@ -1,5 +1,11 @@
---- ./apps/kinfocenter/info/CMakeLists.txt.orig 2008-04-23 19:51:22.000000000 +0400
-+++ ./apps/kinfocenter/info/CMakeLists.txt 2009-09-04 00:42:28.000000000 +0400
+--- ./kinfocenter/Modules/info/CMakeLists.txt.orig 2008-04-23 19:51:22.000000000 +0400
++++ ./kinfocenter/Modules/info/CMakeLists.txt 2009-09-04 00:42:28.000000000 +0400
+@@ -1,4 +1,4 @@
+-
++set(CMAKE_BACKWARDS_COMPATIBILITY 2.2)
+ # OS Base includes
+ include(../base/CMakeLists.txt)
+
@@ -12,7 +12,7 @@
kde4_add_plugin(kcm_info ${kcm_info_PART_SRCS})
@@ -7,5 +13,5 @@
-target_link_libraries(kcm_info ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB})
+target_link_libraries(kcm_info ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB} devinfo)
-
install(TARGETS kcm_info DESTINATION ${PLUGIN_INSTALL_DIR} )
+
diff --git a/x11/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt b/x11/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
deleted file mode 100644
index de32b4591cdf..000000000000
--- a/x11/kdebase4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libs/ksysguard/CMakeLists.txt.orig 2008-04-10 13:30:14.000000000 +0400
-+++ ./libs/ksysguard/CMakeLists.txt 2008-06-28 14:04:29.000000000 +0400
-@@ -5,7 +5,7 @@
- add_subdirectory( processui )
- add_subdirectory( tests )
-
--check_include_files(sys/ptrace.h HAVE_SYS_PTRACE_H)
-+check_include_files(signal.h HAVE_SYS_PTRACE_H)
-
- configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h )
-
diff --git a/x11/kdebase4-workspace/files/patch-solid__CMakeLists.txt b/x11/kdebase4-workspace/files/patch-solid__CMakeLists.txt
deleted file mode 100644
index a4f39228f738..000000000000
--- a/x11/kdebase4-workspace/files/patch-solid__CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- solid/CMakeLists.txt.orig 2010-06-16 09:49:31.723645684 +0200
-+++ solid/CMakeLists.txt 2010-06-16 09:49:41.468153690 +0200
-@@ -7,8 +7,8 @@
- add_subdirectory(kcm)
- add_subdirectory(solid-actions-kcm)
-
-+add_subdirectory(hal)
- IF("${CMAKE_SYSTEM}" MATCHES "Linux")
-- add_subdirectory(hal)
- add_subdirectory(networking)
- add_subdirectory(solidshell)
- ENDIF("${CMAKE_SYSTEM}" MATCHES "Linux")
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 512b482606a4..38068c3876a4 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -11,6 +11,7 @@ bin/kdmctl
bin/kdostartupconfig4
bin/kfontinst
bin/kfontview
+bin/kinfocenter
bin/klipper
bin/kmenuedit
bin/krandom.kss
@@ -26,23 +27,23 @@ bin/ksysguard
bin/ksysguardd
bin/ksystraycmd
bin/kwin
-bin/kwin_killer_helper
-bin/kwin_rules_dialog
-bin/kxkb
+bin/oxygen-demo
+bin/oxygen-settings
bin/plasma-desktop
bin/plasma-netbook
bin/plasma-overlay
+bin/plasma-windowed
bin/plasmaengineexplorer
bin/plasmawallpaperviewer
bin/plasmoidviewer
bin/polkit-kde-authorization
-bin/safestartkde
bin/solid-action-desktop-gen
bin/startkde
bin/startkde4
bin/systemsettings
etc/dbus-1/system.d/org.kde.fontinst.conf
etc/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
+etc/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
etc/ksysguarddrc
include/KDE/Plasma/Weather/Ion
@@ -51,11 +52,6 @@ include/kcommondecoration.h
include/kdecoration.h
include/kdecorationbridge.h
include/kdecorationfactory.h
-include/kephal/configurations.h
-include/kephal/kephal.h
-include/kephal/kephal_export.h
-include/kephal/outputs.h
-include/kephal/screens.h
include/kgreeterplugin.h
include/kscreensaver.h
include/kscreensaver_vroot.h
@@ -79,6 +75,9 @@ 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
@@ -156,6 +155,7 @@ lib/kconf_update_bin/kwin_update_window_settings
lib/kconf_update_bin/plasma-add-shortcut-to-menu
lib/kconf_update_bin/plasma-to-plasma-desktop
lib/kde4/classic_mode.so
+lib/kde4/devinfo.so
lib/kde4/fontthumbnail.so
lib/kde4/icon_mode.so
lib/kde4/ion_bbcukmet.so
@@ -167,15 +167,17 @@ lib/kde4/kcm_autostart.so
lib/kde4/kcm_bell.so
lib/kde4/kcm_clock.so
lib/kde4/kcm_colors.so
-lib/kde4/kcm_desktopthemedetails.so
+lib/kde4/kcm_desktoppaths.so
+lib/kde4/kcm_desktoptheme.so
lib/kde4/kcm_display.so
lib/kde4/kcm_fontinst.so
lib/kde4/kcm_fonts.so
lib/kde4/kcm_hotkeys.so
+lib/kde4/kcm_info.so
+lib/kde4/kcm_infosummary.so
lib/kde4/kcm_input.so
lib/kde4/kcm_kdm.so
lib/kde4/kcm_keyboard.so
-lib/kde4/kcm_keyboard_layout.so
lib/kde4/kcm_keys.so
lib/kde4/kcm_krunner_kill.so
lib/kde4/kcm_ksplashthemes.so
@@ -188,23 +190,32 @@ lib/kde4/kcm_kwinrules.so
lib/kde4/kcm_kwinscreenedges.so
lib/kde4/kcm_kwintabbox.so
lib/kde4/kcm_launch.so
+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_randr.so
+lib/kde4/kcm_samba.so
lib/kde4/kcm_screensaver.so
lib/kde4/kcm_smserver.so
lib/kde4/kcm_solid.so
lib/kde4/kcm_solid_actions.so
lib/kde4/kcm_standard_actions.so
lib/kde4/kcm_style.so
+lib/kde4/kcm_usb.so
lib/kde4/kcm_workspaceoptions.so
lib/kde4/kcm_xinerama.so
+lib/kde4/kded_freespacenotifier.so
lib/kde4/kded_kephal.so
+lib/kde4/kded_keyboard.so
lib/kde4/kded_khotkeys.so
lib/kde4/kded_kwrited.so
lib/kde4/kded_powerdevil.so
lib/kde4/kded_randrmonitor.so
lib/kde4/kded_statusnotifierwatcher.so
+lib/kde4/keyboard_layout_widget.so
lib/kde4/kfontviewpart.so
lib/kde4/kgreet_classic.so
lib/kde4/kgreet_generic.so
@@ -224,8 +235,10 @@ lib/kde4/krunner_sessions.so
lib/kde4/krunner_shell.so
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
@@ -239,7 +252,6 @@ lib/kde4/kwin3_redmond.so
lib/kde4/kwin3_tabstrip.so
lib/kde4/kwin3_web.so
lib/kde4/kwin4_effect_builtins.so
-lib/kde4/kwin_aurorae_config.so
lib/kde4/kwin_b2_config.so
lib/kde4/kwin_kde2_config.so
lib/kde4/kwin_keramik_config.so
@@ -253,12 +265,16 @@ lib/kde4/libexec/fontinst_helper
lib/kde4/libexec/fontinst_x11
lib/kde4/libexec/kcheckpass
lib/kde4/libexec/kcmdatetimehelper
+lib/kde4/libexec/kcmkdmhelper
lib/kde4/libexec/kdm-bin_config
lib/kde4/libexec/kdm-bin_greet
lib/kde4/libexec/kfontprint
lib/kde4/libexec/krootimage
lib/kde4/libexec/kscreenlocker
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-gps.so
@@ -272,8 +288,10 @@ 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
lib/kde4/plasma_applet_launcher.so
lib/kde4/plasma_applet_lockout.so
+lib/kde4/plasma_applet_notifications.so
lib/kde4/plasma_applet_pager.so
lib/kde4/plasma_applet_panelspacer_internal.so
lib/kde4/plasma_applet_quicklaunch.so
@@ -310,6 +328,7 @@ lib/kde4/plasma_engine_akonadi.so
lib/kde4/plasma_engine_applicationjobs.so
lib/kde4/plasma_engine_apps.so
lib/kde4/plasma_engine_calendar.so
+lib/kde4/plasma_engine_devicenotifications.so
lib/kde4/plasma_engine_dict.so
lib/kde4/plasma_engine_executable.so
lib/kde4/plasma_engine_favicons.so
@@ -327,6 +346,7 @@ lib/kde4/plasma_engine_powermanagement.so
lib/kde4/plasma_engine_rss.so
lib/kde4/plasma_engine_searchlaunch.so
lib/kde4/plasma_engine_soliddevice.so
+lib/kde4/plasma_engine_statusnotifieritem.so
lib/kde4/plasma_engine_systemmonitor.so
lib/kde4/plasma_engine_tasks.so
lib/kde4/plasma_engine_time.so
@@ -339,6 +359,7 @@ lib/kde4/plugins/designer/ksignalplotterwidgets.so
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/solid_fakenet.so
lib/kde4/solid_hal_power.so
lib/kde4/solid_lirc.so
@@ -356,9 +377,9 @@ lib/libkdeinit4_ksmserver.so
lib/libkdeinit4_ksysguard.so
lib/libkdeinit4_kwin.so
lib/libkdeinit4_kwin_rules_dialog.so
-lib/libkdeinit4_kxkb.so
lib/libkdeinit4_plasma-desktop.so
lib/libkdeinit4_plasma-netbook.so
+lib/libkdeinit4_plasma-windowed.so
lib/libkephal.so
lib/libkephal.so.5
lib/libkephal.so.5.0.1
@@ -392,6 +413,9 @@ lib/libkworkspace.so.5.0.1
lib/liblsofui.so
lib/liblsofui.so.5
lib/liblsofui.so.5.0.1
+lib/liboxygenstyle.so
+lib/liboxygenstyle.so.5
+lib/liboxygenstyle.so.5.0.1
lib/libplasma-geolocation-interface.so
lib/libplasma-geolocation-interface.so.5
lib/libplasma-geolocation-interface.so.5.0.1
@@ -420,7 +444,7 @@ lib/libsolidcontrolifaces.so
lib/libsolidcontrolifaces.so.5
lib/libsolidcontrolifaces.so.5.0.1
lib/libsystemsettingsview.so
-lib/libsystemsettingsview.so.1
+lib/libsystemsettingsview.so.2
lib/libtaskmanager.so
lib/libtaskmanager.so.5
lib/libtaskmanager.so.5.0.1
@@ -430,8 +454,10 @@ lib/libweather_ion.so.5.0.1
lib/strigi/strigita_font.so
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/applications/kde4/kfontview.desktop
+share/applications/kde4/kinfocenter.desktop
share/applications/kde4/klipper.desktop
share/applications/kde4/kmenuedit.desktop
share/applications/kde4/krandrtray.desktop
@@ -458,12 +484,12 @@ share/apps/desktoptheme/air-netbook/colors
share/apps/desktoptheme/air-netbook/metadata.desktop
share/apps/desktoptheme/air-netbook/widgets/background.svgz
share/apps/desktoptheme/air-netbook/widgets/panel-background.svgz
-share/apps/desktoptheme/air-netbook/widgets/systemtray.svgz
share/apps/desktoptheme/default/calendar/mini-calendar.svgz
share/apps/desktoptheme/default/system-monitor/hdd_panel.svgz
share/apps/desktoptheme/default/widgets/battery-oxygen.svgz
share/apps/doc/kdm/README
share/apps/doc/kdm/greeter.dtd
+share/apps/freespacenotifier/freespacenotifier.notifyrc
share/apps/kaccess/kaccess.notifyrc
share/apps/katepart/syntax/plasma-desktop-js.xml
share/apps/kcminput/cursor_large_black.pcf.gz
@@ -479,15 +505,19 @@ share/apps/kcmkeys/win3.kksrc
share/apps/kcmkeys/win4.kksrc
share/apps/kcmkeys/wm3.kksrc
share/apps/kcmsolidactions/solid-action-template.desktop
+share/apps/kcmusb/usb.ids
share/apps/kconf_update/convertShortcuts.pl
share/apps/kconf_update/kaccel.upd
share/apps/kconf_update/kcmdisplayrc.upd
share/apps/kconf_update/klipper-kconfigxt.upd
share/apps/kconf_update/krdb.upd
share/apps/kconf_update/ksmserver.upd
+share/apps/kconf_update/ksmserver_shortcuts.upd
share/apps/kconf_update/kwin.upd
share/apps/kconf_update/kwin3_plugin.pl
share/apps/kconf_update/kwin3_plugin.upd
+share/apps/kconf_update/kwin_blacklist.sh
+share/apps/kconf_update/kwin_blacklist.upd
share/apps/kconf_update/kwin_focus1.sh
share/apps/kconf_update/kwin_focus1.upd
share/apps/kconf_update/kwin_focus2.sh
@@ -609,19 +639,30 @@ share/apps/kdm/themes/circles/flower.png
share/apps/kdm/themes/circles/help.png
share/apps/kdm/themes/circles/options.png
share/apps/kdm/themes/circles/screenshot.png
-share/apps/kdm/themes/oxygen-air/1920x1200.png
+share/apps/kdm/themes/ethais/KdmGreeterTheme.desktop
+share/apps/kdm/themes/ethais/ethais.xml
+share/apps/kdm/themes/ethais/lineedit_active.png
+share/apps/kdm/themes/ethais/lineedit_normal.png
+share/apps/kdm/themes/ethais/lock.png
+share/apps/kdm/themes/ethais/login_active.png
+share/apps/kdm/themes/ethais/login_normal.png
+share/apps/kdm/themes/ethais/pw_icon.png
+share/apps/kdm/themes/ethais/rectangle.png
+share/apps/kdm/themes/ethais/rectangle_overlay.png
+share/apps/kdm/themes/ethais/screenshot.png
+share/apps/kdm/themes/ethais/session_normal.png
+share/apps/kdm/themes/ethais/system_normal.png
+share/apps/kdm/themes/ethais/user_icon.png
share/apps/kdm/themes/oxygen-air/KdmGreeterTheme.desktop
share/apps/kdm/themes/oxygen-air/caps.png
share/apps/kdm/themes/oxygen-air/icon-kde.png
share/apps/kdm/themes/oxygen-air/oxygen-air.xml
-share/apps/kdm/themes/oxygen-air/pw-entry-li.png
share/apps/kdm/themes/oxygen-air/pw-entry.png
share/apps/kdm/themes/oxygen-air/screenshot.png
share/apps/kdm/themes/oxygen-air/session_button-li.png
share/apps/kdm/themes/oxygen-air/session_button.png
share/apps/kdm/themes/oxygen-air/system_button-li.png
share/apps/kdm/themes/oxygen-air/system_button.png
-share/apps/kdm/themes/oxygen-air/user-entry-li.png
share/apps/kdm/themes/oxygen-air/user-entry.png
share/apps/kdm/themes/oxygen-air/win-login.png
share/apps/kdm/themes/oxygen/KdmGreeterTheme.desktop
@@ -651,6 +692,7 @@ share/apps/khotkeys/defaults.khotkeys
share/apps/khotkeys/kde32b1.khotkeys
share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
share/apps/khotkeys/printscreen.khotkeys
+share/apps/kinfocenter/kinfocenterui.rc
share/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new.png
share/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new_sep.png
share/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new.png
@@ -683,11 +725,24 @@ share/apps/ksplash/Themes/Simple/Preview.png
share/apps/ksplash/Themes/Simple/Theme.rc
share/apps/ksplash/Themes/SimpleSmall/Preview.png
share/apps/ksplash/Themes/SimpleSmall/Theme.rc
+share/apps/kstyle/themes/oxygen.themerc
+share/apps/kstyle/themes/qtcde.themerc
+share/apps/kstyle/themes/qtcleanlooks.themerc
+share/apps/kstyle/themes/qtgtk.themerc
+share/apps/kstyle/themes/qtmotif.themerc
+share/apps/kstyle/themes/qtplastique.themerc
+share/apps/kstyle/themes/qtwindows.themerc
share/apps/ksysguard/ProcessTable.sgrd
share/apps/ksysguard/SystemLoad2.sgrd
share/apps/ksysguard/ksysguard.notifyrc
share/apps/ksysguard/ksysguardui.rc
share/apps/ksysguard/scripts/README
+share/apps/ksysguard/scripts/smaps/helper.js
+share/apps/ksysguard/scripts/smaps/index.html
+share/apps/ksysguard/scripts/smaps/main.js
+share/apps/ksysguard/scripts/smaps/smaps.desktop
+share/apps/ksysguard/scripts/smaps/sorttable.js
+share/apps/ksysguard/scripts/smaps/style.css
share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png
@@ -750,8 +805,10 @@ share/apps/kwin/tabstrip.desktop
share/apps/kwin/trackmouse.png
share/apps/kwin/web.desktop
share/apps/kwrited/kwrited.notifyrc
+share/apps/plasma-desktop/init/00-defaultLayout.js
share/apps/plasma-desktop/plasma-desktop.notifyrc
-share/apps/plasma-netbook/plasma-default-layoutrc
+share/apps/plasma-desktop/updates/systray-to-notifications-widget.js
+share/apps/plasma-netbook/init/00-defaultLayout.js
share/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
share/apps/plasma/dashboard/AppleClasses/AppleButton.js
share/apps/plasma/dashboard/AppleClasses/AppleInfoButton.js
@@ -759,12 +816,21 @@ share/apps/plasma/dashboard/AppleClasses/AppleScrollArea.js
share/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js
share/apps/plasma/dashboard/AppleClasses/AppleSlider.js
share/apps/plasma/dashboard/button/genericButton.js
+share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/metadata.desktop
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/metadata.desktop
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/metadata.desktop
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents/layout.js
+share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/metadata.desktop
share/apps/plasma/services/applicationjobs.operations
share/apps/plasma/services/apps.operations
share/apps/plasma/services/modifierkeystate.operations
share/apps/plasma/services/notifications.operations
share/apps/plasma/services/nowplaying.operations
share/apps/plasma/services/searchlaunch.operations
+share/apps/plasma/services/statusnotifieritem.operations
share/apps/plasma/services/tasks.operations
share/apps/powerdevil/default.powerdevilprofiles
share/apps/powerdevil/powerdevil.notifyrc
@@ -776,7 +842,6 @@ share/apps/solid/devices/solid-device-Block.desktop
share/apps/solid/devices/solid-device-Button.desktop
share/apps/solid/devices/solid-device-Camera.desktop
share/apps/solid/devices/solid-device-DvbInterface.desktop
-share/apps/solid/devices/solid-device-GenericInterface.desktop
share/apps/solid/devices/solid-device-NetworkInterface.desktop
share/apps/solid/devices/solid-device-OpticalDisc.desktop
share/apps/solid/devices/solid-device-OpticalDrive.desktop
@@ -797,6 +862,7 @@ share/autostart/klipper.desktop
share/autostart/krunner.desktop
share/autostart/plasma-desktop.desktop
share/autostart/plasma.desktop
+share/config.kcfg/freespacenotifier.kcfg
share/config.kcfg/klaunch.kcfg
share/config.kcfg/kscreensaversettings.kcfg
share/config.kcfg/kwin.kcfg
@@ -823,6 +889,7 @@ 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/HTML/en/PolicyKit-kde/authdialog_1.png
share/doc/HTML/en/PolicyKit-kde/authdialog_2.png
@@ -876,9 +943,6 @@ share/doc/HTML/en/kcontrol/joystick/joystick-main.png
share/doc/HTML/en/kcontrol/kcmaccess/common
share/doc/HTML/en/kcontrol/kcmaccess/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmaccess/index.docbook
-share/doc/HTML/en/kcontrol/kcmdisplay/common
-share/doc/HTML/en/kcontrol/kcmdisplay/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmdisplay/index.docbook
share/doc/HTML/en/kcontrol/kcmsmserver/common
share/doc/HTML/en/kcontrol/kcmsmserver/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmsmserver/index.docbook
@@ -896,6 +960,7 @@ share/doc/HTML/en/kcontrol/kwincompositing/index.cache.bz2
share/doc/HTML/en/kcontrol/kwincompositing/index.docbook
share/doc/HTML/en/kcontrol/kwindecoration/buttons.png
share/doc/HTML/en/kcontrol/kwindecoration/common
+share/doc/HTML/en/kcontrol/kwindecoration/decoration.png
share/doc/HTML/en/kcontrol/kwindecoration/index.cache.bz2
share/doc/HTML/en/kcontrol/kwindecoration/index.docbook
share/doc/HTML/en/kcontrol/kwindecoration/main.png
@@ -908,6 +973,10 @@ share/doc/HTML/en/kcontrol/kwintabbox/index.docbook
share/doc/HTML/en/kcontrol/mouse/common
share/doc/HTML/en/kcontrol/mouse/index.cache.bz2
share/doc/HTML/en/kcontrol/mouse/index.docbook
+share/doc/HTML/en/kcontrol/paths/common
+share/doc/HTML/en/kcontrol/paths/index.cache.bz2
+share/doc/HTML/en/kcontrol/paths/index.docbook
+share/doc/HTML/en/kcontrol/paths/paths.png
share/doc/HTML/en/kcontrol/powerdevil/common
share/doc/HTML/en/kcontrol/powerdevil/index.cache.bz2
share/doc/HTML/en/kcontrol/powerdevil/index.docbook
@@ -942,6 +1011,17 @@ share/doc/HTML/en/kdm/index.cache.bz2
share/doc/HTML/en/kdm/index.docbook
share/doc/HTML/en/kdm/kdmrc-ref.docbook
share/doc/HTML/en/kdm/theme-ref.docbook
+share/doc/HTML/en/kfontview/common
+share/doc/HTML/en/kfontview/index.cache.bz2
+share/doc/HTML/en/kfontview/index.docbook
+share/doc/HTML/en/kfontview/kfontview.png
+share/doc/HTML/en/kinfocenter/common
+share/doc/HTML/en/kinfocenter/index.cache.bz2
+share/doc/HTML/en/kinfocenter/index.docbook
+share/doc/HTML/en/kinfocenter/kinfocenter.png
+share/doc/HTML/en/kinfocenter/os_block.png
+share/doc/HTML/en/kinfocenter/pro_block.png
+share/doc/HTML/en/kinfocenter/sto_block.png
share/doc/HTML/en/klipper/common
share/doc/HTML/en/klipper/index.cache.bz2
share/doc/HTML/en/klipper/index.docbook
@@ -951,7 +1031,6 @@ share/doc/HTML/en/kmenuedit/done.png
share/doc/HTML/en/kmenuedit/index.cache.bz2
share/doc/HTML/en/kmenuedit/index.docbook
share/doc/HTML/en/kmenuedit/itemname.png
-share/doc/HTML/en/kmenuedit/kmenueditmain.png
share/doc/HTML/en/kmenuedit/new.png
share/doc/HTML/en/kmenuedit/reset.png
share/doc/HTML/en/kmenuedit/selecticon.png
@@ -959,11 +1038,8 @@ share/doc/HTML/en/kmenuedit/selectinternet.png
share/doc/HTML/en/ksysguard/common
share/doc/HTML/en/ksysguard/index.cache.bz2
share/doc/HTML/en/ksysguard/index.docbook
-share/doc/HTML/en/kxkb/common
-share/doc/HTML/en/kxkb/index.cache.bz2
-share/doc/HTML/en/kxkb/index.docbook
+share/doc/HTML/en/plasma-desktop/add-widgets.png
share/doc/HTML/en/plasma-desktop/common
-share/doc/HTML/en/plasma-desktop/favorite-widgets.png
share/doc/HTML/en/plasma-desktop/index.cache.bz2
share/doc/HTML/en/plasma-desktop/index.docbook
share/doc/HTML/en/plasma-desktop/taskbar-settings.png
@@ -998,6 +1074,7 @@ share/icons/Oxygen_Black/cursors/crossed_circle
share/icons/Oxygen_Black/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Oxygen_Black/cursors/dnd-copy
share/icons/Oxygen_Black/cursors/dnd-link
+share/icons/Oxygen_Black/cursors/dnd-move
share/icons/Oxygen_Black/cursors/dnd-no-drop
share/icons/Oxygen_Black/cursors/dnd-none
share/icons/Oxygen_Black/cursors/e-resize
@@ -1072,6 +1149,7 @@ 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
@@ -1146,6 +1224,7 @@ share/icons/Oxygen_Blue/cursors/crossed_circle
share/icons/Oxygen_Blue/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Oxygen_Blue/cursors/dnd-copy
share/icons/Oxygen_Blue/cursors/dnd-link
+share/icons/Oxygen_Blue/cursors/dnd-move
share/icons/Oxygen_Blue/cursors/dnd-no-drop
share/icons/Oxygen_Blue/cursors/dnd-none
share/icons/Oxygen_Blue/cursors/e-resize
@@ -1220,6 +1299,7 @@ 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
@@ -1294,6 +1374,7 @@ share/icons/Oxygen_White/cursors/crossed_circle
share/icons/Oxygen_White/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Oxygen_White/cursors/dnd-copy
share/icons/Oxygen_White/cursors/dnd-link
+share/icons/Oxygen_White/cursors/dnd-move
share/icons/Oxygen_White/cursors/dnd-no-drop
share/icons/Oxygen_White/cursors/dnd-none
share/icons/Oxygen_White/cursors/e-resize
@@ -1368,6 +1449,7 @@ 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
@@ -1442,6 +1524,7 @@ share/icons/Oxygen_Yellow/cursors/crossed_circle
share/icons/Oxygen_Yellow/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Oxygen_Yellow/cursors/dnd-copy
share/icons/Oxygen_Yellow/cursors/dnd-link
+share/icons/Oxygen_Yellow/cursors/dnd-move
share/icons/Oxygen_Yellow/cursors/dnd-no-drop
share/icons/Oxygen_Yellow/cursors/dnd-none
share/icons/Oxygen_Yellow/cursors/e-resize
@@ -1516,6 +1599,7 @@ 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
@@ -1590,6 +1674,7 @@ share/icons/Oxygen_Zion/cursors/crossed_circle
share/icons/Oxygen_Zion/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Oxygen_Zion/cursors/dnd-copy
share/icons/Oxygen_Zion/cursors/dnd-link
+share/icons/Oxygen_Zion/cursors/dnd-move
share/icons/Oxygen_Zion/cursors/dnd-no-drop
share/icons/Oxygen_Zion/cursors/dnd-none
share/icons/Oxygen_Zion/cursors/e-resize
@@ -1664,6 +1749,7 @@ 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
@@ -1713,15 +1799,12 @@ 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
-share/icons/hicolor/16x16/apps/kxkb.png
share/icons/hicolor/22x22/apps/kmenuedit.png
share/icons/hicolor/22x22/apps/ksplash.png
share/icons/hicolor/32x32/apps/kmenuedit.png
share/icons/hicolor/32x32/apps/ksplash.png
-share/icons/hicolor/32x32/apps/kxkb.png
share/icons/hicolor/48x48/apps/kmenuedit.png
share/icons/hicolor/48x48/apps/ksplash.png
-share/icons/hicolor/48x48/apps/kxkb.png
share/icons/hicolor/64x64/apps/ksplash.png
share/icons/oxygen/128x128/apps/kcmkwm.png
share/icons/oxygen/128x128/mimetypes/fonts-package.png
@@ -1765,36 +1848,49 @@ share/kde4/services/bell.desktop
share/kde4/services/clock.desktop
share/kde4/services/colors.desktop
share/kde4/services/desktop.desktop
-share/kde4/services/desktopthemedetails.desktop
+share/kde4/services/desktoppath.desktop
+share/kde4/services/desktoptheme.desktop
+share/kde4/services/deviceinfocategory.desktop
+share/kde4/services/devinfo.desktop
share/kde4/services/display.desktop
+share/kde4/services/dma.desktop
share/kde4/services/fontinst.desktop
share/kde4/services/fonts.desktop
share/kde4/services/fonts.protocol
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-envcan.desktop
share/kde4/services/ion-noaa.desktop
share/kde4/services/ion-wettercom.desktop
+share/kde4/services/ioports.desktop
share/kde4/services/kaccess.desktop
+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
share/kde4/services/kcmsmserver.desktop
+share/kde4/services/kcmusb.desktop
+share/kde4/services/kded/freespacenotifier.desktop
share/kde4/services/kded/kephal.desktop
+share/kde4/services/kded/keyboard.desktop
share/kde4/services/kded/khotkeys.desktop
share/kde4/services/kded/kwrited.desktop
share/kde4/services/kded/powerdevil.desktop
share/kde4/services/kded/randrmonitor.desktop
share/kde4/services/kded/statusnotifierwatcher.desktop
share/kde4/services/kdm.desktop
-share/kde4/services/keyboard.desktop
-share/kde4/services/keyboard_layout.desktop
share/kde4/services/keys.desktop
share/kde4/services/kfontviewpart.desktop
share/kde4/services/khotkeys.desktop
share/kde4/services/ksplashthememgr.desktop
+share/kde4/services/kwin/blur.desktop
+share/kde4/services/kwin/blur_config.desktop
share/kde4/services/kwin/boxswitch.desktop
share/kde4/services/kwin/boxswitch_config.desktop
share/kde4/services/kwin/coverswitch.desktop
@@ -1815,6 +1911,8 @@ share/kde4/services/kwin/fadedesktop.desktop
share/kde4/services/kwin/fallapart.desktop
share/kde4/services/kwin/flipswitch.desktop
share/kde4/services/kwin/flipswitch_config.desktop
+share/kde4/services/kwin/glide.desktop
+share/kde4/services/kwin/glide_config.desktop
share/kde4/services/kwin/highlightwindow.desktop
share/kde4/services/kwin/invert.desktop
share/kde4/services/kwin/invert_config.desktop
@@ -1868,7 +1966,11 @@ share/kde4/services/kwinoptions.desktop
share/kde4/services/kwinrules.desktop
share/kde4/services/kwinscreenedges.desktop
share/kde4/services/kwintabbox.desktop
+share/kde4/services/lostfoundcategory.desktop
share/kde4/services/mouse.desktop
+share/kde4/services/networkinfocategory.desktop
+share/kde4/services/nic.desktop
+share/kde4/services/opengl.desktop
share/kde4/services/plasma-animator-default.desktop
share/kde4/services/plasma-applet-activitybar.desktop
share/kde4/services/plasma-applet-analogclock.desktop
@@ -1879,6 +1981,7 @@ share/kde4/services/plasma-applet-digitalclock.desktop
share/kde4/services/plasma-applet-icon.desktop
share/kde4/services/plasma-applet-launcher.desktop
share/kde4/services/plasma-applet-lockout.desktop
+share/kde4/services/plasma-applet-notifications.desktop
share/kde4/services/plasma-applet-panelspacer-internal.desktop
share/kde4/services/plasma-applet-quicklaunch.desktop
share/kde4/services/plasma-applet-searchbox.desktop
@@ -1896,6 +1999,7 @@ share/kde4/services/plasma-applet-webbrowser.desktop
share/kde4/services/plasma-applet-windowlist.desktop
share/kde4/services/plasma-battery-default.desktop
share/kde4/services/plasma-containment-desktop.desktop
+share/kde4/services/plasma-containment-desktopdashboard.desktop
share/kde4/services/plasma-containment-netpanel.desktop
share/kde4/services/plasma-containment-newspaper.desktop
share/kde4/services/plasma-containment-panel.desktop
@@ -1911,6 +2015,7 @@ share/kde4/services/plasma-containmentactions-switchwindow.desktop
share/kde4/services/plasma-dataengine-applicationjobs.desktop
share/kde4/services/plasma-dataengine-apps.desktop
share/kde4/services/plasma-dataengine-calendar.desktop
+share/kde4/services/plasma-dataengine-devicenotifications.desktop
share/kde4/services/plasma-dataengine-dict.desktop
share/kde4/services/plasma-dataengine-executable.desktop
share/kde4/services/plasma-dataengine-favicons.desktop
@@ -1935,6 +2040,10 @@ share/kde4/services/plasma-engine-metadata.desktop
share/kde4/services/plasma-engine-searchlaunch.desktop
share/kde4/services/plasma-geolocation-gps.desktop
share/kde4/services/plasma-geolocation-ip.desktop
+share/kde4/services/plasma-layout-org.kde.plasma-desktop.defaultPanel.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-web.desktop
share/kde4/services/plasma-pager-default.desktop
@@ -1952,9 +2061,11 @@ share/kde4/services/plasma-runner-sessions.desktop
share/kde4/services/plasma-runner-shell.desktop
share/kde4/services/plasma-runner-solid.desktop
share/kde4/services/plasma-runner-webshortcuts.desktop
+share/kde4/services/plasma-runner-windowedwidgets.desktop
share/kde4/services/plasma-runner-windows.desktop
share/kde4/services/plasma-sal-bookmarks.desktop
share/kde4/services/plasma-sal-contacts.desktop
+share/kde4/services/plasma-sal-development.desktop
share/kde4/services/plasma-sal-education.desktop
share/kde4/services/plasma-sal-games.desktop
share/kde4/services/plasma-sal-graphics.desktop
@@ -1968,33 +2079,40 @@ share/kde4/services/plasma-scriptengine-applet-web.desktop
share/kde4/services/plasma-tasks-default.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/randr.desktop
share/kde4/services/recentdocuments.desktop
share/kde4/services/screensaver.desktop
-share/kde4/services/settings-about-me.desktop
+share/kde4/services/scsi.desktop
share/kde4/services/settings-accessibility.desktop
-share/kde4/services/settings-advanced-user-settings.desktop
-share/kde4/services/settings-advanced.desktop
-share/kde4/services/settings-appearance.desktop
+share/kde4/services/settings-account-details.desktop
+share/kde4/services/settings-application-and-system-notifications.desktop
+share/kde4/services/settings-application-appearance-and-behavior.desktop
+share/kde4/services/settings-application-appearance.desktop
+share/kde4/services/settings-audio-and-video.desktop
share/kde4/services/settings-bluetooth.desktop
share/kde4/services/settings-classic-view.desktop
-share/kde4/services/settings-computer-administration.desktop
-share/kde4/services/settings-desktop.desktop
+share/kde4/services/settings-desktop-appearance.desktop
share/kde4/services/settings-display.desktop
-share/kde4/services/settings-general.desktop
+share/kde4/services/settings-hardware.desktop
share/kde4/services/settings-icon-view.desktop
-share/kde4/services/settings-input-actions.desktop
-share/kde4/services/settings-keyboard-and-mouse.desktop
-share/kde4/services/settings-look-and-feel.desktop
+share/kde4/services/settings-input-devices.desktop
+share/kde4/services/settings-locale.desktop
+share/kde4/services/settings-lost-and-found.desktop
share/kde4/services/settings-network-and-connectivity.desktop
share/kde4/services/settings-network-settings.desktop
-share/kde4/services/settings-notifications.desktop
-share/kde4/services/settings-personal.desktop
-share/kde4/services/settings-regional-and-language.desktop
+share/kde4/services/settings-permissions.desktop
+share/kde4/services/settings-personal-information.desktop
+share/kde4/services/settings-removable-devices.desktop
share/kde4/services/settings-sharing.desktop
-share/kde4/services/settings-system.desktop
+share/kde4/services/settings-shortcuts-and-gestures.desktop
+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/smbstatus.desktop
share/kde4/services/solid-actions.desktop
share/kde4/services/solidbackends/solid_fakenet.desktop
share/kde4/services/solidbackends/solid_hal_power.desktop
@@ -2004,8 +2122,11 @@ share/kde4/services/standard_actions.desktop
share/kde4/services/style.desktop
share/kde4/services/workspaceoptions.desktop
share/kde4/services/xinerama.desktop
+share/kde4/services/xserver.desktop
+share/kde4/servicetypes/kinfocentercategory.desktop
share/kde4/servicetypes/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/screensaver.desktop
share/kde4/servicetypes/solid-device-type.desktop
@@ -2027,31 +2148,24 @@ share/wallpapers/Aghi/contents/images/1920x1200.jpg
share/wallpapers/Aghi/contents/images/800x600.jpg
share/wallpapers/Aghi/contents/screenshot.jpg
share/wallpapers/Aghi/metadata.desktop
-share/wallpapers/Air/contents/images/1024x768.jpg
share/wallpapers/Air/contents/images/1280x1024.jpg
-share/wallpapers/Air/contents/images/1280x800.jpg
-share/wallpapers/Air/contents/images/1440x900.jpg
share/wallpapers/Air/contents/images/1600x1200.jpg
share/wallpapers/Air/contents/images/1920x1080.jpg
share/wallpapers/Air/contents/images/1920x1200.jpg
share/wallpapers/Air/contents/screenshot.png
share/wallpapers/Air/metadata.desktop
-share/wallpapers/Code_Poets_Dream/contents/images/1024x768.jpg
-share/wallpapers/Code_Poets_Dream/contents/images/1280x1024.jpg
-share/wallpapers/Code_Poets_Dream/contents/images/1280x800.jpg
-share/wallpapers/Code_Poets_Dream/contents/images/1440x900.jpg
-share/wallpapers/Code_Poets_Dream/contents/images/1600x1200.jpg
-share/wallpapers/Code_Poets_Dream/contents/images/1920x1200.jpg
-share/wallpapers/Code_Poets_Dream/contents/screenshot.png
-share/wallpapers/Code_Poets_Dream/metadata.desktop
-share/wallpapers/Curls_on_Green/contents/images/1024x768.jpg
-share/wallpapers/Curls_on_Green/contents/images/1280x1024.jpg
-share/wallpapers/Curls_on_Green/contents/images/1280x800.jpg
-share/wallpapers/Curls_on_Green/contents/images/1440x900.jpg
-share/wallpapers/Curls_on_Green/contents/images/1600x1200.jpg
-share/wallpapers/Curls_on_Green/contents/images/1920x1200.jpg
-share/wallpapers/Curls_on_Green/contents/screenshot.png
-share/wallpapers/Curls_on_Green/metadata.desktop
+share/wallpapers/Autumn/contents/images/1280x1024.jpg
+share/wallpapers/Autumn/contents/images/1600x1200.jpg
+share/wallpapers/Autumn/contents/images/1920x1080.jpg
+share/wallpapers/Autumn/contents/images/1920x1200.jpg
+share/wallpapers/Autumn/contents/screenshot.png
+share/wallpapers/Autumn/metadata.desktop
+share/wallpapers/Blue_Wood/contents/images/1280x1024.jpg
+share/wallpapers/Blue_Wood/contents/images/1600x1200.jpg
+share/wallpapers/Blue_Wood/contents/images/1920x1080.jpg
+share/wallpapers/Blue_Wood/contents/images/1920x1200.jpg
+share/wallpapers/Blue_Wood/contents/screenshot.png
+share/wallpapers/Blue_Wood/metadata.desktop
share/wallpapers/Ethais/contents/images/1280x1024.png
share/wallpapers/Ethais/contents/images/1280x800.png
share/wallpapers/Ethais/contents/images/1366x768.png
@@ -2061,40 +2175,39 @@ share/wallpapers/Ethais/contents/images/1920x1080.png
share/wallpapers/Ethais/contents/images/1920x1200.png
share/wallpapers/Ethais/contents/screenshot.png
share/wallpapers/Ethais/metadata.desktop
-share/wallpapers/Evening/contents/images/1024x768.jpg
share/wallpapers/Evening/contents/images/1280x1024.jpg
-share/wallpapers/Evening/contents/images/1280x800.jpg
-share/wallpapers/Evening/contents/images/1440x900.jpg
share/wallpapers/Evening/contents/images/1600x1200.jpg
share/wallpapers/Evening/contents/images/1920x1080.jpg
share/wallpapers/Evening/contents/images/1920x1200.jpg
-share/wallpapers/Evening/contents/images/800x600.jpg
share/wallpapers/Evening/contents/screnshot.jpg
share/wallpapers/Evening/metadata.desktop
-share/wallpapers/Fields_of_Peace/contents/images/1024x768.JPG
share/wallpapers/Fields_of_Peace/contents/images/1280x1024.JPG
-share/wallpapers/Fields_of_Peace/contents/images/1280x800.JPG
-share/wallpapers/Fields_of_Peace/contents/images/1440x900.JPG
share/wallpapers/Fields_of_Peace/contents/images/1600x1200.JPG
share/wallpapers/Fields_of_Peace/contents/images/1920x1200.JPG
share/wallpapers/Fields_of_Peace/contents/screenshot.png
share/wallpapers/Fields_of_Peace/metadata.desktop
-share/wallpapers/Finally_Summer_in_Germany/contents/images/1024x768.jpg
share/wallpapers/Finally_Summer_in_Germany/contents/images/1280x1024.jpg
-share/wallpapers/Finally_Summer_in_Germany/contents/images/1280x800.jpg
-share/wallpapers/Finally_Summer_in_Germany/contents/images/1440x900.jpg
share/wallpapers/Finally_Summer_in_Germany/contents/images/1600x1200.jpg
share/wallpapers/Finally_Summer_in_Germany/contents/images/1920x1200.jpg
share/wallpapers/Finally_Summer_in_Germany/contents/screenshot.png
share/wallpapers/Finally_Summer_in_Germany/metadata.desktop
-share/wallpapers/Fresh_Morning/contents/images/1024x768.jpg
share/wallpapers/Fresh_Morning/contents/images/1280x1024.jpg
-share/wallpapers/Fresh_Morning/contents/images/1280x800.jpg
-share/wallpapers/Fresh_Morning/contents/images/1440x900.jpg
share/wallpapers/Fresh_Morning/contents/images/1600x1200.jpg
share/wallpapers/Fresh_Morning/contents/images/1920x1200.jpg
share/wallpapers/Fresh_Morning/contents/screenshot.png
share/wallpapers/Fresh_Morning/metadata.desktop
+share/wallpapers/Grass/contents/images/1280x1024.jpg
+share/wallpapers/Grass/contents/images/1600x1200.jpg
+share/wallpapers/Grass/contents/images/1920x1080.jpg
+share/wallpapers/Grass/contents/images/1920x1200.jpg
+share/wallpapers/Grass/contents/screenshot.png
+share/wallpapers/Grass/metadata.desktop
+share/wallpapers/Hanami/contents/images/1280x1024.jpg
+share/wallpapers/Hanami/contents/images/1600x1200.jpg
+share/wallpapers/Hanami/contents/images/1920x1080.jpg
+share/wallpapers/Hanami/contents/images/1920x1200.jpg
+share/wallpapers/Hanami/contents/screenshot.png
+share/wallpapers/Hanami/metadata.desktop
share/wallpapers/Media_Life/contents/images/1280x1024.jpg
share/wallpapers/Media_Life/contents/images/1280x800.jpg
share/wallpapers/Media_Life/contents/images/1440x900.jpg
@@ -2105,8 +2218,6 @@ share/wallpapers/Media_Life/contents/images/1920x1200.jpg
share/wallpapers/Media_Life/contents/screenshot.png
share/wallpapers/Media_Life/metadata.desktop
share/wallpapers/Plasmalicious/contents/images/1280x1024.jpg
-share/wallpapers/Plasmalicious/contents/images/1280x800.jpg
-share/wallpapers/Plasmalicious/contents/images/1400x900.jpg
share/wallpapers/Plasmalicious/contents/images/1600x1200.jpg
share/wallpapers/Plasmalicious/contents/images/1920x1200.jpg
share/wallpapers/Plasmalicious/contents/screenshot.png
@@ -2121,42 +2232,13 @@ share/wallpapers/Quadros/contents/images/1920x1200.jpg
share/wallpapers/Quadros/contents/images/800x600.jpg
share/wallpapers/Quadros/contents/screenshot.png
share/wallpapers/Quadros/metadata.desktop
-share/wallpapers/Red_Leaf/contents/images/1024x768.jpg
share/wallpapers/Red_Leaf/contents/images/1280x1024.jpg
-share/wallpapers/Red_Leaf/contents/images/1280x800.jpg
-share/wallpapers/Red_Leaf/contents/images/1440x900.jpg
share/wallpapers/Red_Leaf/contents/images/1600x1200.jpg
share/wallpapers/Red_Leaf/contents/images/1920x1200.jpg
share/wallpapers/Red_Leaf/contents/screenshot.png
share/wallpapers/Red_Leaf/metadata.desktop
-share/wallpapers/Spring_Sunray/contents/images/1024x768.jpg
-share/wallpapers/Spring_Sunray/contents/images/1280x1024.jpg
-share/wallpapers/Spring_Sunray/contents/images/1280x800.jpg
-share/wallpapers/Spring_Sunray/contents/images/1440x900.jpg
-share/wallpapers/Spring_Sunray/contents/images/1600x1200.jpg
-share/wallpapers/Spring_Sunray/contents/images/1920x1080.jpg
-share/wallpapers/Spring_Sunray/contents/images/1920x1200.jpg
-share/wallpapers/Spring_Sunray/contents/images/800x600.jpg
-share/wallpapers/Spring_Sunray/contents/screnshot.jpg
-share/wallpapers/Spring_Sunray/metadata.desktop
-share/wallpapers/The_Rings_of_Saturn/contents/images/1024x768.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1280x1024.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1280x800.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1440x900.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1600x1200.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1920x1080.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/1920x1200.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/images/800x600.jpg
-share/wallpapers/The_Rings_of_Saturn/contents/screenshot.jpg
-share/wallpapers/The_Rings_of_Saturn/metadata.desktop
-share/wallpapers/default_blue.jpg
-share/wallpapers/default_blue.jpg.desktop
-@dirrm share/wallpapers/The_Rings_of_Saturn/contents/images
-@dirrm share/wallpapers/The_Rings_of_Saturn/contents
-@dirrm share/wallpapers/The_Rings_of_Saturn
-@dirrm share/wallpapers/Spring_Sunray/contents/images
-@dirrm share/wallpapers/Spring_Sunray/contents
-@dirrm share/wallpapers/Spring_Sunray
+share/wallpapers/stripes.png
+share/wallpapers/stripes.png.desktop
@dirrm share/wallpapers/Red_Leaf/contents/images
@dirrm share/wallpapers/Red_Leaf/contents
@dirrm share/wallpapers/Red_Leaf
@@ -2166,9 +2248,15 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/wallpapers/Plasmalicious/contents/images
@dirrm share/wallpapers/Plasmalicious/contents
@dirrm share/wallpapers/Plasmalicious
-@dirrm share/wallpapers/Media_Life/contents/images
-@dirrm share/wallpapers/Media_Life/contents
+@dirrmtry share/wallpapers/Media_Life/contents/images
+@dirrmtry share/wallpapers/Media_Life/contents
@dirrmtry share/wallpapers/Media_Life
+@dirrmtry share/wallpapers/Hanami/contents/images
+@dirrmtry share/wallpapers/Hanami/contents
+@dirrmtry share/wallpapers/Hanami
+@dirrmtry share/wallpapers/Grass/contents/images
+@dirrmtry share/wallpapers/Grass/contents
+@dirrmtry share/wallpapers/Grass
@dirrm share/wallpapers/Fresh_Morning/contents/images
@dirrm share/wallpapers/Fresh_Morning/contents
@dirrm share/wallpapers/Fresh_Morning
@@ -2184,12 +2272,12 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/wallpapers/Ethais/contents/images
@dirrm share/wallpapers/Ethais/contents
@dirrm share/wallpapers/Ethais
-@dirrm share/wallpapers/Curls_on_Green/contents/images
-@dirrm share/wallpapers/Curls_on_Green/contents
-@dirrm share/wallpapers/Curls_on_Green
-@dirrm share/wallpapers/Code_Poets_Dream/contents/images
-@dirrm share/wallpapers/Code_Poets_Dream/contents
-@dirrm share/wallpapers/Code_Poets_Dream
+@dirrmtry share/wallpapers/Blue_Wood/contents/images
+@dirrmtry share/wallpapers/Blue_Wood/contents
+@dirrmtry share/wallpapers/Blue_Wood
+@dirrmtry share/wallpapers/Autumn/contents/images
+@dirrmtry share/wallpapers/Autumn/contents
+@dirrmtry share/wallpapers/Autumn
@dirrm share/wallpapers/Air/contents/images
@dirrm share/wallpapers/Air/contents
@dirrm share/wallpapers/Air
@@ -2220,10 +2308,11 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/icons/Oxygen_Black
@dirrm share/doc/HTML/en/systemsettings
@dirrm share/doc/HTML/en/plasma-desktop
-@dirrm share/doc/HTML/en/kxkb
@dirrm share/doc/HTML/en/ksysguard
@dirrm share/doc/HTML/en/kmenuedit
@dirrm share/doc/HTML/en/klipper
+@dirrm share/doc/HTML/en/kinfocenter
+@dirrm share/doc/HTML/en/kfontview
@dirrm share/doc/HTML/en/kdm
@dirrm share/doc/HTML/en/kcontrol/workspaceoptions
@dirrm share/doc/HTML/en/kcontrol/windowspecific
@@ -2233,6 +2322,7 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/doc/HTML/en/kcontrol/solid-actions
@dirrm share/doc/HTML/en/kcontrol/screensaver
@dirrm share/doc/HTML/en/kcontrol/powerdevil
+@dirrm share/doc/HTML/en/kcontrol/paths
@dirrm share/doc/HTML/en/kcontrol/mouse
@dirrm share/doc/HTML/en/kcontrol/kwintabbox
@dirrm share/doc/HTML/en/kcontrol/kwinscreenedges
@@ -2242,7 +2332,6 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/doc/HTML/en/kcontrol/keyboard
@dirrm share/doc/HTML/en/kcontrol/kcmstyle
@dirrm share/doc/HTML/en/kcontrol/kcmsmserver
-@dirrm share/doc/HTML/en/kcontrol/kcmdisplay
@dirrm share/doc/HTML/en/kcontrol/kcmaccess
@dirrm share/doc/HTML/en/kcontrol/joystick
@dirrm share/doc/HTML/en/kcontrol/fonts
@@ -2259,10 +2348,22 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/solidfakenetbackend
@dirrm share/apps/solid/devices
@dirrm share/apps/powerdevil
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents
+@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel
+@dirrm share/apps/plasma/layout-templates
@dirrm share/apps/plasma/dashboard/button
@dirrm share/apps/plasma/dashboard/AppleClasses
@dirrm share/apps/plasma/dashboard
+@dirrmtry share/apps/plasma-netbook/init
@dirrmtry share/apps/plasma-netbook
+@dirrmtry share/apps/plasma-desktop/updates
+@dirrmtry share/apps/plasma-desktop/init
@dirrmtry share/apps/plasma-desktop
@dirrm share/apps/kwrited
@dirrm share/apps/kwin/default_rules
@@ -2280,6 +2381,7 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/kthememanager/themes/HighContrastDark
@dirrm share/apps/kthememanager/themes
@dirrm share/apps/kthememanager
+@dirrm share/apps/ksysguard/scripts/smaps
@dirrm share/apps/ksysguard/scripts
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/Themes/SimpleSmall
@@ -2302,6 +2404,7 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/kmenuedit/icons/oxygen
@dirrm share/apps/kmenuedit/icons
@dirrm share/apps/kmenuedit
+@dirrm share/apps/kinfocenter
@dirrm share/apps/khotkeys
@dirrm share/apps/kfontview
@dirrm share/apps/kfontinst/icons/oxygen/scalable/actions
@@ -2315,26 +2418,27 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/kfontinst
@dirrm share/apps/kdm/themes/oxygen-air
@dirrm share/apps/kdm/themes/oxygen
+@dirrm share/apps/kdm/themes/ethais
@dirrm share/apps/kdm/themes/circles
-@dirrm share/apps/kdm/themes
+@dirrmtry share/apps/kdm/themes
@dirrm share/apps/kdm/sessions
@dirrm share/apps/kdm/programs
@dirrm share/apps/kdm/patterns
@dirrm share/apps/kdisplay/app-defaults
@dirrm share/apps/kdisplay
+@dirrm share/apps/kcmusb
@dirrm share/apps/kcmsolidactions
@dirrm share/apps/kcmkeys
@dirrm share/apps/kcminput/pics
@dirrm share/apps/kcminput
@dirrm share/apps/kaccess
+@dirrm share/apps/freespacenotifier
@dirrm share/apps/doc/kdm
@dirrm share/apps/doc
@dirrm share/apps/desktoptheme/default/system-monitor
@dirrm share/apps/desktoptheme/default/calendar
@dirrm share/apps/desktoptheme/air-netbook/widgets
@dirrm share/apps/desktoptheme/air-netbook
-@dirrmtry share/PolicyKit/policy
-@dirrmtry share/PolicyKit
@dirrm lib/kde4/plugins/gui_platform
@dirrm lib/KDE4Workspace/cmake
@dirrm lib/KDE4Workspace
@@ -2350,6 +2454,5 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm include/kworkspace
@dirrm include/ksysguard
@dirrm include/ksgrd
-@dirrm include/kephal
@dirrm include/KDE/Plasma/Weather
@dirrmtry include/KDE/Plasma
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index eb86e7804ea1..b9c677e8a87b 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -16,9 +16,11 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
+BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \
soprano.4:${PORTSDIR}/textproc/soprano \
- qimageblitz.4:${PORTSDIR}/x11/qimageblitz
+ qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+ kwebkit.1:${PORTSDIR}/www/kwebkitpart
LATEST_LINK= ${PORTNAME}4
@@ -37,10 +39,7 @@ CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
-DWITH_RAW1394:BOOL=OFF \
-DWITH_PCIUTILS:BOOL=OFF
-OPTIONS= WEBKIT "KWebKit support in Konqueror KTTS plugin" off
-
-MAN1= kappfinder.1 \
- kbookmarkmerger.1 \
+MAN1= kbookmarkmerger.1 \
kfind.1
.include <bsd.port.options.mk>
@@ -49,13 +48,4 @@ MAN1= kappfinder.1 \
LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
.endif
-.ifdef(WITH_WEBKIT)
-LIB_DEPENDS+= kwebkit.1:${PORTSDIR}/www/kwebkitpart
-CMAKE_ARGS+= -DWITH_KWebKitPart:BOOL=ON
-PLIST_SUB+= WEBKIT=""
-.else
-CMAKE_ARGS+= -DWITH_KWebKitPart:BOOL=OFF
-PLIST_SUB+= WEBKIT="@comment "
-.endif
-
.include <bsd.port.mk>
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index ae4f7a69df5f..a28c438ea7b5 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-4.4.5.tar.bz2) = 93fa095ba7bee61a995f1ef6c60a1e32
-SHA256 (KDE/kdebase-4.4.5.tar.bz2) = c95e97e257657cc38fa27ba9a84f5b70949b6eeb2521cbbd6f0dbb3cf5ad6be0
-SIZE (KDE/kdebase-4.4.5.tar.bz2) = 4046023
+MD5 (KDE/kdebase-4.5.1.tar.bz2) = 9249b29618eed5dd5c7bfccacb3e0c43
+SHA256 (KDE/kdebase-4.5.1.tar.bz2) = 8bce667812f9dcb7e2018334009ac9942c07144a5d682260af0d8e12f2d0e819
+SIZE (KDE/kdebase-4.5.1.tar.bz2) = 2611115
diff --git a/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake b/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
deleted file mode 100644
index 1cd6d43a3e33..000000000000
--- a/x11/kdebase4/files/patch-apps_cmake_modules_FindPCIUTILS.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./apps/cmake/modules/FindPCIUTILS.cmake.orig 2008-08-07 15:20:57.000000000 +0000
-+++ ./apps/cmake/modules/FindPCIUTILS.cmake 2008-12-27 11:49:04.000000000 +0000
-@@ -14,7 +14,11 @@
- FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pci)
- if(PCIUTILS_LIBRARY)
- FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv)
-- set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY} ${RESOLV_LIBRARY})
-+ if(RESOLV_LIBRARY)
-+ set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY} ${RESOLV_LIBRARY})
-+ else(RESOLV_LIBRARY)
-+ set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY})
-+ endif(RESOLV_LIBRARY)
- endif(PCIUTILS_LIBRARY)
-
-
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index 3d30d89c622b..96cffcc4eaf6 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -1,12 +1,10 @@
bin/dolphin
-bin/kappfinder
bin/kbookmarkmerger
bin/kdepasswd
bin/kdialog
bin/keditbookmarks
bin/kfind
bin/kfmclient
-bin/kinfocenter
bin/konqueror
bin/konsole
bin/konsoleprofile
@@ -31,27 +29,16 @@ include/konqsidebarplugin.h
include/kversioncontrolplugin.h
include/libkonq_export.h
lib/kde4/dolphinpart.so
-lib/kde4/fileviewsvnplugin.so
lib/kde4/kcm_dolphingeneral.so
lib/kde4/kcm_dolphinnavigation.so
lib/kde4/kcm_dolphinservices.so
lib/kde4/kcm_dolphinviewmodes.so
lib/kde4/kcm_history.so
-lib/kde4/kcm_info.so
-lib/kde4/kcm_ioslaveinfo.so
lib/kde4/kcm_kio.so
lib/kde4/kcm_konq.so
lib/kde4/kcm_konqhtml.so
lib/kde4/kcm_kurifilt.so
-lib/kde4/kcm_memory.so
-lib/kde4/kcm_nic.so
-lib/kde4/kcm_opengl.so
-lib/kde4/kcm_partition.so
-lib/kde4/kcm_pci.so
lib/kde4/kcm_performance.so
-lib/kde4/kcm_samba.so
-lib/kde4/kcm_solidproc.so
-lib/kde4/kcm_usb.so
lib/kde4/kcm_useraccount.so
lib/kde4/kded_favicons.so
lib/kde4/kded_konqy_preloader.so
@@ -63,19 +50,22 @@ lib/kde4/konq_sidebartree_bookmarks.so
lib/kde4/konq_sidebartree_dirtree.so
lib/kde4/konq_sound.so
lib/kde4/konqsidebar_history.so
+lib/kde4/konqsidebar_places.so
lib/kde4/konqsidebar_tree.so
lib/kde4/konqsidebar_web.so
lib/kde4/libkcminit_nsplugins.so
-lib/kde4/libkfindpart.so
lib/kde4/libkonsolepart.so
lib/kde4/libnsplugin.so
lib/kde4/plasma_applet_folderview.so
lib/libdolphinprivate.so
lib/libdolphinprivate.so.5
lib/libdolphinprivate.so.5.0.1
+lib/libkbookmarkmodel_private.so
+lib/libkbookmarkmodel_private.so.5
+lib/libkbookmarkmodel_private.so.5.0.1
+lib/libkdeinit4_dolphin.so
lib/libkdeinit4_keditbookmarks.so
lib/libkdeinit4_kfmclient.so
-lib/libkdeinit4_kinfocenter.so
lib/libkdeinit4_konqueror.so
lib/libkdeinit4_konsole.so
lib/libkdeinit4_kwrite.so
@@ -91,14 +81,13 @@ lib/libkonquerorprivate.so.5.0.1
lib/libkonsoleprivate.so
share/applications/kde4/Home.desktop
share/applications/kde4/dolphin.desktop
-share/applications/kde4/kappfinder.desktop
share/applications/kde4/kdepasswd.desktop
+share/applications/kde4/keditbookmarks.desktop
share/applications/kde4/kfind.desktop
share/applications/kde4/kfmclient.desktop
share/applications/kde4/kfmclient_dir.desktop
share/applications/kde4/kfmclient_html.desktop
share/applications/kde4/kfmclient_war.desktop
-share/applications/kde4/kinfocenter.desktop
share/applications/kde4/konqbrowser.desktop
share/applications/kde4/konquerorsu.desktop
share/applications/kde4/konsole.desktop
@@ -108,238 +97,8 @@ share/apps/dolphin/dolphinui.rc
share/apps/dolphinpart/dolphinpart.rc
share/apps/dolphinpart/kpartplugins/kshellcmdplugin.desktop
share/apps/dolphinpart/kpartplugins/kshellcmdplugin.rc
-share/apps/kappfinder/apps/Development/Forte.desktop
-share/apps/kappfinder/apps/Development/assistant.desktop
-share/apps/kappfinder/apps/Development/ddd.desktop
-share/apps/kappfinder/apps/Development/designer.desktop
-share/apps/kappfinder/apps/Development/dlgedit.desktop
-share/apps/kappfinder/apps/Development/eclipse.desktop
-share/apps/kappfinder/apps/Development/j2mewtk.desktop
-share/apps/kappfinder/apps/Development/linguist.desktop
-share/apps/kappfinder/apps/Development/pose.desktop
-share/apps/kappfinder/apps/Editors/emacs.desktop
-share/apps/kappfinder/apps/Editors/gedit.desktop
-share/apps/kappfinder/apps/Editors/gvim.desktop
-share/apps/kappfinder/apps/Editors/lemacs.desktop
-share/apps/kappfinder/apps/Editors/nano.desktop
-share/apps/kappfinder/apps/Editors/nedit.desktop
-share/apps/kappfinder/apps/Editors/pico.desktop
-share/apps/kappfinder/apps/Editors/xedit.desktop
-share/apps/kappfinder/apps/Editors/xemacs.desktop
-share/apps/kappfinder/apps/Games/Arcade/ClanBomber.desktop
-share/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop
-share/apps/kappfinder/apps/Games/Arcade/Gnibbles.desktop
-share/apps/kappfinder/apps/Games/Arcade/GnobotsII.desktop
-share/apps/kappfinder/apps/Games/Arcade/Mures.desktop
-share/apps/kappfinder/apps/Games/Arcade/SuperMethaneBrothers.desktop
-share/apps/kappfinder/apps/Games/Arcade/Trophy.desktop
-share/apps/kappfinder/apps/Games/Arcade/TuxRacer.desktop
-share/apps/kappfinder/apps/Games/Arcade/XKobo.desktop
-share/apps/kappfinder/apps/Games/Arcade/XSoldier.desktop
-share/apps/kappfinder/apps/Games/Arcade/alephone-nogl.desktop
-share/apps/kappfinder/apps/Games/Arcade/alephone.desktop
-share/apps/kappfinder/apps/Games/Arcade/cxhextris.desktop
-share/apps/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop
-share/apps/kappfinder/apps/Games/Board/Gataxx.desktop
-share/apps/kappfinder/apps/Games/Board/Gchess.desktop
-share/apps/kappfinder/apps/Games/Board/Glines.desktop
-share/apps/kappfinder/apps/Games/Board/Gmahjongg.desktop
-share/apps/kappfinder/apps/Games/Board/Gmines.desktop
-share/apps/kappfinder/apps/Games/Board/Gnotravex.desktop
-share/apps/kappfinder/apps/Games/Board/Gnotski.desktop
-share/apps/kappfinder/apps/Games/Board/Gstones.desktop
-share/apps/kappfinder/apps/Games/Board/Iagno.desktop
-share/apps/kappfinder/apps/Games/Board/SameGnome.desktop
-share/apps/kappfinder/apps/Games/Board/Xgammon.desktop
-share/apps/kappfinder/apps/Games/Board/xboard.desktop
-share/apps/kappfinder/apps/Games/Card/AisleRiot.desktop
-share/apps/kappfinder/apps/Games/Card/FreeCell.desktop
-share/apps/kappfinder/apps/Games/Card/PySol.desktop
-share/apps/kappfinder/apps/Games/Card/XPat2.desktop
-share/apps/kappfinder/apps/Games/Clanbomber.desktop
-share/apps/kappfinder/apps/Games/Emulators/qmamecat.desktop
-share/apps/kappfinder/apps/Games/GTali.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/angband.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/moria.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/nethack.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/rogue.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/tome.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/zangband.desktop
-share/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop
-share/apps/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop
-share/apps/kappfinder/apps/Games/TacticStrategy/xscorch.desktop
-share/apps/kappfinder/apps/Games/defendguin.desktop
-share/apps/kappfinder/apps/Games/penguin-command.desktop
-share/apps/kappfinder/apps/Games/xshipwars.desktop
-share/apps/kappfinder/apps/Graphics/ElectricEyes.desktop
-share/apps/kappfinder/apps/Graphics/GPhoto.desktop
-share/apps/kappfinder/apps/Graphics/GnomeColorSelector.desktop
-share/apps/kappfinder/apps/Graphics/GnomeIconEditor.desktop
-share/apps/kappfinder/apps/Graphics/Gqview.desktop
-share/apps/kappfinder/apps/Graphics/Sketch.desktop
-share/apps/kappfinder/apps/Graphics/Xpcd.desktop
-share/apps/kappfinder/apps/Graphics/Xwpick.desktop
-share/apps/kappfinder/apps/Graphics/bitmap.desktop
-share/apps/kappfinder/apps/Graphics/blender.desktop
-share/apps/kappfinder/apps/Graphics/ghostview.desktop
-share/apps/kappfinder/apps/Graphics/gimp.desktop
-share/apps/kappfinder/apps/Graphics/gv.desktop
-share/apps/kappfinder/apps/Graphics/inkscape.desktop
-share/apps/kappfinder/apps/Graphics/sodipodi.desktop
-share/apps/kappfinder/apps/Graphics/tgif.desktop
-share/apps/kappfinder/apps/Graphics/xdvi.desktop
-share/apps/kappfinder/apps/Graphics/xfig.desktop
-share/apps/kappfinder/apps/Graphics/xpaint.desktop
-share/apps/kappfinder/apps/Graphics/xv.desktop
-share/apps/kappfinder/apps/Internet/BlueFish.desktop
-share/apps/kappfinder/apps/Internet/Dpsftp.desktop
-share/apps/kappfinder/apps/Internet/DrakSync.desktop
-share/apps/kappfinder/apps/Internet/Evolution.desktop
-share/apps/kappfinder/apps/Internet/Faces.desktop
-share/apps/kappfinder/apps/Internet/Fetchmailconf.desktop
-share/apps/kappfinder/apps/Internet/Gabber.desktop
-share/apps/kappfinder/apps/Internet/Galeon.desktop
-share/apps/kappfinder/apps/Internet/GnomeICU.desktop
-share/apps/kappfinder/apps/Internet/Netscapemessenger.desktop
-share/apps/kappfinder/apps/Internet/Nmapfe.desktop
-share/apps/kappfinder/apps/Internet/Pan.desktop
-share/apps/kappfinder/apps/Internet/Sylpheed.desktop
-share/apps/kappfinder/apps/Internet/Terminal/Links.desktop
-share/apps/kappfinder/apps/Internet/Terminal/Lynx.desktop
-share/apps/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
-share/apps/kappfinder/apps/Internet/Terminal/lftp.desktop
-share/apps/kappfinder/apps/Internet/Terminal/mutt.desktop
-share/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop
-share/apps/kappfinder/apps/Internet/Terminal/pine.desktop
-share/apps/kappfinder/apps/Internet/Terminal/silc.desktop
-share/apps/kappfinder/apps/Internet/Terminal/slrn.desktop
-share/apps/kappfinder/apps/Internet/Terminal/w3m.desktop
-share/apps/kappfinder/apps/Internet/arena.desktop
-share/apps/kappfinder/apps/Internet/balsa.desktop
-share/apps/kappfinder/apps/Internet/btdownloadgui.desktop
-share/apps/kappfinder/apps/Internet/coolmail.desktop
-share/apps/kappfinder/apps/Internet/dc_gui.desktop
-share/apps/kappfinder/apps/Internet/ed2k_gui.desktop
-share/apps/kappfinder/apps/Internet/epiphany.desktop
-share/apps/kappfinder/apps/Internet/ethereal.desktop
-share/apps/kappfinder/apps/Internet/gFTP.desktop
-share/apps/kappfinder/apps/Internet/gaim.desktop
-share/apps/kappfinder/apps/Internet/gnomemeeting.desktop
-share/apps/kappfinder/apps/Internet/gnometalk.desktop
-share/apps/kappfinder/apps/Internet/gtelnet.desktop
-share/apps/kappfinder/apps/Internet/ickle.desktop
-share/apps/kappfinder/apps/Internet/javaws.desktop
-share/apps/kappfinder/apps/Internet/knews.desktop
-share/apps/kappfinder/apps/Internet/licq.desktop
-share/apps/kappfinder/apps/Internet/mldonkey_gui.desktop
-share/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
-share/apps/kappfinder/apps/Internet/mozilla-thunderbird.desktop
-share/apps/kappfinder/apps/Internet/mozilla.desktop
-share/apps/kappfinder/apps/Internet/netscape.desktop
-share/apps/kappfinder/apps/Internet/netscape6.desktop
-share/apps/kappfinder/apps/Internet/opera.desktop
-share/apps/kappfinder/apps/Internet/wireshark.desktop
-share/apps/kappfinder/apps/Internet/xbiff.desktop
-share/apps/kappfinder/apps/Internet/xchat.desktop
-share/apps/kappfinder/apps/Internet/xfmail.desktop
-share/apps/kappfinder/apps/Internet/xftp.desktop
-share/apps/kappfinder/apps/Multimedia/Aumix.desktop
-share/apps/kappfinder/apps/Multimedia/Grip.desktop
-share/apps/kappfinder/apps/Multimedia/MP3info.desktop
-share/apps/kappfinder/apps/Multimedia/XMovie.desktop
-share/apps/kappfinder/apps/Multimedia/alevt.desktop
-share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop
-share/apps/kappfinder/apps/Multimedia/ams.desktop
-share/apps/kappfinder/apps/Multimedia/amsynth.desktop
-share/apps/kappfinder/apps/Multimedia/ardour.desktop
-share/apps/kappfinder/apps/Multimedia/audacity.desktop
-share/apps/kappfinder/apps/Multimedia/aviplay.desktop
-share/apps/kappfinder/apps/Multimedia/bcast2000.desktop
-share/apps/kappfinder/apps/Multimedia/djplay.desktop
-share/apps/kappfinder/apps/Multimedia/ecamegapedal.desktop
-share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop
-share/apps/kappfinder/apps/Multimedia/freebirth.desktop
-share/apps/kappfinder/apps/Multimedia/freqtweak.desktop
-share/apps/kappfinder/apps/Multimedia/galan.desktop
-share/apps/kappfinder/apps/Multimedia/gtv.desktop
-share/apps/kappfinder/apps/Multimedia/hydrogen.desktop
-share/apps/kappfinder/apps/Multimedia/jack-rack.desktop
-share/apps/kappfinder/apps/Multimedia/jamin.desktop
-share/apps/kappfinder/apps/Multimedia/jazz.desktop
-share/apps/kappfinder/apps/Multimedia/meterbridge.desktop
-share/apps/kappfinder/apps/Multimedia/mixxx.desktop
-share/apps/kappfinder/apps/Multimedia/mplayer.desktop
-share/apps/kappfinder/apps/Multimedia/mtv.desktop
-share/apps/kappfinder/apps/Multimedia/muse.desktop
-share/apps/kappfinder/apps/Multimedia/ogle.desktop
-share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop
-share/apps/kappfinder/apps/Multimedia/qjackctl.desktop
-share/apps/kappfinder/apps/Multimedia/qsynth.desktop
-share/apps/kappfinder/apps/Multimedia/realplayer.desktop
-share/apps/kappfinder/apps/Multimedia/rezound.desktop
-share/apps/kappfinder/apps/Multimedia/slab.desktop
-share/apps/kappfinder/apps/Multimedia/sweep.desktop
-share/apps/kappfinder/apps/Multimedia/vkeybd.desktop
-share/apps/kappfinder/apps/Multimedia/xawtv.desktop
-share/apps/kappfinder/apps/Multimedia/xcam.desktop
-share/apps/kappfinder/apps/Multimedia/xine.desktop
-share/apps/kappfinder/apps/Multimedia/xmms-enqueue.desktop
-share/apps/kappfinder/apps/Multimedia/xmms.desktop
-share/apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop
-share/apps/kappfinder/apps/Office/Applix.desktop
-share/apps/kappfinder/apps/Office/Dia.desktop
-share/apps/kappfinder/apps/Office/Gnome-Cal.desktop
-share/apps/kappfinder/apps/Office/Gnome-Card.desktop
-share/apps/kappfinder/apps/Office/GnomeTimeTracker.desktop
-share/apps/kappfinder/apps/Office/Gnumeric.desktop
-share/apps/kappfinder/apps/Office/Guppi.desktop
-share/apps/kappfinder/apps/Office/Ical.desktop
-share/apps/kappfinder/apps/Office/WordPerfect.desktop
-share/apps/kappfinder/apps/Office/WordPerfect2000.desktop
-share/apps/kappfinder/apps/Office/XAcc.desktop
-share/apps/kappfinder/apps/Office/XsLite.desktop
-share/apps/kappfinder/apps/Office/abiword.desktop
-share/apps/kappfinder/apps/Office/acroread.desktop
-share/apps/kappfinder/apps/Office/gnucash.desktop
-share/apps/kappfinder/apps/Office/lyx.desktop
-share/apps/kappfinder/apps/Office/mrproject.desktop
-share/apps/kappfinder/apps/Office/netscapeaddressbook.desktop
-share/apps/kappfinder/apps/Office/plan.desktop
-share/apps/kappfinder/apps/Office/pybliographic.desktop
-share/apps/kappfinder/apps/Office/scribus.desktop
-share/apps/kappfinder/apps/Office/xpdf.desktop
-share/apps/kappfinder/apps/System/Terminal/aterm.desktop
-share/apps/kappfinder/apps/System/Terminal/procinfo.desktop
-share/apps/kappfinder/apps/System/Terminal/rxvt.desktop
-share/apps/kappfinder/apps/System/Terminal/vmstat.desktop
-share/apps/kappfinder/apps/System/citrix_ica.desktop
-share/apps/kappfinder/apps/System/editres.desktop
-share/apps/kappfinder/apps/System/sam.desktop
-share/apps/kappfinder/apps/System/wine.desktop
-share/apps/kappfinder/apps/System/xosview.desktop
-share/apps/kappfinder/apps/Toys/xeyes.desktop
-share/apps/kappfinder/apps/Toys/xpinguin.desktop
-share/apps/kappfinder/apps/Utilities/GKrellM.desktop
-share/apps/kappfinder/apps/Utilities/GnomeWho.desktop
-share/apps/kappfinder/apps/Utilities/SystemInfo.desktop
-share/apps/kappfinder/apps/Utilities/SystemLogViewer.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/Xkill.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xcalc.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xclipboard.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xclock.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xconsole.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xload.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xmag.desktop
-share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
-share/apps/kappfinder/apps/Utilities/calctool.desktop
-share/apps/kappfinder/apps/Utilities/e-notes.desktop
-share/apps/kappfinder/apps/Utilities/oclock.desktop
-share/apps/kappfinder/apps/Utilities/xgnokii.desktop
share/apps/kbookmark/directory_bookmarkbar.desktop
share/apps/kcmcss/template.css
-share/apps/kcmusb/usb.ids
share/apps/kconf_update/favicons.upd
share/apps/kconf_update/kfmclient_3_2.upd
share/apps/kconf_update/kfmclient_3_2_update.sh
@@ -357,18 +116,17 @@ share/apps/keditbookmarks/keditbookmarks-genui.rc
share/apps/keditbookmarks/keditbookmarksui.rc
share/apps/khtml/kpartplugins/khtmlkttsd.desktop
share/apps/khtml/kpartplugins/khtmlkttsd.rc
-share/apps/kinfocenter/about/kinfocenter.css
-share/apps/kinfocenter/about/main.html
-share/apps/kinfocenter/kinfocenterui.rc
share/apps/konqsidebartng/dirtree/bookmarks_module.desktop
share/apps/konqsidebartng/dirtree/dirtree_module.desktop
share/apps/konqsidebartng/entries/bookmarks.desktop
share/apps/konqsidebartng/entries/history.desktop
share/apps/konqsidebartng/entries/home.desktop
+share/apps/konqsidebartng/entries/places.desktop
share/apps/konqsidebartng/entries/remote.desktop
share/apps/konqsidebartng/entries/root.desktop
share/apps/konqsidebartng/entries/services.desktop
share/apps/konqsidebartng/plugins/konqsidebar_history.desktop
+share/apps/konqsidebartng/plugins/konqsidebar_places.desktop
share/apps/konqsidebartng/plugins/konqsidebar_tree.desktop
share/apps/konqsidebartng/plugins/konqsidebar_web.desktop
share/apps/konqsidebartng/virtual_folders/remote/.directory
@@ -421,8 +179,8 @@ share/apps/konsole/linux.keytab
share/apps/konsole/partui.rc
share/apps/konsole/sessionui.rc
share/apps/konsole/solaris.keytab
-%%WEBKIT%%share/apps/kwebkitpart/kpartplugins/khtmlkttsd.desktop
-%%WEBKIT%%share/apps/kwebkitpart/kpartplugins/khtmlkttsd.rc
+share/apps/kwebkitpart/kpartplugins/khtmlkttsd.desktop
+share/apps/kwebkitpart/kpartplugins/khtmlkttsd.rc
share/apps/kwrite/kwriteui.rc
share/apps/plugin/nspluginpart.rc
share/autostart/konqy_preload.desktop
@@ -453,6 +211,7 @@ share/doc/HTML/en/dolphin/index.cache.bz2
share/doc/HTML/en/dolphin/index.docbook
share/doc/HTML/en/dolphin/locationbar-breadcrumb.png
share/doc/HTML/en/dolphin/locationbar-editable.png
+share/doc/HTML/en/dolphin/nepomuk-search.png
share/doc/HTML/en/dolphin/preferences-general-behavior.png
share/doc/HTML/en/dolphin/preferences-navigation.png
share/doc/HTML/en/dolphin/preferences-startup.png
@@ -469,61 +228,6 @@ share/doc/HTML/en/kfind/common
share/doc/HTML/en/kfind/index.cache.bz2
share/doc/HTML/en/kfind/index.docbook
share/doc/HTML/en/kfind/man-kfind.1.docbook
-share/doc/HTML/en/kinfocenter/common
-share/doc/HTML/en/kinfocenter/devices/common
-share/doc/HTML/en/kinfocenter/devices/index.cache.bz2
-share/doc/HTML/en/kinfocenter/devices/index.docbook
-share/doc/HTML/en/kinfocenter/dma/common
-share/doc/HTML/en/kinfocenter/dma/index.cache.bz2
-share/doc/HTML/en/kinfocenter/dma/index.docbook
-share/doc/HTML/en/kinfocenter/index.cache.bz2
-share/doc/HTML/en/kinfocenter/index.docbook
-share/doc/HTML/en/kinfocenter/interrupts/common
-share/doc/HTML/en/kinfocenter/interrupts/index.cache.bz2
-share/doc/HTML/en/kinfocenter/interrupts/index.docbook
-share/doc/HTML/en/kinfocenter/ioports/common
-share/doc/HTML/en/kinfocenter/ioports/index.cache.bz2
-share/doc/HTML/en/kinfocenter/ioports/index.docbook
-share/doc/HTML/en/kinfocenter/kinfocenter.png
-share/doc/HTML/en/kinfocenter/memory/common
-share/doc/HTML/en/kinfocenter/memory/index.cache.bz2
-share/doc/HTML/en/kinfocenter/memory/index.docbook
-share/doc/HTML/en/kinfocenter/nics/common
-share/doc/HTML/en/kinfocenter/nics/index.cache.bz2
-share/doc/HTML/en/kinfocenter/nics/index.docbook
-share/doc/HTML/en/kinfocenter/opengl/common
-share/doc/HTML/en/kinfocenter/opengl/index.cache.bz2
-share/doc/HTML/en/kinfocenter/opengl/index.docbook
-share/doc/HTML/en/kinfocenter/partitions/common
-share/doc/HTML/en/kinfocenter/partitions/index.cache.bz2
-share/doc/HTML/en/kinfocenter/partitions/index.docbook
-share/doc/HTML/en/kinfocenter/pci/common
-share/doc/HTML/en/kinfocenter/pci/index.cache.bz2
-share/doc/HTML/en/kinfocenter/pci/index.docbook
-share/doc/HTML/en/kinfocenter/processor/common
-share/doc/HTML/en/kinfocenter/processor/index.cache.bz2
-share/doc/HTML/en/kinfocenter/processor/index.docbook
-share/doc/HTML/en/kinfocenter/protocols/common
-share/doc/HTML/en/kinfocenter/protocols/index.cache.bz2
-share/doc/HTML/en/kinfocenter/protocols/index.docbook
-share/doc/HTML/en/kinfocenter/samba/common
-share/doc/HTML/en/kinfocenter/samba/index.cache.bz2
-share/doc/HTML/en/kinfocenter/samba/index.docbook
-share/doc/HTML/en/kinfocenter/scsi/common
-share/doc/HTML/en/kinfocenter/scsi/index.cache.bz2
-share/doc/HTML/en/kinfocenter/scsi/index.docbook
-share/doc/HTML/en/kinfocenter/sound/common
-share/doc/HTML/en/kinfocenter/sound/index.cache.bz2
-share/doc/HTML/en/kinfocenter/sound/index.docbook
-share/doc/HTML/en/kinfocenter/usb/common
-share/doc/HTML/en/kinfocenter/usb/index.cache.bz2
-share/doc/HTML/en/kinfocenter/usb/index.docbook
-share/doc/HTML/en/kinfocenter/view1394/common
-share/doc/HTML/en/kinfocenter/view1394/index.cache.bz2
-share/doc/HTML/en/kinfocenter/view1394/index.docbook
-share/doc/HTML/en/kinfocenter/xserver/common
-share/doc/HTML/en/kinfocenter/xserver/index.cache.bz2
-share/doc/HTML/en/kinfocenter/xserver/index.docbook
share/doc/HTML/en/konqueror/basics.docbook
share/doc/HTML/en/konqueror/bookmarks.docbook
share/doc/HTML/en/konqueror/browser.docbook
@@ -555,238 +259,25 @@ share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/kwrite/common
share/doc/HTML/en/kwrite/index.cache.bz2
share/doc/HTML/en/kwrite/index.docbook
-share/icons/hicolor/128x128/apps/kappfinder.png
share/icons/hicolor/128x128/apps/konqueror.png
-share/icons/hicolor/16x16/apps/kappfinder.png
share/icons/hicolor/16x16/apps/kfind.png
share/icons/hicolor/16x16/apps/konqueror.png
-share/icons/hicolor/22x22/apps/kappfinder.png
share/icons/hicolor/22x22/apps/kfind.png
share/icons/hicolor/22x22/apps/konqueror.png
-share/icons/hicolor/32x32/apps/kappfinder.png
share/icons/hicolor/32x32/apps/kfind.png
share/icons/hicolor/32x32/apps/konqueror.png
-share/icons/hicolor/48x48/apps/kappfinder.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/konqueror.png
-share/icons/hicolor/64x64/apps/kappfinder.png
share/icons/hicolor/64x64/apps/kfind.png
share/icons/hicolor/64x64/apps/konqueror.png
share/icons/hicolor/scalable/apps/konqueror.svgz
-share/icons/oxygen/128x128/apps/applixware.png
-share/icons/oxygen/128x128/apps/clanbomber.png
-share/icons/oxygen/128x128/apps/email.png
-share/icons/oxygen/128x128/apps/gimp.png
-share/icons/oxygen/128x128/apps/licq.png
-share/icons/oxygen/128x128/apps/netscape.png
-share/icons/oxygen/128x128/apps/penguin.png
-share/icons/oxygen/128x128/apps/staroffice.png
-share/icons/oxygen/128x128/apps/terminal.png
-share/icons/oxygen/128x128/apps/tux.png
-share/icons/oxygen/128x128/apps/wp.png
-share/icons/oxygen/128x128/apps/xclock.png
-share/icons/oxygen/128x128/apps/xfmail.png
-share/icons/oxygen/128x128/apps/xmag.png
-share/icons/oxygen/16x16/apps/abiword.png
-share/icons/oxygen/16x16/apps/alevt.png
-share/icons/oxygen/16x16/apps/applixware.png
-share/icons/oxygen/16x16/apps/assistant.png
-share/icons/oxygen/16x16/apps/blender.png
-share/icons/oxygen/16x16/apps/bluefish.png
-share/icons/oxygen/16x16/apps/clanbomber.png
-share/icons/oxygen/16x16/apps/designer.png
-share/icons/oxygen/16x16/apps/dia.png
-share/icons/oxygen/16x16/apps/eclipse.png
-share/icons/oxygen/16x16/apps/emacs.png
-share/icons/oxygen/16x16/apps/email.png
-share/icons/oxygen/16x16/apps/evolution.png
-share/icons/oxygen/16x16/apps/gabber.png
-share/icons/oxygen/16x16/apps/gaim.png
-share/icons/oxygen/16x16/apps/gimp.png
-share/icons/oxygen/16x16/apps/gnomemeeting.png
-share/icons/oxygen/16x16/apps/gnucash.png
-share/icons/oxygen/16x16/apps/gnumeric.png
-share/icons/oxygen/16x16/apps/gv.png
-share/icons/oxygen/16x16/apps/gvim.png
-share/icons/oxygen/16x16/apps/licq.png
-share/icons/oxygen/16x16/apps/linguist.png
-share/icons/oxygen/16x16/apps/lyx.png
-share/icons/oxygen/16x16/apps/netscape.png
-share/icons/oxygen/16x16/apps/opera.png
-share/icons/oxygen/16x16/apps/pan.png
-share/icons/oxygen/16x16/apps/penguin.png
-share/icons/oxygen/16x16/apps/plan.png
-share/icons/oxygen/16x16/apps/planner.png
-share/icons/oxygen/16x16/apps/pybliographic.png
-share/icons/oxygen/16x16/apps/realplayer.png
-share/icons/oxygen/16x16/apps/sodipodi.png
-share/icons/oxygen/16x16/apps/terminal.png
-share/icons/oxygen/16x16/apps/tux.png
-share/icons/oxygen/16x16/apps/wp.png
-share/icons/oxygen/16x16/apps/xcalc.png
-share/icons/oxygen/16x16/apps/xchat.png
-share/icons/oxygen/16x16/apps/xclipboard.png
-share/icons/oxygen/16x16/apps/xclock.png
-share/icons/oxygen/16x16/apps/xedit.png
-share/icons/oxygen/16x16/apps/xemacs.png
-share/icons/oxygen/16x16/apps/xeyes.png
-share/icons/oxygen/16x16/apps/xfig.png
-share/icons/oxygen/16x16/apps/xfmail.png
-share/icons/oxygen/16x16/apps/xload.png
-share/icons/oxygen/16x16/apps/xmag.png
-share/icons/oxygen/16x16/apps/xmms.png
-share/icons/oxygen/16x16/apps/xosview.png
-share/icons/oxygen/16x16/apps/xpaint.png
-share/icons/oxygen/16x16/apps/xv.png
-share/icons/oxygen/22x22/apps/email.png
-share/icons/oxygen/32x32/apps/abiword.png
-share/icons/oxygen/32x32/apps/alevt.png
-share/icons/oxygen/32x32/apps/applixware.png
-share/icons/oxygen/32x32/apps/assistant.png
-share/icons/oxygen/32x32/apps/blender.png
-share/icons/oxygen/32x32/apps/bluefish.png
-share/icons/oxygen/32x32/apps/clanbomber.png
-share/icons/oxygen/32x32/apps/designer.png
-share/icons/oxygen/32x32/apps/dia.png
-share/icons/oxygen/32x32/apps/eclipse.png
-share/icons/oxygen/32x32/apps/emacs.png
-share/icons/oxygen/32x32/apps/email.png
-share/icons/oxygen/32x32/apps/evolution.png
-share/icons/oxygen/32x32/apps/gabber.png
-share/icons/oxygen/32x32/apps/gaim.png
-share/icons/oxygen/32x32/apps/galeon.png
-share/icons/oxygen/32x32/apps/gimp.png
-share/icons/oxygen/32x32/apps/gnomemeeting.png
-share/icons/oxygen/32x32/apps/gnucash.png
-share/icons/oxygen/32x32/apps/gnumeric.png
-share/icons/oxygen/32x32/apps/gv.png
-share/icons/oxygen/32x32/apps/gvim.png
-share/icons/oxygen/32x32/apps/licq.png
-share/icons/oxygen/32x32/apps/linguist.png
-share/icons/oxygen/32x32/apps/lyx.png
-share/icons/oxygen/32x32/apps/netscape.png
-share/icons/oxygen/32x32/apps/opera.png
-share/icons/oxygen/32x32/apps/pan.png
-share/icons/oxygen/32x32/apps/penguin.png
-share/icons/oxygen/32x32/apps/pinguin.png
-share/icons/oxygen/32x32/apps/plan.png
-share/icons/oxygen/32x32/apps/planner.png
-share/icons/oxygen/32x32/apps/pybliographic.png
-share/icons/oxygen/32x32/apps/realplayer.png
-share/icons/oxygen/32x32/apps/sodipodi.png
-share/icons/oxygen/32x32/apps/terminal.png
-share/icons/oxygen/32x32/apps/tux.png
-share/icons/oxygen/32x32/apps/wp.png
-share/icons/oxygen/32x32/apps/xawtv.png
-share/icons/oxygen/32x32/apps/xcalc.png
-share/icons/oxygen/32x32/apps/xchat.png
-share/icons/oxygen/32x32/apps/xclipboard.png
-share/icons/oxygen/32x32/apps/xclock.png
-share/icons/oxygen/32x32/apps/xedit.png
-share/icons/oxygen/32x32/apps/xemacs.png
-share/icons/oxygen/32x32/apps/xeyes.png
-share/icons/oxygen/32x32/apps/xfig.png
-share/icons/oxygen/32x32/apps/xfmail.png
-share/icons/oxygen/32x32/apps/xload.png
-share/icons/oxygen/32x32/apps/xmag.png
-share/icons/oxygen/32x32/apps/xmms.png
-share/icons/oxygen/32x32/apps/xosview.png
-share/icons/oxygen/32x32/apps/xpaint.png
-share/icons/oxygen/32x32/apps/xv.png
-share/icons/oxygen/48x48/apps/abiword.png
-share/icons/oxygen/48x48/apps/applixware.png
-share/icons/oxygen/48x48/apps/blender.png
-share/icons/oxygen/48x48/apps/bluefish.png
-share/icons/oxygen/48x48/apps/clanbomber.png
-share/icons/oxygen/48x48/apps/designer.png
-share/icons/oxygen/48x48/apps/dia.png
-share/icons/oxygen/48x48/apps/eclipse.png
-share/icons/oxygen/48x48/apps/emacs.png
-share/icons/oxygen/48x48/apps/email.png
-share/icons/oxygen/48x48/apps/evolution.png
-share/icons/oxygen/48x48/apps/gabber.png
-share/icons/oxygen/48x48/apps/gaim.png
-share/icons/oxygen/48x48/apps/galeon.png
-share/icons/oxygen/48x48/apps/gimp.png
-share/icons/oxygen/48x48/apps/gnomemeeting.png
-share/icons/oxygen/48x48/apps/gnucash.png
-share/icons/oxygen/48x48/apps/gnumeric.png
-share/icons/oxygen/48x48/apps/gvim.png
-share/icons/oxygen/48x48/apps/licq.png
-share/icons/oxygen/48x48/apps/netscape.png
-share/icons/oxygen/48x48/apps/opera.png
-share/icons/oxygen/48x48/apps/pan.png
-share/icons/oxygen/48x48/apps/penguin.png
-share/icons/oxygen/48x48/apps/planner.png
-share/icons/oxygen/48x48/apps/sodipodi.png
-share/icons/oxygen/48x48/apps/staroffice.png
-share/icons/oxygen/48x48/apps/terminal.png
-share/icons/oxygen/48x48/apps/tux.png
-share/icons/oxygen/48x48/apps/wp.png
-share/icons/oxygen/48x48/apps/xchat.png
-share/icons/oxygen/48x48/apps/xclock.png
-share/icons/oxygen/48x48/apps/xedit.png
-share/icons/oxygen/48x48/apps/xemacs.png
-share/icons/oxygen/48x48/apps/xfmail.png
-share/icons/oxygen/48x48/apps/xmag.png
-share/icons/oxygen/48x48/apps/xv.png
-share/icons/oxygen/64x64/apps/applixware.png
-share/icons/oxygen/64x64/apps/clanbomber.png
-share/icons/oxygen/64x64/apps/email.png
-share/icons/oxygen/64x64/apps/gimp.png
-share/icons/oxygen/64x64/apps/gvim.png
-share/icons/oxygen/64x64/apps/licq.png
-share/icons/oxygen/64x64/apps/netscape.png
-share/icons/oxygen/64x64/apps/penguin.png
-share/icons/oxygen/64x64/apps/staroffice.png
-share/icons/oxygen/64x64/apps/terminal.png
-share/icons/oxygen/64x64/apps/tux.png
-share/icons/oxygen/64x64/apps/wp.png
-share/icons/oxygen/64x64/apps/xclock.png
-share/icons/oxygen/64x64/apps/xfmail.png
-share/icons/oxygen/64x64/apps/xmag.png
-share/icons/oxygen/scalable/apps/aim.svgz
-share/icons/oxygen/scalable/apps/antivirus.svgz
-share/icons/oxygen/scalable/apps/applixware.svgz
-share/icons/oxygen/scalable/apps/browser.svgz
-share/icons/oxygen/scalable/apps/camera.svgz
-share/icons/oxygen/scalable/apps/clanbomber.svgz
-share/icons/oxygen/scalable/apps/clock.svgz
-share/icons/oxygen/scalable/apps/core.svgz
-share/icons/oxygen/scalable/apps/display.svgz
-share/icons/oxygen/scalable/apps/download_manager.svgz
-share/icons/oxygen/scalable/apps/email.svgz
-share/icons/oxygen/scalable/apps/galeon.svgz
-share/icons/oxygen/scalable/apps/netscape.svgz
-share/icons/oxygen/scalable/apps/penguin.svgz
-share/icons/oxygen/scalable/apps/personal.svgz
-share/icons/oxygen/scalable/apps/realplayer.svgz
-share/icons/oxygen/scalable/apps/shell.svgz
-share/icons/oxygen/scalable/apps/staroffice.svgz
-share/icons/oxygen/scalable/apps/terminal.svgz
-share/icons/oxygen/scalable/apps/tux.svgz
-share/icons/oxygen/scalable/apps/xcalc.svgz
-share/icons/oxygen/scalable/apps/xchat.svgz
-share/icons/oxygen/scalable/apps/xclock.svgz
-share/icons/oxygen/scalable/apps/xeyes.svgz
-share/icons/oxygen/scalable/apps/xpaint.svgz
share/kde4/services/ServiceMenus/konsolehere.desktop
share/kde4/services/bookmarks.desktop
share/kde4/services/cache.desktop
share/kde4/services/cookies.desktop
-share/kde4/services/desktoppath.desktop
-share/kde4/services/devices.desktop
-share/kde4/services/dma.desktop
share/kde4/services/dolphinpart.desktop
share/kde4/services/ebrowsing.desktop
share/kde4/services/filebehavior.desktop
-share/kde4/services/fileviewsvnplugin.desktop
-share/kde4/services/interrupts.desktop
-share/kde4/services/ioports.desktop
-share/kde4/services/ioslaveinfo.desktop
-share/kde4/services/kcm_memory.desktop
-share/kde4/services/kcm_partition.desktop
-share/kde4/services/kcm_pci.desktop
share/kde4/services/kcm_useraccount.desktop
share/kde4/services/kcmdolphingeneral.desktop
share/kde4/services/kcmdolphinnavigation.desktop
@@ -795,11 +286,8 @@ share/kde4/services/kcmdolphinviewmodes.desktop
share/kde4/services/kcmhistory.desktop
share/kde4/services/kcmkonqyperformance.desktop
share/kde4/services/kcmperformance.desktop
-share/kde4/services/kcmsolidproc.desktop
-share/kde4/services/kcmusb.desktop
share/kde4/services/kded/favicons.desktop
share/kde4/services/kded/konqy_preloader.desktop
-share/kde4/services/kfindpart.desktop
share/kde4/services/khtml_appearance.desktop
share/kde4/services/khtml_behavior.desktop
share/kde4/services/khtml_filter.desktop
@@ -811,19 +299,16 @@ share/kde4/services/konq_sidebartng.desktop
share/kde4/services/konqueror.desktop
share/kde4/services/konsolepart.desktop
share/kde4/services/netpref.desktop
-share/kde4/services/nic.desktop
-share/kde4/services/opengl.desktop
share/kde4/services/plasma-applet-folderview.desktop
share/kde4/services/proxy.desktop
-share/kde4/services/scsi.desktop
share/kde4/services/smb.desktop
-share/kde4/services/smbstatus.desktop
-share/kde4/services/sound.desktop
share/kde4/services/useragent.desktop
share/kde4/services/useragentstrings/android10.desktop
share/kde4/services/useragentstrings/chrome10onwinnt51.desktop
+share/kde4/services/useragentstrings/chrome50oncurrent.desktop
share/kde4/services/useragentstrings/firefox20oncurrent.desktop
share/kde4/services/useragentstrings/firefox30oncurrent.desktop
+share/kde4/services/useragentstrings/firefox36oncurrent.desktop
share/kde4/services/useragentstrings/googlebot.desktop
share/kde4/services/useragentstrings/ie401onwinnt4.desktop
share/kde4/services/useragentstrings/ie50onppc.desktop
@@ -844,11 +329,10 @@ share/kde4/services/useragentstrings/op962oncurrent.desktop
share/kde4/services/useragentstrings/safari20.desktop
share/kde4/services/useragentstrings/safari30oniphone.desktop
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/xserver.desktop
share/kde4/servicetypes/fileviewversioncontrolplugin.desktop
-share/kde4/servicetypes/findpart.desktop
share/kde4/servicetypes/konqaboutpage.desktop
share/kde4/servicetypes/konqdndpopupmenuplugin.desktop
share/kde4/servicetypes/konqpopupmenuplugin.desktop
@@ -886,31 +370,13 @@ share/templates/linkZIP.desktop
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/konsole
@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kinfocenter/xserver
-@dirrm share/doc/HTML/en/kinfocenter/view1394
-@dirrm share/doc/HTML/en/kinfocenter/usb
-@dirrm share/doc/HTML/en/kinfocenter/sound
-@dirrm share/doc/HTML/en/kinfocenter/scsi
-@dirrm share/doc/HTML/en/kinfocenter/samba
-@dirrm share/doc/HTML/en/kinfocenter/protocols
-@dirrm share/doc/HTML/en/kinfocenter/processor
-@dirrm share/doc/HTML/en/kinfocenter/pci
-@dirrm share/doc/HTML/en/kinfocenter/partitions
-@dirrm share/doc/HTML/en/kinfocenter/opengl
-@dirrm share/doc/HTML/en/kinfocenter/nics
-@dirrm share/doc/HTML/en/kinfocenter/memory
-@dirrm share/doc/HTML/en/kinfocenter/ioports
-@dirrm share/doc/HTML/en/kinfocenter/interrupts
-@dirrm share/doc/HTML/en/kinfocenter/dma
-@dirrm share/doc/HTML/en/kinfocenter/devices
-@dirrm share/doc/HTML/en/kinfocenter
@dirrm share/doc/HTML/en/kfind
@dirrm share/doc/HTML/en/kdepasswd
@dirrm share/doc/HTML/en/dolphin
@dirrm share/apps/plugin
@dirrm share/apps/kwrite
-%%WEBKIT%%@dirrmtry share/apps/kwebkitpart/kpartplugins
-%%WEBKIT%%@dirrmtry share/apps/kwebkitpart
+@dirrmtry share/apps/kwebkitpart/kpartplugins
+@dirrmtry share/apps/kwebkitpart
@dirrm share/apps/konsole
@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@@ -921,33 +387,9 @@ share/templates/linkZIP.desktop
@dirrm share/apps/konqsidebartng/plugins
@dirrm share/apps/konqsidebartng/entries
@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/kinfocenter/about
-@dirrm share/apps/kinfocenter
@dirrm share/apps/keditbookmarks
-@dirrm share/apps/kcmusb
@dirrm share/apps/kcmcss
@dirrm share/apps/kbookmark
-@dirrm share/apps/kappfinder/apps/Utilities/XUtilities
-@dirrm share/apps/kappfinder/apps/Utilities
-@dirrm share/apps/kappfinder/apps/Toys
-@dirrm share/apps/kappfinder/apps/System/Terminal
-@dirrm share/apps/kappfinder/apps/System
-@dirrm share/apps/kappfinder/apps/Office
-@dirrm share/apps/kappfinder/apps/Multimedia
-@dirrm share/apps/kappfinder/apps/Internet/Terminal
-@dirrm share/apps/kappfinder/apps/Internet
-@dirrm share/apps/kappfinder/apps/Graphics
-@dirrm share/apps/kappfinder/apps/Games/TacticStrategy
-@dirrm share/apps/kappfinder/apps/Games/Roguelikes
-@dirrm share/apps/kappfinder/apps/Games/Emulators
-@dirrm share/apps/kappfinder/apps/Games/Card
-@dirrm share/apps/kappfinder/apps/Games/Board
-@dirrm share/apps/kappfinder/apps/Games/Arcade
-@dirrm share/apps/kappfinder/apps/Games
-@dirrm share/apps/kappfinder/apps/Editors
-@dirrm share/apps/kappfinder/apps/Development
-@dirrm share/apps/kappfinder/apps
-@dirrm share/apps/kappfinder
-@dirrm share/apps/dolphinpart/kpartplugins
-@dirrm share/apps/dolphinpart
-@dirrm share/apps/dolphin
+@dirrmtry share/apps/dolphinpart/kpartplugins
+@dirrmtry share/apps/dolphinpart
+@dirrmtry share/apps/dolphin
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 2c746a5ac943..7b44738ad54b 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -19,7 +18,10 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Base set of libraries needed by KDE programs
BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell \
- ${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies
+ ${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \
+ ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
+ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+
LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \
soprano.4:${PORTSDIR}/textproc/soprano \
IlmImf:${PORTSDIR}/graphics/OpenEXR \
@@ -36,7 +38,8 @@ LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \
qca.2:${PORTSDIR}/devel/qca \
attica.0:${PORTSDIR}/x11-toolkits/attica \
polkit-qt-core.0:${PORTSDIR}/sysutils/policykit-qt \
- smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+ smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
+ dbusmenu-qt.2:${PORTSDIR}/devel/libdbusmenu-qt
RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \
@@ -99,7 +102,7 @@ LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
.endif
post-patch:
- @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
+ ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \
${PATCH_WRKSRC}/kdecore/network/k3socks.cpp \
${PATCH_WRKSRC}/kdecore/kernel/kstandarddirs.cpp \
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index abc4eb60ca5b..2463a3e64039 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-4.4.5.tar.bz2) = 42813c549777b5b3d6440ef719ef8588
-SHA256 (KDE/kdelibs-4.4.5.tar.bz2) = 11d79203e70ba104bf5414cb2a4e8919793ffb5b201592f28fc8ae325c8c6085
-SIZE (KDE/kdelibs-4.4.5.tar.bz2) = 14088335
+MD5 (KDE/kdelibs-4.5.1.tar.bz2) = f91f16b4349f8a2ca41dab5ca95f3877
+SHA256 (KDE/kdelibs-4.5.1.tar.bz2) = 0dc482603bd894bbe194c2c84275af73602fe84932bc1ba9a92496cf57ce1bf7
+SIZE (KDE/kdelibs-4.5.1.tar.bz2) = 13859768
diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
index 1e8ca51c0902..96fbac605223 100644
--- a/x11/kdelibs4/files/patch-KDE4Defaults.cmake
+++ b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
@@ -4,13 +4,13 @@
# define the generic version of the libraries here
# this makes it easy to advance it when the next KDE release comes
# Use this version number for libraries which are at version n in KDE version n
--set(GENERIC_LIB_VERSION "4.4.0")
+-set(GENERIC_LIB_VERSION "4.5.0")
-set(GENERIC_LIB_SOVERSION "4")
+set(GENERIC_LIB_VERSION "5.0.1")
+set(GENERIC_LIB_SOVERSION "5")
# Use this version number for libraries which are already at version n+1 in KDE version n
--set(KDE_NON_GENERIC_LIB_VERSION "5.4.0")
+-set(KDE_NON_GENERIC_LIB_VERSION "5.5.0")
-set(KDE_NON_GENERIC_LIB_SOVERSION "5")
+set(KDE_NON_GENERIC_LIB_VERSION "7.0.1")
+set(KDE_NON_GENERIC_LIB_SOVERSION "7")
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
index 176b4f1bc9c8..83f7cf23db3c 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
@@ -1,6 +1,6 @@
---- ./cmake/modules/FindKDE4Internal.cmake.orig 2009-02-26 17:18:26.000000000 +0300
-+++ ./cmake/modules/FindKDE4Internal.cmake 2009-03-22 14:42:53.000000000 +0300
-@@ -550,7 +550,7 @@
+--- cmake/modules/FindKDE4Internal.cmake.orig 2010-06-02 02:55:14.000000000 -0400
++++ cmake/modules/FindKDE4Internal.cmake 2010-06-02 02:57:53.000000000 -0400
+@@ -689,7 +689,7 @@
# whether to install a CMake FooConfig.cmake into lib/foo/cmake/ or /lib/cmake/foo/
# (with 2.6.3 and above also lib/cmake/foo/ is supported):
if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
@@ -9,14 +9,14 @@
else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
set(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR FALSE)
endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
-@@ -694,8 +694,8 @@
+@@ -855,8 +855,8 @@
_set_fancy(XDG_MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mime/packages" "The install dir for the xdg mimetypes")
- _set_fancy(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "The kde sysconfig install dir (default ${CMAKE_INSTALL_PREFIX}/etc)")
-- _set_fancy(MAN_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/man" "The kde man install dir (default ${SHARE_INSTALL_PREFIX}/man/)")
-- _set_fancy(INFO_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/info" "The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)")
-+ _set_fancy(MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man" "The kde man install dir (default ${SHARE_INSTALL_PREFIX}/man/)")
-+ _set_fancy(INFO_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/info" "The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)")
- _set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" "The kde dbus interfaces install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)")
- _set_fancy(DBUS_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/services" "The kde dbus services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/services)")
-
+ _set_fancy(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "The sysconfig install dir (default ${CMAKE_INSTALL_PREFIX}/etc)")
+- _set_fancy(MAN_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/man" "The man install dir (default ${SHARE_INSTALL_PREFIX}/man/)")
+- _set_fancy(INFO_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/info" "The info install dir (default ${SHARE_INSTALL_PREFIX}/info)")
++ _set_fancy(MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man" "The man install dir (default ${SHARE_INSTALL_PREFIX}/man/)")
++ _set_fancy(INFO_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/info" "The info install dir (default ${SHARE_INSTALL_PREFIX}/info)")
+ _set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" "The dbus interfaces install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)")
+ _set_fancy(DBUS_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/services" "The dbus services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/services)")
+ _set_fancy(DBUS_SYSTEM_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/system-services" "The dbus system services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/system-services)")
diff --git a/x11/kdelibs4/files/patch-kdecore_io_kdirwatch.cpp b/x11/kdelibs4/files/patch-kdecore_io_kdirwatch.cpp
new file mode 100644
index 000000000000..84391941bd6e
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kdecore_io_kdirwatch.cpp
@@ -0,0 +1,11 @@
+--- kdecore/io/kdirwatch.cpp.orig 2010-06-02 03:38:59.000000000 -0400
++++ kdecore/io/kdirwatch.cpp 2010-06-02 03:42:23.000000000 -0400
+@@ -164,7 +164,7 @@
+
+ #ifdef HAVE_FAM
+ // It's possible that FAM server can't be started
+- if (FAMOpen(&fc) ==0) {
++ if (m_preferredMethod == Fam && FAMOpen(&fc) ==0) {
+ availableMethods << "FAM";
+ use_fam=true;
+ sn = new QSocketNotifier( FAMCONNECTION_GETFD(&fc),
diff --git a/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp b/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
deleted file mode 100644
index 964c065c99af..000000000000
--- a/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./kio/kio/kdirwatch.cpp.orgi 2009-01-27 18:07:49.000000000 +0100
-+++ ./kio/kio/kdirwatch.cpp 2009-01-27 18:15:04.000000000 +0100
-@@ -89,6 +89,9 @@
- } else if (method == "QFSWatch") {
- return KDirWatchPrivate::QFSWatch;
- } else {
-+#ifdef Q_OS_FREEBSD
-+ return KDirWatchPrivate::Stat;
-+#endif
- #ifdef Q_OS_WIN
- return KDirWatchPrivate::QFSWatch;
- #else
-@@ -159,7 +162,7 @@
-
- #ifdef HAVE_FAM
- // It's possible that FAM server can't be started
-- if (FAMOpen(&fc) ==0) {
-+ if (m_preferredMethod == Fam && FAMOpen(&fc) ==0) {
- availableMethods << "FAM";
- use_fam=true;
- sn = new QSocketNotifier( FAMCONNECTION_GETFD(&fc),
diff --git a/x11/kdelibs4/files/patch-kio_kfile_kdiskfreespaceinfo.cpp b/x11/kdelibs4/files/patch-kio_kfile_kdiskfreespaceinfo.cpp
deleted file mode 100644
index 2fce5693e205..000000000000
--- a/x11/kdelibs4/files/patch-kio_kfile_kdiskfreespaceinfo.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kio/kfile/kdiskfreespaceinfo.cpp.orig 2010-02-26 21:30:10.000000000 +0300
-+++ ./kio/kfile/kdiskfreespaceinfo.cpp 2010-04-11 23:48:30.795826504 +0400
-@@ -133,7 +133,7 @@
- // Prefer mountPoint if available, so that it even works with non-existing files.
- const QString pathArg = info.d->mountPoint.isEmpty() ? path : info.d->mountPoint;
- if (!statvfs(QFile::encodeName(pathArg).constData(), &statvfs_buf)) {
-- const quint64 blksize = quint64(statvfs_buf.f_bsize); // cast to avoid overflow
-+ const quint64 blksize = quint64(statvfs_buf.f_frsize); // cast to avoid overflow
- info.d->available = statvfs_buf.f_bavail * blksize;
- info.d->size = statvfs_buf.f_blocks * blksize;
- info.d->valid = true;
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 18a1244d71d8..a36ccf47a765 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -15,10 +15,10 @@ bin/kunittestmodrunner
bin/kwrapper4
bin/makekdewidgets
bin/meinproc4
+bin/meinproc4_simple
bin/nepomuk-rcgen
bin/preparetips
etc/dbus-1/system.d/org.kde.auth.conf
-etc/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
etc/xdg/menus/applications.menu
include/KDE/ConversionCheck/QVconvertible
include/KDE/ConversionCheck/type_toQString
@@ -429,6 +429,8 @@ include/KDE/KIconDialog
include/KDE/KIconEffect
include/KDE/KIconLoader
include/KDE/KIconTheme
+include/KDE/KIdleTime
+include/KDE/KImageCache
include/KDE/KImageFilePreview
include/KDE/KImageIO
include/KDE/KInputDialog
@@ -559,6 +561,7 @@ include/KDE/KPixmapRegionSelectorDialog
include/KDE/KPixmapRegionSelectorWidget
include/KDE/KPixmapSequence
include/KDE/KPixmapSequenceOverlayPainter
+include/KDE/KPixmapSequenceWidget
include/KDE/KPlotAxis
include/KDE/KPlotObject
include/KDE/KPlotPoint
@@ -610,6 +613,7 @@ include/KDE/KSettings/Dispatcher
include/KDE/KSettings/PluginPage
include/KDE/KSharedConfig
include/KDE/KSharedConfigPtr
+include/KDE/KSharedDataCache
include/KDE/KSharedPtr
include/KDE/KShell
include/KDE/KShellCompletion
@@ -667,6 +671,9 @@ include/KDE/KTextEditor/Factory
include/KDE/KTextEditor/HighlightInterface
include/KDE/KTextEditor/MarkInterface
include/KDE/KTextEditor/ModificationInterface
+include/KDE/KTextEditor/MovingCursor
+include/KDE/KTextEditor/MovingInterface
+include/KDE/KTextEditor/MovingRange
include/KDE/KTextEditor/ParameterizedSessionConfigInterface
include/KDE/KTextEditor/Plugin
include/KDE/KTextEditor/Range
@@ -680,6 +687,7 @@ include/KDE/KTextEditor/SmartRange
include/KDE/KTextEditor/SmartRangeNotifier
include/KDE/KTextEditor/SmartRangeWatcher
include/KDE/KTextEditor/TemplateInterface
+include/KDE/KTextEditor/TemplateInterface2
include/KDE/KTextEditor/TextHintInterface
include/KDE/KTextEditor/VariableInterface
include/KDE/KTextEditor/View
@@ -735,6 +743,7 @@ include/KDE/KWallet/Wallet
include/KDE/KWebPage
include/KDE/KWebPluginFactory
include/KDE/KWebView
+include/KDE/KWebWallet
include/KDE/KWidgetItemDelegate
include/KDE/KWindowInfo
include/KDE/KWindowSystem
@@ -779,12 +788,14 @@ include/KDE/NETRootInfo
include/KDE/NETWinInfo
include/KDE/Nepomuk/KRatingPainter
include/KDE/Nepomuk/KRatingWidget
+include/KDE/Nepomuk/MassUpdateJob
include/KDE/Nepomuk/Query/AndTerm
include/KDE/Nepomuk/Query/ComparisonTerm
include/KDE/Nepomuk/Query/FileQuery
include/KDE/Nepomuk/Query/GroupTerm
include/KDE/Nepomuk/Query/LiteralTerm
include/KDE/Nepomuk/Query/NegationTerm
+include/KDE/Nepomuk/Query/OptionalTerm
include/KDE/Nepomuk/Query/OrTerm
include/KDE/Nepomuk/Query/Query
include/KDE/Nepomuk/Query/QueryParser
@@ -798,6 +809,7 @@ include/KDE/Nepomuk/Resource
include/KDE/Nepomuk/ResourceManager
include/KDE/Nepomuk/Service
include/KDE/Nepomuk/Tag
+include/KDE/Nepomuk/TagWidget
include/KDE/Nepomuk/Thing
include/KDE/Nepomuk/Types/Class
include/KDE/Nepomuk/Types/Literal
@@ -806,14 +818,13 @@ include/KDE/Nepomuk/Types/Property
include/KDE/Nepomuk/Variant
include/KDE/OrgKdeKDirNotifyInterface
include/KDE/OrgKdeKLauncherInterface
-include/KDE/Plasma/AbstractAnimation
+include/KDE/Plasma/AbstractDialogManager
include/KDE/Plasma/AbstractRunner
include/KDE/Plasma/AbstractToolBox
include/KDE/Plasma/AccessAppletJob
include/KDE/Plasma/AccessManager
include/KDE/Plasma/Animation
include/KDE/Plasma/AnimationDriver
-include/KDE/Plasma/AnimationGroup
include/KDE/Plasma/Animator
include/KDE/Plasma/Applet
include/KDE/Plasma/AppletScript
@@ -938,6 +949,7 @@ include/KDE/khtml/MouseMoveEvent
include/KDE/khtml/MousePressEvent
include/KDE/khtml/MouseReleaseEvent
include/KDE/kndbgstream
+include/config-nepomuk.h
include/conversion_check.h
include/dnssd/dnssd_export.h
include/dnssd/domainbrowser.h
@@ -1072,6 +1084,7 @@ include/kbookmarkimporter_ns.h
include/kbookmarkimporter_opera.h
include/kbookmarkmanager.h
include/kbookmarkmenu.h
+include/kbreadcrumbselectionmodel.h
include/kbugreport.h
include/kbuildsycocaprogressdialog.h
include/kbuttongroup.h
@@ -1090,6 +1103,7 @@ include/kcmoduleinfo.h
include/kcmoduleloader.h
include/kcmoduleproxy.h
include/kcmultidialog.h
+include/kcmutils_export.h
include/kcodecaction.h
include/kcodecs.h
include/kcolorbutton.h
@@ -1162,6 +1176,7 @@ include/keditlistbox.h
include/kedittoolbar.h
include/kemailsettings.h
include/kemoticons.h
+include/kemoticons_export.h
include/kemoticonsprovider.h
include/kemoticonstheme.h
include/kencodingdetector.h
@@ -1178,6 +1193,8 @@ include/kfileitem.h
include/kfileitemactions.h
include/kfileitemdelegate.h
include/kfileitemlistproperties.h
+include/kfilemetadataconfigurationwidget.h
+include/kfilemetadatawidget.h
include/kfilemetainfo.h
include/kfilemetainfoitem.h
include/kfileplacesmodel.h
@@ -1233,6 +1250,8 @@ include/kiconeffect.h
include/kiconloader.h
include/kicontheme.h
include/kidletime.h
+include/kidletime_export.h
+include/kimagecache.h
include/kimagefilepreview.h
include/kimageio.h
include/kimproxy.h
@@ -1297,6 +1316,7 @@ include/kled.h
include/klibloader.h
include/klibrary.h
include/klineedit.h
+include/klinkitemselectionmodel.h
include/klistwidget.h
include/klistwidgetsearchline.h
include/klocale.h
@@ -1318,9 +1338,12 @@ include/kmimetype.h
include/kmimetypechooser.h
include/kmimetyperesolver.h
include/kmimetypetrader.h
+include/kmodelindexproxymapper.h
include/kmodifierkeyinfo.h
include/kmountpoint.h
include/kmultitabbar.h
+include/knameandurlinputdialog.h
+include/knewfilemenu.h
include/knewpassworddialog.h
include/knewstuff2/core/author.h
include/knewstuff2/core/category.h
@@ -1332,6 +1355,8 @@ include/knewstuff2/knewstuff_export.h
include/knewstuff2/ui/knewstuffaction.h
include/knewstuff2/ui/knewstuffbutton.h
include/knewstuff3/downloaddialog.h
+include/knewstuff3/downloadmanager.h
+include/knewstuff3/downloadwidget.h
include/knewstuff3/entry.h
include/knewstuff3/knewstuff_export.h
include/knewstuff3/knewstuffaction.h
@@ -1365,6 +1390,7 @@ include/kparts/mainwindow.h
include/kparts/part.h
include/kparts/partmanager.h
include/kparts/plugin.h
+include/kparts/scriptableextension.h
include/kparts/statusbarextension.h
include/kpassivepopup.h
include/kpassivepopupmessagehandler.h
@@ -1387,6 +1413,7 @@ include/kpluginloader.h
include/kpluginselector.h
include/kpreviewwidgetbase.h
include/kprintpreview.h
+include/kprintutils_export.h
include/kprocess.h
include/kprogressdialog.h
include/kpropertiesdialog.h
@@ -1403,6 +1430,7 @@ include/krandom.h
include/krandomsequence.h
include/krecentdocument.h
include/krecentfilesaction.h
+include/krecursivefilterproxymodel.h
include/kregexpeditorinterface.h
include/kremoteencoding.h
include/kreplace.h
@@ -1446,6 +1474,7 @@ include/ksettings/dialog.h
include/ksettings/dispatcher.h
include/ksettings/pluginpage.h
include/ksharedconfig.h
+include/kshareddatacache.h
include/ksharedptr.h
include/kshell.h
include/kshellcompletion.h
@@ -1508,7 +1537,12 @@ include/ktexteditor/highlightinterface.h
include/ktexteditor/ktexteditor_export.h
include/ktexteditor/loadsavefiltercheckplugin.h
include/ktexteditor/markinterface.h
+include/ktexteditor/modeinterface.h
include/ktexteditor/modificationinterface.h
+include/ktexteditor/movingcursor.h
+include/ktexteditor/movinginterface.h
+include/ktexteditor/movingrange.h
+include/ktexteditor/movingrangefeedback.h
include/ktexteditor/plugin.h
include/ktexteditor/range.h
include/ktexteditor/rangefeedback.h
@@ -1522,6 +1556,7 @@ include/ktexteditor/smartrange.h
include/ktexteditor/smartrangenotifier.h
include/ktexteditor/smartrangewatcher.h
include/ktexteditor/templateinterface.h
+include/ktexteditor/templateinterface2.h
include/ktexteditor/texthintinterface.h
include/ktexteditor/variableinterface.h
include/ktexteditor/view.h
@@ -1541,6 +1576,7 @@ include/ktrader.h
include/ktreewidgetsearchline.h
include/ktypelist.h
include/ktypelistutils.h
+include/ktypetraits.h
include/ktzfiletimezone.h
include/kuiserverjobtracker.h
include/kundostack.h
@@ -1565,8 +1601,8 @@ include/kurlrequester.h
include/kurlrequesterdialog.h
include/kurlrequesterdlg.h
include/kuser.h
-include/kutils_export.h
include/kvbox.h
+include/kviewstatesaver.h
include/kwallet.h
include/kwebpage.h
include/kwebpluginfactory.h
@@ -1605,12 +1641,14 @@ include/nepomuk/literal.h
include/nepomuk/literalterm.h
include/nepomuk/negationterm.h
include/nepomuk/nepomuk_export.h
+include/nepomuk/nepomukmassupdatejob.h
include/nepomuk/nepomukontologyloader.h
include/nepomuk/nepomukquery_export.h
include/nepomuk/nepomukservice.h
include/nepomuk/ontology.h
include/nepomuk/ontologyloader.h
include/nepomuk/ontologymanager.h
+include/nepomuk/optionalterm.h
include/nepomuk/orterm.h
include/nepomuk/property.h
include/nepomuk/query.h
@@ -1623,6 +1661,7 @@ include/nepomuk/resourcetypeterm.h
include/nepomuk/result.h
include/nepomuk/simpleterm.h
include/nepomuk/tag.h
+include/nepomuk/tagwidget.h
include/nepomuk/term.h
include/nepomuk/thing.h
include/nepomuk/tools.h
@@ -1630,6 +1669,7 @@ include/nepomuk/variant.h
include/netwm.h
include/netwm_def.h
include/passdlg.h
+include/plasma/abstractdialogmanager.h
include/plasma/abstractrunner.h
include/plasma/abstracttoolbox.h
include/plasma/accessappletjob.h
@@ -1793,17 +1833,16 @@ lib/kde4/kspell_enchant.so
lib/kde4/kspell_hspell.so
lib/kde4/ktexteditor_autobrace.so
lib/kde4/ktexteditor_exporter.so
+lib/kde4/ktexteditor_iconinserter.so
+lib/kde4/ktexteditor_insanehtml_le.so
lib/kde4/ktexteditor_insertfile.so
lib/kde4/ktexteditor_kdatatool.so
-lib/kde4/ktexteditor_python-encoding.so
lib/kde4/ktranscript.so
lib/kde4/libexec/filesharelist
lib/kde4/libexec/fileshareset
lib/kde4/libexec/kauth-policy-gen
-lib/kde4/libexec/kcmremotewidgetshelper
lib/kde4/libexec/kconf_update
lib/kde4/libexec/kdesu_stub
-lib/kde4/libexec/kdontchangethehostname
lib/kde4/libexec/kio_http_cache_cleaner
lib/kde4/libexec/kioslave
lib/kde4/libexec/klauncher
@@ -1824,7 +1863,9 @@ lib/kde4/plugins/imageformats/kimg_eps.so
lib/kde4/plugins/imageformats/kimg_exr.so
lib/kde4/plugins/imageformats/kimg_jp2.so
lib/kde4/plugins/imageformats/kimg_pcx.so
+lib/kde4/plugins/imageformats/kimg_pic.so
lib/kde4/plugins/imageformats/kimg_psd.so
+lib/kde4/plugins/imageformats/kimg_ras.so
lib/kde4/plugins/imageformats/kimg_rgb.so
lib/kde4/plugins/imageformats/kimg_tga.so
lib/kde4/plugins/imageformats/kimg_xcf.so
@@ -1835,6 +1876,12 @@ lib/kde4/plugins/script/libkrossqtsplugin.so
lib/kde4/plugins/script/libkrossqtsplugin.so.5
lib/kde4/plugins/script/libkrossqtsplugin.so.5.0.1
lib/kde4/spellcheckplugin.so
+lib/libkatepartinterfaces.so
+lib/libkatepartinterfaces.so.5
+lib/libkatepartinterfaces.so.5.0.1
+lib/libkcmutils.so
+lib/libkcmutils.so.5
+lib/libkcmutils.so.5.0.1
lib/libkde3support.so
lib/libkde3support.so.5
lib/libkde3support.so.5.0.1
@@ -1861,12 +1908,18 @@ lib/libkdewebkit.so.7.0.1
lib/libkdnssd.so
lib/libkdnssd.so.5
lib/libkdnssd.so.5.0.1
+lib/libkemoticons.so
+lib/libkemoticons.so.5
+lib/libkemoticons.so.5.0.1
lib/libkfile.so
lib/libkfile.so.5
lib/libkfile.so.5.0.1
lib/libkhtml.so
lib/libkhtml.so.7
lib/libkhtml.so.7.0.1
+lib/libkidletime.so
+lib/libkidletime.so.5
+lib/libkidletime.so.5.0.1
lib/libkimproxy.so
lib/libkimproxy.so.5
lib/libkimproxy.so.5.0.1
@@ -1900,6 +1953,9 @@ lib/libkntlm.so.5.0.1
lib/libkparts.so
lib/libkparts.so.5
lib/libkparts.so.5.0.1
+lib/libkprintutils.so
+lib/libkprintutils.so.5
+lib/libkprintutils.so.5.0.1
lib/libkpty.so
lib/libkpty.so.5
lib/libkpty.so.5.0.1
@@ -1936,7 +1992,6 @@ lib/libsolid.so.5.0.1
lib/libthreadweaver.so
lib/libthreadweaver.so.5
lib/libthreadweaver.so.5.0.1
-share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
share/apps/LICENSES/ARTISTIC
share/apps/LICENSES/BSD
share/apps/LICENSES/GPL_V2
@@ -1962,6 +2017,7 @@ share/apps/cmake/modules/FindBlitz.cmake
share/apps/cmake/modules/FindBlueZ.cmake
share/apps/cmake/modules/FindBoost.cmake
share/apps/cmake/modules/FindCarbon.cmake
+share/apps/cmake/modules/FindDBusMenuQt.cmake
share/apps/cmake/modules/FindDNSSD.cmake
share/apps/cmake/modules/FindENCHANT.cmake
share/apps/cmake/modules/FindEigen.cmake
@@ -2017,6 +2073,7 @@ share/apps/cmake/modules/FindOggVorbis.cmake
share/apps/cmake/modules/FindOpenEXR.cmake
share/apps/cmake/modules/FindOpenSSL.cmake
share/apps/cmake/modules/FindPCRE.cmake
+share/apps/cmake/modules/FindPackageHandleStandardArgs.cmake
share/apps/cmake/modules/FindPhonon.cmake
share/apps/cmake/modules/FindPkgConfig.cmake
share/apps/cmake/modules/FindPlasma.cmake
@@ -2058,6 +2115,7 @@ share/apps/cmake/modules/KDELibs4LibraryTargets.cmake
share/apps/cmake/modules/KDELibs4ToolsTargets-%%KDE4_BUILD_TYPE%%.cmake
share/apps/cmake/modules/KDELibs4ToolsTargets.cmake
share/apps/cmake/modules/KDELibsDependencies.cmake
+share/apps/cmake/modules/KDEPlatformProfile.cmake
share/apps/cmake/modules/MacroAddCompileFlags.cmake
share/apps/cmake/modules/MacroAddLinkFlags.cmake
share/apps/cmake/modules/MacroAdditionalCleanFiles.cmake
@@ -2097,12 +2155,13 @@ share/apps/katepart/katepartsimpleui.rc
share/apps/katepart/katepartui.rc
share/apps/katepart/script/cstyle.js
share/apps/katepart/script/haskell.js
-share/apps/katepart/script/jstest.js
share/apps/katepart/script/lilypond.js
share/apps/katepart/script/lisp.js
+share/apps/katepart/script/lua.js
share/apps/katepart/script/python.js
share/apps/katepart/script/ruby.js
share/apps/katepart/script/utils.js
+share/apps/katepart/script/xml.js
share/apps/katepart/syntax/abap.xml
share/apps/katepart/syntax/abc.xml
share/apps/katepart/syntax/actionscript.xml
@@ -2110,10 +2169,13 @@ share/apps/katepart/syntax/ada.xml
share/apps/katepart/syntax/ahdl.xml
share/apps/katepart/syntax/alert.xml
share/apps/katepart/syntax/alert_indent.xml
+share/apps/katepart/syntax/ample.xml
share/apps/katepart/syntax/ansic89.xml
share/apps/katepart/syntax/ansys.xml
share/apps/katepart/syntax/apache.xml
share/apps/katepart/syntax/asm-avr.xml
+share/apps/katepart/syntax/asm-dsp56k.xml
+share/apps/katepart/syntax/asm-m68k.xml
share/apps/katepart/syntax/asm6502.xml
share/apps/katepart/syntax/asn1.xml
share/apps/katepart/syntax/asp.xml
@@ -2212,6 +2274,7 @@ share/apps/katepart/syntax/objectivecpp.xml
share/apps/katepart/syntax/ocaml.xml
share/apps/katepart/syntax/octave.xml
share/apps/katepart/syntax/opal.xml
+share/apps/katepart/syntax/pango.xml
share/apps/katepart/syntax/pascal.xml
share/apps/katepart/syntax/perl.xml
share/apps/katepart/syntax/pgn.xml
@@ -2224,6 +2287,7 @@ share/apps/katepart/syntax/progress.xml
share/apps/katepart/syntax/prolog.xml
share/apps/katepart/syntax/purebasic.xml
share/apps/katepart/syntax/python.xml
+share/apps/katepart/syntax/qml.xml
share/apps/katepart/syntax/r.xml
share/apps/katepart/syntax/rapidq.xml
share/apps/katepart/syntax/rexx.xml
@@ -2258,6 +2322,7 @@ share/apps/katepart/syntax/verilog.xml
share/apps/katepart/syntax/vhdl.xml
share/apps/katepart/syntax/vrml.xml
share/apps/katepart/syntax/winehq.xml
+share/apps/katepart/syntax/wml.xml
share/apps/katepart/syntax/xharbour.xml
share/apps/katepart/syntax/xml.xml
share/apps/katepart/syntax/xmldebug.xml
@@ -2859,11 +2924,6 @@ share/apps/ksgmltools2/customization/no/entities/update-doc.docbook
share/apps/ksgmltools2/customization/no/lang.entities
share/apps/ksgmltools2/customization/no/strings.entities
share/apps/ksgmltools2/customization/no/user.entities
-share/apps/ksgmltools2/customization/obsolete/general.entities
-share/apps/ksgmltools2/customization/obsolete/kdex-412-10.dtd
-share/apps/ksgmltools2/customization/obsolete/kdex.dtd
-share/apps/ksgmltools2/customization/obsolete/modifications.elements
-share/apps/ksgmltools2/customization/obsolete/rdbpool.elements
share/apps/ksgmltools2/customization/pl/catalog.xml
share/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook
@@ -3253,68 +3313,6 @@ share/apps/ksgmltools2/customization/zh-TW/lang.entities
share/apps/ksgmltools2/customization/zh-TW/strings.entities
share/apps/ksgmltools2/customization/zh-TW/user.entities
share/apps/ksgmltools2/docbook/README.kde
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/40chg.txt
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/41chg.txt
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/calstblx.dtd
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/catalog.xml
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/dbcentx.mod
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/dbgenent.mod
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/dbhierx.mod
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/dbnotnx.mod
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/dbpoolx.mod
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/docbook.cat
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/docbookx.dtd
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amsa.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amsb.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amsc.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amsn.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amso.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-amsr.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-box.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-cyr1.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-cyr2.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-dia.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-grk1.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-grk2.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-grk3.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-grk4.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-lat1.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-lat2.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-num.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-pub.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-tech.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/readme.txt
-share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/soextblx.dtd
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/README
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/calstblx.dtd
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/catalog.xml
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/dbcentx.mod
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/dbgenent.mod
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/dbhierx.mod
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/dbnotnx.mod
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/dbpoolx.mod
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/docbook.cat
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/docbookx.dtd
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsa.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsb.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsc.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsn.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amso.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsr.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-box.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-cyr1.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-cyr2.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-dia.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk1.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk2.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk3.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk4.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-lat1.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-lat2.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-num.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-pub.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-tech.ent
-share/apps/ksgmltools2/docbook/xml-dtd-4.2/soextblx.dtd
share/apps/ksgmltools2/docbook/xsl/README
share/apps/ksgmltools2/docbook/xsl/VERSION
share/apps/ksgmltools2/docbook/xsl/WhatsNew
@@ -3909,9 +3907,11 @@ share/apps/ksgmltools2/docbook/xsl/params/xref.title-page.separator.xml
share/apps/ksgmltools2/docbook/xsl/params/xref.with.number.and.title.xml
share/apps/kssl/ca-bundle.crt
share/apps/ktexteditor_exporter/ktexteditor_exporterui.rc
+share/apps/ktexteditor_iconinserter/ktexteditor_iconinserterui.rc
+share/apps/ktexteditor_insanehtml_le/insanehtml_le_ui.rc
+share/apps/ktexteditor_insanehtml_le/xhtml.cfg
share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc
-share/apps/nepomuk/pics/rating.png
share/apps/plasma/services/dataengineservice.operations
share/apps/plasma/services/plasmoidservice.operations
share/apps/proxyscout/proxyscout.notifyrc
@@ -3925,6 +3925,7 @@ share/config/katemoderc
share/config/katepartpluginsrc
share/config/kdebug.areas
share/config/kdebugrc
+share/config/khtmlrc
share/config/ksslcalist
share/config/plasmoids.knsrc
share/config/ui/ui_standards.rc
@@ -3932,6 +3933,7 @@ share/dbus-1/interfaces/org.freedesktop.PowerManagement.Inhibit.xml
share/dbus-1/interfaces/org.freedesktop.PowerManagement.xml
share/dbus-1/interfaces/org.kde.JobView.xml
share/dbus-1/interfaces/org.kde.JobViewServer.xml
+share/dbus-1/interfaces/org.kde.JobViewV2.xml
share/dbus-1/interfaces/org.kde.KCookieServer.xml
share/dbus-1/interfaces/org.kde.KDirNotify.xml
share/dbus-1/interfaces/org.kde.KGlobalAccel.xml
@@ -3948,7 +3950,6 @@ share/dbus-1/interfaces/org.kde.StatusNotifierWatcher.xml
share/dbus-1/interfaces/org.kde.kded.xml
share/dbus-1/interfaces/org.kde.kglobalaccel.Component.xml
share/dbus-1/interfaces/org.kde.kio.FileUndoManager.xml
-share/dbus-1/system-services/org.kde.kcontrol.kcmremotewidgets.service
share/doc/HTML/en/common/1.png
share/doc/HTML/en/common/10.png
share/doc/HTML/en/common/2.png
@@ -4063,10 +4064,12 @@ share/kde4/services/kspell_aspell.desktop
share/kde4/services/kspell_enchant.desktop
share/kde4/services/kspell_hspell.desktop
share/kde4/services/ktexteditor_autobrace.desktop
+share/kde4/services/ktexteditor_autobrace_config.desktop
share/kde4/services/ktexteditor_exporter.desktop
+share/kde4/services/ktexteditor_iconinserter.desktop
+share/kde4/services/ktexteditor_insanehtml_le.desktop
share/kde4/services/ktexteditor_insertfile.desktop
share/kde4/services/ktexteditor_kdatatool.desktop
-share/kde4/services/ktexteditor_python-encoding.desktop
share/kde4/services/metainfo.protocol
share/kde4/services/mms.protocol
share/kde4/services/mmst.protocol
@@ -4086,10 +4089,12 @@ share/kde4/services/qimageioplugins/mng.desktop
share/kde4/services/qimageioplugins/pbm.desktop
share/kde4/services/qimageioplugins/pcx.desktop
share/kde4/services/qimageioplugins/pgm.desktop
+share/kde4/services/qimageioplugins/pic.desktop
share/kde4/services/qimageioplugins/png.desktop
share/kde4/services/qimageioplugins/pnm.desktop
share/kde4/services/qimageioplugins/ppm.desktop
share/kde4/services/qimageioplugins/psd.desktop
+share/kde4/services/qimageioplugins/ras.desktop
share/kde4/services/qimageioplugins/rgb.desktop
share/kde4/services/qimageioplugins/tga.desktop
share/kde4/services/qimageioplugins/tiff.desktop
@@ -4174,13 +4179,13 @@ share/mime/uri/rtspu.xml
@dirrm share/doc/HTML/en/kioslave/file
@dirrm share/doc/HTML/en/kioslave/data
@dirrm share/doc/HTML/en/common
-@dirrmtry share/dbus-1/system-services
@dirrm share/config/ui
@dirrm share/config/colors
@dirrm share/apps/proxyscout
-@dirrm share/apps/nepomuk/pics
@dirrm share/apps/ktexteditor_kdatatool
@dirrm share/apps/ktexteditor_insertfile
+@dirrm share/apps/ktexteditor_insanehtml_le
+@dirrm share/apps/ktexteditor_iconinserter
@dirrm share/apps/ktexteditor_exporter
@dirrm share/apps/kssl
@dirrm share/apps/ksgmltools2/docbook/xsl/params
@@ -4191,10 +4196,6 @@ share/mime/uri/rtspu.xml
@dirrm share/apps/ksgmltools2/docbook/xsl/html
@dirrm share/apps/ksgmltools2/docbook/xsl/common
@dirrm share/apps/ksgmltools2/docbook/xsl
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2
@dirrm share/apps/ksgmltools2/docbook
@dirrm share/apps/ksgmltools2/customization/zh-TW/entities
@dirrm share/apps/ksgmltools2/customization/zh-TW
@@ -4237,7 +4238,6 @@ share/mime/uri/rtspu.xml
@dirrm share/apps/ksgmltools2/customization/pt
@dirrm share/apps/ksgmltools2/customization/pl/entities
@dirrm share/apps/ksgmltools2/customization/pl
-@dirrm share/apps/ksgmltools2/customization/obsolete
@dirrm share/apps/ksgmltools2/customization/no/entities
@dirrm share/apps/ksgmltools2/customization/no
@dirrm share/apps/ksgmltools2/customization/nn/entities
@@ -4309,8 +4309,6 @@ share/mime/uri/rtspu.xml
@dirrmtry share/apps/katepart/script
@dirrmtry share/apps/katepart/api
@dirrm share/apps/LICENSES
-@dirrmtry share/PolicyKit/policy
-@dirrmtry share/PolicyKit
@dirrm lib/kde4/plugins/script
@dirrm lib/kde4/plugins/kauth/helper
@dirrm lib/kde4/plugins/kauth/backend
@@ -4369,9 +4367,7 @@ share/mime/uri/rtspu.xml
@dirrm include/KDE/DOM
@dirrm include/KDE/DNSSD
@dirrm include/KDE/ConversionCheck
-@dirrm etc/xdg/menus
-@dirrm etc/xdg
-@dirrmtry etc/dbus-1/system.d
-@dirrmtry etc/dbus-1
+@dirrmtry etc/xdg/menus
+@dirrmtry etc/xdg
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/x11/plasma-scriptengine-python/files/patch-plasma__generic__scriptengines__python__CMakeLists.txt b/x11/plasma-scriptengine-python/files/patch-plasma__generic__scriptengines__python__CMakeLists.txt
index 5f9b6ffdbfdd..97303a9a6173 100644
--- a/x11/plasma-scriptengine-python/files/patch-plasma__generic__scriptengines__python__CMakeLists.txt
+++ b/x11/plasma-scriptengine-python/files/patch-plasma__generic__scriptengines__python__CMakeLists.txt
@@ -3,9 +3,9 @@
@@ -1,5 +1,8 @@
project(plasma-python)
-+find_package(KDE4 4.4.1 REQUIRED)
++find_package(KDE4 4.4.90 REQUIRED)
+macro_optional_find_package(PythonLibrary)
+
- INCLUDE(PythonMacros)
+ include(PythonMacros)
# install the library, .desktop, and plasma.py
diff --git a/x11/plasma-scriptengine-ruby/files/patch-plasma__generic__scriptengines__ruby__CMakeLists.txt b/x11/plasma-scriptengine-ruby/files/patch-plasma__generic__scriptengines__ruby__CMakeLists.txt
index 50bdfbddb3bd..6a920d8816da 100644
--- a/x11/plasma-scriptengine-ruby/files/patch-plasma__generic__scriptengines__ruby__CMakeLists.txt
+++ b/x11/plasma-scriptengine-ruby/files/patch-plasma__generic__scriptengines__ruby__CMakeLists.txt
@@ -1,7 +1,7 @@
--- ./plasma/generic/scriptengines/ruby/CMakeLists.txt.orig 2009-09-16 15:41:04.000000000 +0400
+++ ./plasma/generic/scriptengines/ruby/CMakeLists.txt 2010-03-30 20:25:46.102451515 +0400
@@ -1,3 +1,5 @@
-+find_package(KDE4 4.4.1 REQUIRED)
++find_package(KDE4 4.4.90 REQUIRED)
+
install(FILES applet.rb DESTINATION ${DATA_INSTALL_DIR}/plasma_scriptengine_ruby)
install(FILES data_engine.rb DESTINATION ${DATA_INSTALL_DIR}/plasma_scriptengine_ruby)