aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/kde4-baseapps/Makefile23
-rw-r--r--x11/kde4-baseapps/distinfo6
-rw-r--r--x11/kde4-baseapps/files/extra-patch-libusb20193
-rw-r--r--x11/kde4-baseapps/files/patch-apps-konsole-src-ProcessInfo.cpp147
-rw-r--r--x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h15
-rw-r--r--x11/kde4-baseapps/pkg-plist71
-rw-r--r--x11/kde4-runtime/Makefile36
-rw-r--r--x11/kde4-runtime/distinfo6
-rw-r--r--x11/kde4-runtime/pkg-plist488
-rw-r--r--x11/kde4-workspace/Makefile37
-rw-r--r--x11/kde4-workspace/distinfo6
-rw-r--r--x11/kde4-workspace/files/patch-CVE-2010-0436193
-rw-r--r--x11/kde4-workspace/files/patch-ConfigureChecks.cmake20
-rw-r--r--x11/kde4-workspace/files/patch-kdm-backend-dm.h30
-rw-r--r--x11/kde4-workspace/files/patch-kdm-backend-sessreg.c24
-rw-r--r--x11/kde4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp33
-rw-r--r--x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt11
-rw-r--r--x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt7
-rw-r--r--x11/kde4-workspace/pkg-plist286
-rw-r--r--x11/kde4/Makefile5
-rw-r--r--x11/kdebase4-runtime/Makefile36
-rw-r--r--x11/kdebase4-runtime/distinfo6
-rw-r--r--x11/kdebase4-runtime/pkg-plist488
-rw-r--r--x11/kdebase4-workspace/Makefile37
-rw-r--r--x11/kdebase4-workspace/distinfo6
-rw-r--r--x11/kdebase4-workspace/files/patch-CVE-2010-0436193
-rw-r--r--x11/kdebase4-workspace/files/patch-ConfigureChecks.cmake20
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm-backend-dm.h30
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm-backend-sessreg.c24
-rw-r--r--x11/kdebase4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp33
-rw-r--r--x11/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt11
-rw-r--r--x11/kdebase4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt7
-rw-r--r--x11/kdebase4-workspace/pkg-plist286
-rw-r--r--x11/kdebase4/Makefile23
-rw-r--r--x11/kdebase4/distinfo6
-rw-r--r--x11/kdebase4/files/extra-patch-libusb20193
-rw-r--r--x11/kdebase4/files/patch-apps-konsole-src-ProcessInfo.cpp147
-rw-r--r--x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h15
-rw-r--r--x11/kdebase4/pkg-plist71
-rw-r--r--x11/kdelibs4-experimental/Makefile32
-rw-r--r--x11/kdelibs4-experimental/distinfo3
-rw-r--r--x11/kdelibs4-experimental/files/patch-knotificationitem__CMakeLists.txt8
-rw-r--r--x11/kdelibs4-experimental/pkg-descr3
-rw-r--r--x11/kdelibs4-experimental/pkg-plist8
-rw-r--r--x11/kdelibs4/Makefile27
-rw-r--r--x11/kdelibs4/distinfo6
-rw-r--r--x11/kdelibs4/files/patch-KDE4Defaults.cmake8
-rw-r--r--x11/kdelibs4/files/patch-cmake-modules-CMakeLists.txt21
-rw-r--r--x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake18
-rw-r--r--x11/kdelibs4/files/patch-kio_kfile_kdiskfreespaceinfo.cpp11
-rw-r--r--x11/kdelibs4/files/patch-solid_solid_backends_hal_halstorageaccess.cpp39
-rw-r--r--x11/kdelibs4/pkg-plist354
52 files changed, 1744 insertions, 2063 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index fd3215bc754e..eb86e7804ea1 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -30,7 +29,7 @@ QT_COMPONENTS= corelib opengl dbus qt3support \
qmake_build moc_build rcc_build uic_build
USE_GETTEXT= yes
-USE_KDE4= kdelibs workspace kdeprefix kdehier automoc4
+USE_KDE4= kdelibs kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
MAKE_JOBS_SAFE= yes
@@ -38,23 +37,25 @@ 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 \
kfind.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${OSVERSION} < 800069
LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
.endif
-post-patch:
-.if ${OSVERSION} > 800090
- @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-libusb20
-.endif
-.if ${OSVERSION} >= 800100
- @${REINPLACE_CMD} -e 's,usb_revision.h,usbdi.h,g' \
- ${PATCH_WRKSRC}/apps/kinfocenter/usbview/usbdevices.h
+.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.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index b9e3be5ff46d..4b189887e082 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-4.3.5.tar.bz2) = 8780164dc328992cfbd9a6d5c9e8a8f5
-SHA256 (KDE/kdebase-4.3.5.tar.bz2) = 2f2d4881face2e55a8b86c841a6d9ad438cfa5f7dfa58010e53c86f2dd1b1513
-SIZE (KDE/kdebase-4.3.5.tar.bz2) = 4151612
+MD5 (KDE/kdebase-4.4.3.tar.bz2) = 034eaeaafc1fb0c48fc54336283891ce
+SHA256 (KDE/kdebase-4.4.3.tar.bz2) = 4fc9b7aea066675f3e96ab3641bef5217e6af380ff2deb8f6f4f5f9a03ad4d95
+SIZE (KDE/kdebase-4.4.3.tar.bz2) = 4052525
diff --git a/x11/kde4-baseapps/files/extra-patch-libusb20 b/x11/kde4-baseapps/files/extra-patch-libusb20
deleted file mode 100644
index 18f4782c4506..000000000000
--- a/x11/kde4-baseapps/files/extra-patch-libusb20
+++ /dev/null
@@ -1,193 +0,0 @@
-diff -u -r ./apps/kinfocenter/usbview/CMakeLists.txt ./apps/kinfocenter/usbview/CMakeLists.txt
---- ./apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:54:55.000000000 +0200
-+++ ./apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:55:58.000000000 +0200
-@@ -9,7 +9,7 @@
- kde4_add_plugin(kcm_usb ${kcm_usb_PART_SRCS})
-
-
--target_link_libraries(kcm_usb ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
-+target_link_libraries(kcm_usb ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} -lusb)
-
- install(TARGETS kcm_usb DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-diff -u -r ./apps/kinfocenter/usbview/usbdevices.cpp ./apps/kinfocenter/usbview/usbdevices.cpp
---- ./apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:54:55.000000000 +0200
-+++ ./apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:55:58.000000000 +0200
-@@ -294,17 +294,25 @@
-
- /*
- * FreeBSD support by Markus Brueffer <markus@brueffer.de>
-+ * libusb20 support by Hans Petter Selasky <hselasky@freebsd.org>
- *
- * Basic idea and some code fragments were taken from FreeBSD's usbdevs(8),
- * originally developed for NetBSD, so this code should work with no or
- * only little modification on NetBSD.
- */
-
--void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent)
-+void USBDevice::collectData(struct libusb20_backend *pbe,
-+ struct libusb20_device *pdev)
- {
-+ char tempbuf[32];
-+ struct usb_device_info di;
-+
-+ if (libusb20_dev_get_info(pdev, &di))
-+ memset(&di, 0, sizeof(di));
-+
- // determine data for this device
-- _level = level;
-- _parent = parent;
-+ _level = 0;
-+ _parent = 0;
-
- _bus = di.udi_bus;
- _device = di.udi_addr;
-@@ -320,88 +328,47 @@
- _power = di.udi_power;
- _channels = di.udi_nports;
-
-- // determine the speed
--#if defined(__DragonFly__) || (defined(Q_OS_FREEBSD) && __FreeBSD_version > 490102) || defined(Q_OS_NETBSD)
- switch (di.udi_speed) {
- case USB_SPEED_LOW: _speed = 1.5; break;
- case USB_SPEED_FULL: _speed = 12.0; break;
- case USB_SPEED_HIGH: _speed = 480.0; break;
-+ case USB_SPEED_VARIABLE: _speed = 480.0; break;
-+ case USB_SPEED_SUPER: _speed = 4800.0; break;
-+ default: _speed = 480.0; break;
- }
--#else
-- _speed = di.udi_lowspeed ? 1.5 : 12.0;
--#endif
-
- // Get all attached devicenodes
-- for ( int i = 0; i < USB_MAX_DEVNAMES; ++i )
-- if ( di.udi_devnames[i][0] )
-- _devnodes << di.udi_devnames[i];
-+ for ( int i = 0; i < 32; ++i ) {
-+ if (libusb20_dev_get_iface_desc(
-+ pdev, i, tempbuf, sizeof(tempbuf)) == 0) {
-+ _devnodes << tempbuf;
-+ } else {
-+ break;
-+ }
-+ }
-
- // For compatibility, split the revision number
- sscanf( di.udi_release, "%x.%x", &_revMajor, &_revMinor );
--
-- // Cycle through the attached devices if there are any
-- for ( int p = 0; p < di.udi_nports; ++p ) {
-- // Get data for device
-- struct usb_device_info di2;
--
-- di2.udi_addr = di.udi_ports[p];
--
-- if ( di2.udi_addr >= USB_MAX_DEVICES )
-- continue;
--
-- if ( ioctl(fd, USB_DEVICEINFO, &di2) == -1 )
-- continue;
--
-- // Only add the device if we didn't detect it, yet
-- if (!find( di2.udi_bus, di2.udi_addr ) )
-- {
-- USBDevice *device = new USBDevice();
-- device->collectData( fd, level + 1, di2, di.udi_addr );
-- }
-- }
- }
-
- bool USBDevice::parse(const QString &fname)
- {
- static bool showErrorMessage = true;
-- bool error = false;
-+ struct libusb20_backend *pbe;
-+ struct libusb20_device *pdev;
- _devices.clear();
-
-- QFile controller("/dev/usb0");
-- int i = 1;
-- while ( controller.exists() )
-- {
-- // If the devicenode exists, continue with further inspection
-- if ( controller.open(QIODevice::ReadOnly) )
-- {
-- for ( int addr = 1; addr < USB_MAX_DEVICES; ++addr )
-- {
-- struct usb_device_info di;
--
-- di.udi_addr = addr;
-- if ( ioctl(controller.handle(), USB_DEVICEINFO, &di) != -1 )
-- {
-- if (!find( di.udi_bus, di.udi_addr ) )
-- {
-- USBDevice *device = new USBDevice();
-- device->collectData( controller.handle(), 0, di, 0);
-- }
-- }
-- }
-- controller.close();
--#ifndef Q_OS_NETBSD
-- } else {
-- error = true;
--#endif
-- }
-- controller.setFileName( QString::fromLocal8Bit("/dev/usb%1").arg(i++) );
-+ pbe = libusb20_be_alloc_default();
-+ if (pbe == NULL)
-+ return (false);
-+
-+ pdev = NULL;
-+
-+ while ((pdev = libusb20_be_device_foreach(pbe, pdev))) {
-+ USBDevice *device = new USBDevice();
-+ device->collectData(pbe, pdev);
- }
--
-- if ( showErrorMessage && error ) {
-- showErrorMessage = false;
-- KMessageBox::error( 0, i18n("Could not open one or more USB controller. Make sure, you have read access to all USB controllers that should be listed here."));
-- }
--
-+ libusb20_be_free(pbe);
- return true;
- }
- #endif
-diff -u -r ./apps/kinfocenter/usbview/usbdevices.h ./apps/kinfocenter/usbview/usbdevices.h
---- ./apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:54:55.000000000 +0200
-+++ ./apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:59:11.000000000 +0200
-@@ -14,18 +14,11 @@
- #include <QList>
- #include <QString>
-
--#if defined(__DragonFly__)
--#include <bus/usb/usb.h>
--#include <QStringList>
--#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
- #include <sys/param.h>
--#if __FreeBSD_version >= 800061
--#include <legacy/dev/usb/usb.h>
--#else
--#include <dev/usb/usb.h>
--#endif
-+#include <libusb20.h>
-+#include <dev/usb/usb_ioctl.h>
-+#include <dev/usb/usb_revision.h>
- #include <QStringList>
--#endif
-
- class USBDB;
-
-@@ -81,10 +74,8 @@
-
- unsigned int _vendorID, _prodID, _revMajor, _revMinor;
-
--#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-- void collectData( int fd, int level, usb_device_info &di, int parent );
-+ void collectData(struct libusb20_backend *, struct libusb20_device *);
- QStringList _devnodes;
--#endif
- };
-
- #endif
diff --git a/x11/kde4-baseapps/files/patch-apps-konsole-src-ProcessInfo.cpp b/x11/kde4-baseapps/files/patch-apps-konsole-src-ProcessInfo.cpp
deleted file mode 100644
index 34dd2af1bd30..000000000000
--- a/x11/kde4-baseapps/files/patch-apps-konsole-src-ProcessInfo.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
---- apps/konsole/src/ProcessInfo.cpp.orig 2009-04-15 12:25:25.000000000 +0200
-+++ apps/konsole/src/ProcessInfo.cpp 2009-08-14 03:00:37.000000000 +0200
-@@ -27,6 +27,14 @@
- #include <unistd.h>
- #include <pwd.h>
-
-+// FreeBSD
-+#ifdef Q_OS_FREEBSD
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#include <libutil.h>
-+#endif
-+
- // Qt
- #include <KDebug>
- #include <QtCore/QDir>
-@@ -657,6 +665,120 @@
- }
- } ;
-
-+#ifdef Q_OS_FREEBSD
-+class FreeBSDProcessInfo : public UnixProcessInfo
-+{
-+public:
-+ FreeBSDProcessInfo(int pid, bool readEnvironment)
-+ : UnixProcessInfo(pid,readEnvironment)
-+ {
-+ }
-+private:
-+ virtual bool readProcInfo(int pid)
-+ {
-+ struct kinfo_proc *kip;
-+ int name[4];
-+ size_t len;
-+
-+ name[0] = CTL_KERN;
-+ name[1] = KERN_PROC;
-+ name[2] = KERN_PROC_PID;
-+ name[3] = pid;
-+
-+ len = 0;
-+ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0)
-+ return false;
-+
-+ kip = static_cast<struct kinfo_proc*>(malloc(len));
-+ if (kip == NULL)
-+ return false;
-+
-+ if (sysctl(name, 4, kip, &len, NULL, 0) < 0) {
-+ free(kip);
-+ return false;
-+ }
-+
-+ if (len != sizeof(*kip) || (kip->ki_structsize != sizeof(*kip)) || (kip->ki_pid != pid)) {
-+ free(kip);
-+ return false;
-+ }
-+
-+ setParentPid(kip->ki_ppid);
-+ setForegroundPid(kip->ki_pgid);
-+ setName(kip->ki_comm);
-+ setPid(pid);
-+
-+ setUserId(kip->ki_uid);
-+ readUserName();
-+
-+ free(kip);
-+
-+ return true;
-+ }
-+
-+ virtual bool readArguments(int pid)
-+ {
-+ char args[ARG_MAX];
-+ int name[4];
-+ size_t len;
-+
-+ name[0] = CTL_KERN;
-+ name[1] = KERN_PROC;
-+ name[2] = KERN_PROC_ARGS;
-+ name[3] = pid;
-+
-+ len = sizeof(args);
-+ if (sysctl(name, 4, args, &len, NULL, 0) < 0);
-+ return false;
-+
-+ for (char *cp = args; cp < args + len; cp += strlen(cp) + 1)
-+ addArgument(QString(cp));
-+
-+ return true;
-+ }
-+
-+ virtual bool readEnvironment(int /*pid*/)
-+ {
-+ // Not supported in FreeBSD
-+ return true;
-+ }
-+
-+ virtual bool readCurrentDir(int pid)
-+ {
-+ struct kinfo_file *kif;
-+ int count;
-+
-+ kif = kinfo_getfile(pid, &count);
-+ if (kif == NULL)
-+ return false;
-+
-+ for (int i = 0; i < count; i++) {
-+ if (kif[i].kf_fd == KF_FD_TYPE_CWD) {
-+ QFileInfo info(QString(kif[i].kf_path));
-+ free(kif);
-+
-+ const bool readable = info.isReadable();
-+
-+ if (readable) {
-+ if(info.isSymLink())
-+ setCurrentDir(info.symLinkTarget());
-+ else
-+ setCurrentDir(info.filePath());
-+ return true;
-+ } else {
-+ if (!readable)
-+ setError(PermissionsError);
-+ else
-+ setError(UnknownError);
-+
-+ return false;
-+ }
-+ }
-+ }
-+ }
-+};
-+#endif
-+
- SSHProcessInfo::SSHProcessInfo(const ProcessInfo& process)
- : _process(process)
- {
-@@ -802,6 +924,8 @@
- return new LinuxProcessInfo(pid,enableEnvironmentRead);
- #elif defined(Q_OS_SOLARIS)
- return new SolarisProcessInfo(pid,enableEnvironmentRead);
-+#elif defined(Q_OS_FREEBSD)
-+ return new FreeBSDProcessInfo(pid,enableEnvironmentRead);
- #else
- return new NullProcessInfo(pid,enableEnvironmentRead);
- #endif
diff --git a/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h b/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h
deleted file mode 100644
index 57c5437c6ff9..000000000000
--- a/x11/kde4-baseapps/files/patch-apps_kinfocenter_usbview_usbdevices.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./apps/kinfocenter/usbview/usbdevices.h.orig 2008-10-17 03:00:14.000000000 -0800
-+++ ./apps/kinfocenter/usbview/usbdevices.h 2009-03-01 21:01:18.000000000 -0900
-@@ -18,7 +18,12 @@
- #include <bus/usb/usb.h>
- #include <QStringList>
- #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-+#include <sys/param.h>
-+#if __FreeBSD_version >= 800061
-+#include <legacy/dev/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
- #include <QStringList>
- #endif
-
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index de7d863ec5d6..3d30d89c622b 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -13,10 +13,14 @@ bin/konsoleprofile
bin/kwrite
bin/nspluginscan
bin/nspluginviewer
+bin/servicemenudeinstallation
+bin/servicemenuinstallation
include/knewmenu.h
include/konq_dndpopupmenuplugin.h
include/konq_events.h
include/konq_fileitemcapabilities.h
+include/konq_historyentry.h
+include/konq_historyprovider.h
include/konq_menuactions.h
include/konq_operations.h
include/konq_popupmenu.h
@@ -24,8 +28,10 @@ include/konq_popupmenuinformation.h
include/konq_popupmenuplugin.h
include/konqmimedata.h
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
@@ -55,8 +61,8 @@ lib/kde4/konq_shellcmdplugin.so
lib/kde4/konq_sidebar.so
lib/kde4/konq_sidebartree_bookmarks.so
lib/kde4/konq_sidebartree_dirtree.so
-lib/kde4/konq_sidebartree_history.so
lib/kde4/konq_sound.so
+lib/kde4/konqsidebar_history.so
lib/kde4/konqsidebar_tree.so
lib/kde4/konqsidebar_web.so
lib/kde4/libkcminit_nsplugins.so
@@ -97,6 +103,7 @@ share/applications/kde4/konqbrowser.desktop
share/applications/kde4/konquerorsu.desktop
share/applications/kde4/konsole.desktop
share/applications/kde4/kwrite.desktop
+share/apps/dolphin/dolphinsearchcommands.desktop
share/apps/dolphin/dolphinui.rc
share/apps/dolphinpart/dolphinpart.rc
share/apps/dolphinpart/kpartplugins/kshellcmdplugin.desktop
@@ -336,9 +343,7 @@ 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
-share/apps/kconf_update/konqsidebartng.upd
share/apps/kconf_update/move_favicons.sh
-share/apps/kconf_update/move_konqsidebartng_entries.sh
share/apps/kcontrol/pics/onlyone.png
share/apps/kcontrol/pics/overlapping.png
share/apps/kdm/pics/users/Blackbox.png
@@ -354,20 +359,18 @@ 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/about/top-right-kinfocenter.png
share/apps/kinfocenter/kinfocenterui.rc
-share/apps/konqsidebartng/add/virtualfolderadd.desktop
-share/apps/konqsidebartng/add/webmodule_add.desktop
share/apps/konqsidebartng/dirtree/bookmarks_module.desktop
share/apps/konqsidebartng/dirtree/dirtree_module.desktop
-share/apps/konqsidebartng/dirtree/history_module.desktop
-share/apps/konqsidebartng/entries/.version
share/apps/konqsidebartng/entries/bookmarks.desktop
share/apps/konqsidebartng/entries/history.desktop
share/apps/konqsidebartng/entries/home.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_tree.desktop
+share/apps/konqsidebartng/plugins/konqsidebar_web.desktop
share/apps/konqsidebartng/virtual_folders/remote/.directory
share/apps/konqsidebartng/virtual_folders/remote/ftp/.directory
share/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop
@@ -378,7 +381,6 @@ share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
share/apps/konqsidebartng/virtual_folders/services/.directory
share/apps/konqsidebartng/virtual_folders/services/applications.desktop
-share/apps/konqsidebartng/websidebar/websidebar.html
share/apps/konqueror/about/box-centre-konqueror.png
share/apps/konqueror/about/intro.html
share/apps/konqueror/about/konq.css
@@ -419,6 +421,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/kwrite/kwriteui.rc
share/apps/plugin/nspluginpart.rc
share/autostart/konqy_preload.desktop
@@ -427,11 +431,13 @@ share/config.kcfg/dolphin_detailsmodesettings.kcfg
share/config.kcfg/dolphin_directoryviewpropertysettings.kcfg
share/config.kcfg/dolphin_generalsettings.kcfg
share/config.kcfg/dolphin_iconsmodesettings.kcfg
+share/config.kcfg/dolphin_versioncontrolsettings.kcfg
share/config.kcfg/kcm_useraccount.kcfg
share/config.kcfg/kcm_useraccount_pass.kcfg
share/config.kcfg/keditbookmarks.kcfg
share/config.kcfg/konqueror.kcfg
-share/config/konqsidebartng.rc
+share/config/konqsidebartngrc
+share/config/servicemenu.knsrc
share/dbus-1/interfaces/org.kde.FavIcon.xml
share/dbus-1/interfaces/org.kde.Konqueror.Main.xml
share/dbus-1/interfaces/org.kde.Konqueror.MainWindow.xml
@@ -441,24 +447,20 @@ share/dbus-1/interfaces/org.kde.nsplugins.CallBack.xml
share/dbus-1/interfaces/org.kde.nsplugins.class.xml
share/dbus-1/interfaces/org.kde.nsplugins.instance.xml
share/dbus-1/interfaces/org.kde.nsplugins.viewer.xml
-share/doc/HTML/en/dolphin/bookmarkbutton.png
-share/doc/HTML/en/dolphin/bookmarksidebar.png
-share/doc/HTML/en/dolphin/breadcrumb.png
-share/doc/HTML/en/dolphin/browsebutton.png
share/doc/HTML/en/dolphin/common
-share/doc/HTML/en/dolphin/configurationwindow.png
-share/doc/HTML/en/dolphin/configurationwindow2.png
-share/doc/HTML/en/dolphin/configurationwindow3.png
-share/doc/HTML/en/dolphin/directorypath.png
-share/doc/HTML/en/dolphin/dolphin.png
-share/doc/HTML/en/dolphin/hiddenfolder.png
+share/doc/HTML/en/dolphin/default-ui.png
share/doc/HTML/en/dolphin/index.cache.bz2
share/doc/HTML/en/dolphin/index.docbook
-share/doc/HTML/en/dolphin/informationsidebar.png
-share/doc/HTML/en/dolphin/split.png
-share/doc/HTML/en/dolphin/systemmediadirectory.png
-share/doc/HTML/en/dolphin/toolbarbuttons.png
-share/doc/HTML/en/dolphin/workspacebuttons.png
+share/doc/HTML/en/dolphin/locationbar-breadcrumb.png
+share/doc/HTML/en/dolphin/locationbar-editable.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
+share/doc/HTML/en/dolphin/preferences-trash.png
+share/doc/HTML/en/dolphin/preferences-viewmodes-icons.png
+share/doc/HTML/en/dolphin/toolbar-navigation.png
+share/doc/HTML/en/dolphin/toolbar-view-appearance.png
+share/doc/HTML/en/dolphin/viewproperties-dialog.png
share/doc/HTML/en/kdepasswd/common
share/doc/HTML/en/kdepasswd/index.cache.bz2
share/doc/HTML/en/kdepasswd/index.docbook
@@ -482,6 +484,7 @@ 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
@@ -497,9 +500,6 @@ 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/pcmcia/common
-share/doc/HTML/en/kinfocenter/pcmcia/index.cache.bz2
-share/doc/HTML/en/kinfocenter/pcmcia/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
@@ -518,6 +518,9 @@ 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
@@ -541,6 +544,7 @@ share/doc/HTML/en/konqueror/man-kbookmarkmerger.1.docbook
share/doc/HTML/en/konqueror/parts.png
share/doc/HTML/en/konqueror/path-complete.docbook
share/doc/HTML/en/konqueror/plugins.docbook
+share/doc/HTML/en/konqueror/reset.png
share/doc/HTML/en/konqueror/save-settings.docbook
share/doc/HTML/en/konqueror/shortcut1.png
share/doc/HTML/en/konqueror/shortcut2.png
@@ -776,6 +780,7 @@ 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
@@ -805,7 +810,6 @@ share/kde4/services/konq_aboutpage.desktop
share/kde4/services/konq_sidebartng.desktop
share/kde4/services/konqueror.desktop
share/kde4/services/konsolepart.desktop
-share/kde4/services/lanbrowser.desktop
share/kde4/services/netpref.desktop
share/kde4/services/nic.desktop
share/kde4/services/opengl.desktop
@@ -843,6 +847,7 @@ share/kde4/services/useragentstrings/safari32.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
@@ -873,6 +878,7 @@ share/templates/linkFloppy.desktop
share/templates/linkHD.desktop
share/templates/linkMO.desktop
share/templates/linkNFS.desktop
+share/templates/linkPath.desktop
share/templates/linkProgram.desktop
share/templates/linkURL.desktop
share/templates/linkZIP.desktop
@@ -881,13 +887,13 @@ share/templates/linkZIP.desktop
@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/pcmcia
@dirrm share/doc/HTML/en/kinfocenter/pci
@dirrm share/doc/HTML/en/kinfocenter/partitions
@dirrm share/doc/HTML/en/kinfocenter/opengl
@@ -903,17 +909,18 @@ share/templates/linkZIP.desktop
@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
@dirrm share/apps/konsole
@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@dirrm share/apps/konqueror/about
-@dirrm share/apps/konqsidebartng/websidebar
@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
@dirrm share/apps/konqsidebartng/virtual_folders/remote
+@dirrm share/apps/konqsidebartng/plugins
@dirrm share/apps/konqsidebartng/entries
@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/konqsidebartng/add
@dirrm share/apps/kinfocenter/about
@dirrm share/apps/kinfocenter
@dirrm share/apps/keditbookmarks
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 1a7c749095dc..07620680cf57 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,11 +17,12 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
-LIB_DEPENDS= lzma.0:${PORTSDIR}/archivers/xz \
- xine.1:${PORTSDIR}/multimedia/libxine \
- slp.1:${PORTSDIR}/net/openslp
+LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \
+ slp.1:${PORTSDIR}/net/openslp \
+ attica.0:${PORTSDIR}/x11-toolkits/attica \
+ ssh.4:${PORTSDIR}/security/libssh
-USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp
+USE_KDE4= kdelibs kdeprefix kdehier automoc4 #pimlibs
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
@@ -30,12 +31,18 @@ QT_COMPONENTS= corelib opengl dbus phonon \
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
-MAN1= kdesu.1
-MAN8= nepomukserver.8 nepomukservicestub.8
-
+MAN1= kdesu.1
OPTIONS= PULSEAUDIO "Enable playback via PulseAudio soundserver" off
-.include <bsd.port.pre.mk>
+# Explicitly disable alsa, see for details:
+# http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html
+CMAKE_ARGS+= -DWITH_ALSA:BOOL=OFF
+
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} < 900012
+LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz
+.endif
.if defined(WITH_PULSEAUDIO)
CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=ON
@@ -44,6 +51,15 @@ LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
.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 \
@@ -52,4 +68,4 @@ post-patch:
${PATCH_WRKSRC}/kioslave/man/man2html.cpp \
${PATCH_WRKSRC}/cmake/modules/FindCLucene.cmake
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index b01a23aa5476..e7e433bb57e4 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.3.5.tar.bz2) = 2d49beb007c41c0bebac063a579e81d9
-SHA256 (KDE/kdebase-runtime-4.3.5.tar.bz2) = 9dfaa6f60f36bdd7ca4a79ae74fe8a86bd7ec77a1249d57f4d26dec39dcfe334
-SIZE (KDE/kdebase-runtime-4.3.5.tar.bz2) = 7333093
+MD5 (KDE/kdebase-runtime-4.4.3.tar.bz2) = 3d5ad5eb5eeef2656cab860ae9f7c079
+SHA256 (KDE/kdebase-runtime-4.4.3.tar.bz2) = a1be5f6c45d6713197ef0e45628db4b2e1e31fd01dc9c8a2fc1822fa0840cfbb
+SIZE (KDE/kdebase-runtime-4.4.3.tar.bz2) = 7332130
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index c6641ea7dc47..5dc744d58437 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -9,6 +9,7 @@ bin/keditfiletype
bin/kfile4
bin/kglobalaccel
bin/khelpcenter
+bin/khotnewstuff-upload
bin/khotnewstuff4
bin/kiconfinder
bin/kioclient
@@ -23,13 +24,15 @@ bin/ktrash
bin/kuiserver
bin/kwalletd
bin/kwriteconfig
-bin/nepomukserver
-bin/nepomukservicestub
+%%NEPOMUK%%bin/nepomukserver
+%%NEPOMUK%%bin/nepomukservicestub
bin/plasmapkg
bin/solid-hardware
etc/xdg/menus/kde-information.menu
+lib/attica_kde.so
lib/kconf_update_bin/phonon_devicepreference_update
lib/kconf_update_bin/phonon_deviceuids_update
+lib/kde4/comicbookthumbnail.so
lib/kde4/cursorthumbnail.so
lib/kde4/djvuthumbnail.so
lib/kde4/exrthumbnail.so
@@ -37,8 +40,10 @@ lib/kde4/fixhosturifilter.so
lib/kde4/htmlthumbnail.so
lib/kde4/imagethumbnail.so
lib/kde4/jpegthumbnail.so
+lib/kde4/kcm_attica.so
lib/kde4/kcm_cgi.so
lib/kde4/kcm_componentchooser.so
+lib/kde4/kcm_device_automounter.so
lib/kde4/kcm_emoticons.so
lib/kde4/kcm_filetypes.so
lib/kde4/kcm_icons.so
@@ -46,14 +51,16 @@ lib/kde4/kcm_kded.so
lib/kde4/kcm_kdnssd.so
lib/kde4/kcm_knotify.so
lib/kde4/kcm_locale.so
-lib/kde4/kcm_nepomuk.so
+%%NEPOMUK%%lib/kde4/kcm_nepomuk.so
lib/kde4/kcm_phonon.so
lib/kde4/kcm_phononxine.so
lib/kde4/kcm_trash.so
lib/kde4/kcmspellchecking.so
lib/kde4/kded_desktopnotifier.so
+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_networkwatcher.so
lib/kde4/kded_phononserver.so
lib/kde4/kded_remotedirnotify.so
@@ -71,7 +78,8 @@ lib/kde4/kio_fish.so
lib/kde4/kio_floppy.so
lib/kde4/kio_info.so
lib/kde4/kio_man.so
-lib/kde4/kio_nepomuksearch.so
+%%NEPOMUK%%lib/kde4/kio_nepomuk.so
+%%NEPOMUK%%lib/kde4/kio_nepomuksearch.so
lib/kde4/kio_network.so
lib/kde4/kio_nfs.so
lib/kde4/kio_remote.so
@@ -79,6 +87,7 @@ 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_trash.so
lib/kde4/kshorturifilter.so
lib/kde4/kstyle_oxygen_config.so
@@ -100,31 +109,35 @@ lib/kde4/libkmanpart.so
lib/kde4/librenaudioplugin.so
lib/kde4/librenimageplugin.so
lib/kde4/localdomainurifilter.so
-lib/kde4/nepomukfilewatch.so
-lib/kde4/nepomukmigration1.so
-lib/kde4/nepomukontologyloader.so
-lib/kde4/nepomukqueryservice.so
-lib/kde4/nepomukstorage.so
-lib/kde4/nepomukstrigiservice.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/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
+lib/kde4/windowsimagethumbnail.so
lib/libkdeinit4_kcmshell4.so
lib/libkdeinit4_kglobalaccel.so
lib/libkdeinit4_khelpcenter.so
lib/libkdeinit4_kuiserver.so
lib/libkdeinit4_kwalletd.so
-lib/libkdeinit4_nepomukserver.so
+%%NEPOMUK%%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
-lib/strigi/strigiindex_sopranobackend.so
+%%NEPOMUK%%lib/strigi/strigiindex_nepomukbackend.so
share/applications/kde4/Help.desktop
share/applications/kde4/knetattach.desktop
share/apps/cmake/modules/FindCLucene.cmake
@@ -141,6 +154,7 @@ 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/widgets/action-overlays.svgz
share/apps/desktoptheme/default/widgets/analog_meter.svgz
share/apps/desktoptheme/default/widgets/arrows.svgz
share/apps/desktoptheme/default/widgets/background.svgz
@@ -159,11 +173,13 @@ 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/line.svgz
+share/apps/desktoptheme/default/widgets/lineedit.svgz
share/apps/desktoptheme/default/widgets/monitor.svgz
share/apps/desktoptheme/default/widgets/pager.svgz
share/apps/desktoptheme/default/widgets/panel-background.svgz
share/apps/desktoptheme/default/widgets/plot-background.svgz
share/apps/desktoptheme/default/widgets/scrollbar.svgz
+share/apps/desktoptheme/default/widgets/scrollwidget.svgz
share/apps/desktoptheme/default/widgets/slider.svgz
share/apps/desktoptheme/default/widgets/systemtray.svgz
share/apps/desktoptheme/default/widgets/tasks.svgz
@@ -184,6 +200,7 @@ share/apps/desktoptheme/oxygen/opaque/dialogs/shutdowndialog.svgz
share/apps/desktoptheme/oxygen/opaque/widgets/extender-background.svgz
share/apps/desktoptheme/oxygen/opaque/widgets/panel-background.svgz
share/apps/desktoptheme/oxygen/opaque/widgets/tooltip.svgz
+share/apps/desktoptheme/oxygen/widgets/action-overlays.svgz
share/apps/desktoptheme/oxygen/widgets/analog_meter.svgz
share/apps/desktoptheme/oxygen/widgets/arrows.svgz
share/apps/desktoptheme/oxygen/widgets/background.svgz
@@ -202,11 +219,13 @@ share/apps/desktoptheme/oxygen/widgets/extender-dragger.svgz
share/apps/desktoptheme/oxygen/widgets/frame.svgz
share/apps/desktoptheme/oxygen/widgets/glowbar.svgz
share/apps/desktoptheme/oxygen/widgets/line.svgz
+share/apps/desktoptheme/oxygen/widgets/lineedit.svgz
share/apps/desktoptheme/oxygen/widgets/monitor.svgz
share/apps/desktoptheme/oxygen/widgets/pager.svgz
share/apps/desktoptheme/oxygen/widgets/panel-background.svgz
share/apps/desktoptheme/oxygen/widgets/plot-background.svgz
share/apps/desktoptheme/oxygen/widgets/scrollbar.svgz
+share/apps/desktoptheme/oxygen/widgets/scrollwidget.svgz
share/apps/desktoptheme/oxygen/widgets/slider.svgz
share/apps/desktoptheme/oxygen/widgets/systemtray.svgz
share/apps/desktoptheme/oxygen/widgets/tasks.svgz
@@ -215,7 +234,9 @@ share/apps/desktoptheme/oxygen/widgets/toolbox.svgz
share/apps/desktoptheme/oxygen/widgets/tooltip.svgz
share/apps/desktoptheme/oxygen/widgets/translucentbackground.svgz
share/apps/desktoptheme/oxygen/widgets/viewitem.svgz
-share/apps/drkonqi/debuggers/gdbrc
+share/apps/drkonqi/debuggers/external/gdbrc
+share/apps/drkonqi/debuggers/external/kdbgrc
+share/apps/drkonqi/debuggers/internal/gdbrc
share/apps/drkonqi/mappings
share/apps/drkonqi/pics/crash.png
share/apps/kcm_componentchooser/kcm_browser.desktop
@@ -228,6 +249,7 @@ share/apps/kcmlocale/pics/background.png
share/apps/kconf_update/devicepreference.upd
share/apps/kconf_update/kuriikwsfilter.upd
share/apps/kde/kde.notifyrc
+share/apps/kglobalaccel/kglobalaccel.notifyrc
share/apps/khelpcenter/glossary.html.in
share/apps/khelpcenter/glossary.xslt
share/apps/khelpcenter/index.html.in
@@ -274,7 +296,6 @@ share/apps/kio_finger/kio_finger.css
share/apps/kio_finger/kio_finger.pl
share/apps/kio_info/kde-info2html
share/apps/kio_info/kde-info2html.conf
-share/apps/kio_thumbnail/pics/thumbnailfont_7x4.png
share/apps/konqsidebartng/virtual_folders/remote/virtualfolder_network.desktop
share/apps/konqueror/dirtree/remote/smb-network.desktop
share/apps/ksmserver/windowmanagers/compiz-custom.desktop
@@ -282,61 +303,37 @@ 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
-share/apps/nepomuk/ontologies/dces.desktop
-share/apps/nepomuk/ontologies/dces.rdf
-share/apps/nepomuk/ontologies/dcq.desktop
-share/apps/nepomuk/ontologies/dcq.rdf
-share/apps/nepomuk/ontologies/dctype.desktop
-share/apps/nepomuk/ontologies/dctype.rdf
-share/apps/nepomuk/ontologies/nao.desktop
-share/apps/nepomuk/ontologies/nao.trig
-share/apps/nepomuk/ontologies/ncal.desktop
-share/apps/nepomuk/ontologies/ncal.trig
-share/apps/nepomuk/ontologies/nco.desktop
-share/apps/nepomuk/ontologies/nco.trig
-share/apps/nepomuk/ontologies/nexif.desktop
-share/apps/nepomuk/ontologies/nexif.trig
-share/apps/nepomuk/ontologies/nfo.desktop
-share/apps/nepomuk/ontologies/nfo.trig
-share/apps/nepomuk/ontologies/nid3.desktop
-share/apps/nepomuk/ontologies/nid3.trig
-share/apps/nepomuk/ontologies/nie.desktop
-share/apps/nepomuk/ontologies/nie.trig
-share/apps/nepomuk/ontologies/nmo.desktop
-share/apps/nepomuk/ontologies/nmo.trig
-share/apps/nepomuk/ontologies/nrl.desktop
-share/apps/nepomuk/ontologies/nrl.trig
-share/apps/nepomuk/ontologies/pimo.desktop
-share/apps/nepomuk/ontologies/pimo.trig
-share/apps/nepomuk/ontologies/rdf.desktop
-share/apps/nepomuk/ontologies/rdf.rdfs
-share/apps/nepomuk/ontologies/rdfs.desktop
-share/apps/nepomuk/ontologies/rdfs.rdfs
-share/apps/nepomuk/ontologies/xesam.desktop
-share/apps/nepomuk/ontologies/xesam.rdfs
-share/apps/nepomukstorage/nepomukstorage.notifyrc
-share/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
+%%NEPOMUK%%share/apps/nepomukstorage/nepomukstorage.notifyrc
+%%NEPOMUK%%share/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
share/apps/phonon/phonon.notifyrc
share/apps/remoteview/network.desktop
share/apps/remoteview/smb-network.desktop
-share/autostart/nepomukserver.desktop
+%%NEPOMUK%%share/autostart/nepomukserver.desktop
share/config.kcfg/khelpcenter.kcfg
share/config/emoticons.knsrc
share/config/icons.knsrc
share/config/khotnewstuff.knsrc
+share/config/khotnewstuff_upload.knsrc
share/config/kshorturifilterrc
share/dbus-1/interfaces/org.kde.KTimeZoned.xml
-share/dbus-1/interfaces/org.kde.NepomukServer.xml
+%%NEPOMUK%%share/dbus-1/interfaces/org.kde.NepomukServer.xml
share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.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.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
+%%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.network.kioslavenotifier.xml
share/dbus-1/services/org.kde.knotify.service
share/desktop-directories/kde-development-translation.directory
@@ -378,34 +375,24 @@ share/desktop-directories/kde-utilities-peripherals.directory
share/desktop-directories/kde-utilities-pim.directory
share/desktop-directories/kde-utilities-xutils.directory
share/desktop-directories/kde-utilities.directory
-share/doc/HTML/en/kcontrol/background/common
-share/doc/HTML/en/kcontrol/background/index.cache.bz2
-share/doc/HTML/en/kcontrol/background/index.docbook
+share/doc/HTML/en/kcontrol/attica/common
+share/doc/HTML/en/kcontrol/attica/index.cache.bz2
+share/doc/HTML/en/kcontrol/attica/index.docbook
share/doc/HTML/en/kcontrol/bookmarks/common
share/doc/HTML/en/kcontrol/bookmarks/index.cache.bz2
share/doc/HTML/en/kcontrol/bookmarks/index.docbook
share/doc/HTML/en/kcontrol/cache/common
share/doc/HTML/en/kcontrol/cache/index.cache.bz2
share/doc/HTML/en/kcontrol/cache/index.docbook
-share/doc/HTML/en/kcontrol/common
+share/doc/HTML/en/kcontrol/componentchooser/common
+share/doc/HTML/en/kcontrol/componentchooser/index.cache.bz2
+share/doc/HTML/en/kcontrol/componentchooser/index.docbook
share/doc/HTML/en/kcontrol/cookies/common
share/doc/HTML/en/kcontrol/cookies/index.cache.bz2
share/doc/HTML/en/kcontrol/cookies/index.docbook
-share/doc/HTML/en/kcontrol/crypto/common
-share/doc/HTML/en/kcontrol/crypto/index.cache.bz2
-share/doc/HTML/en/kcontrol/crypto/index.docbook
-share/doc/HTML/en/kcontrol/desktop/common
-share/doc/HTML/en/kcontrol/desktop/index.cache.bz2
-share/doc/HTML/en/kcontrol/desktop/index.docbook
-share/doc/HTML/en/kcontrol/desktopbehavior/common
-share/doc/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
-share/doc/HTML/en/kcontrol/desktopbehavior/index.docbook
share/doc/HTML/en/kcontrol/ebrowsing/common
share/doc/HTML/en/kcontrol/ebrowsing/index.cache.bz2
share/doc/HTML/en/kcontrol/ebrowsing/index.docbook
-share/doc/HTML/en/kcontrol/email/common
-share/doc/HTML/en/kcontrol/email/index.cache.bz2
-share/doc/HTML/en/kcontrol/email/index.docbook
share/doc/HTML/en/kcontrol/emoticons/common
share/doc/HTML/en/kcontrol/emoticons/emoticons.png
share/doc/HTML/en/kcontrol/emoticons/index.cache.bz2
@@ -413,14 +400,15 @@ share/doc/HTML/en/kcontrol/emoticons/index.docbook
share/doc/HTML/en/kcontrol/filemanager/common
share/doc/HTML/en/kcontrol/filemanager/index.cache.bz2
share/doc/HTML/en/kcontrol/filemanager/index.docbook
-share/doc/HTML/en/kcontrol/filemanager/kfileman1.png
-share/doc/HTML/en/kcontrol/filemanager/kfileman2.png
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
share/doc/HTML/en/kcontrol/icons/common
share/doc/HTML/en/kcontrol/icons/delete-theme.png
share/doc/HTML/en/kcontrol/icons/effects.png
@@ -431,48 +419,45 @@ share/doc/HTML/en/kcontrol/icons/install-theme.png
share/doc/HTML/en/kcontrol/icons/main.png
share/doc/HTML/en/kcontrol/icons/size.png
share/doc/HTML/en/kcontrol/icons/use-of-icons.png
-share/doc/HTML/en/kcontrol/index.cache.bz2
-share/doc/HTML/en/kcontrol/index.docbook
+share/doc/HTML/en/kcontrol/kcmcgi/common
+share/doc/HTML/en/kcontrol/kcmcgi/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcmcgi/index.docbook
share/doc/HTML/en/kcontrol/kcmcss/common
share/doc/HTML/en/kcontrol/kcmcss/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmcss/index.docbook
-share/doc/HTML/en/kcontrol/kcmkonsole/common
-share/doc/HTML/en/kcontrol/kcmkonsole/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmkonsole/index.docbook
share/doc/HTML/en/kcontrol/kcmlaunch/common
share/doc/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmlaunch/index.docbook
share/doc/HTML/en/kcontrol/kcmnotify/common
share/doc/HTML/en/kcontrol/kcmnotify/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmnotify/index.docbook
-share/doc/HTML/en/kcontrol/kcmtaskbar/common
-share/doc/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmtaskbar/index.docbook
-share/doc/HTML/en/kcontrol/kdm/common
-share/doc/HTML/en/kcontrol/kdm/index.cache.bz2
-share/doc/HTML/en/kcontrol/kdm/index.docbook
-share/doc/HTML/en/kcontrol/khtml/common
-share/doc/HTML/en/kcontrol/khtml/index.cache.bz2
-share/doc/HTML/en/kcontrol/khtml/index.docbook
-share/doc/HTML/en/kcontrol/khtml/nsplugin.docbook
+share/doc/HTML/en/kcontrol/kded/common
+share/doc/HTML/en/kcontrol/kded/index.cache.bz2
+share/doc/HTML/en/kcontrol/kded/index.docbook
+share/doc/HTML/en/kcontrol/khtml-adblock/common
+share/doc/HTML/en/kcontrol/khtml-adblock/index.cache.bz2
+share/doc/HTML/en/kcontrol/khtml-adblock/index.docbook
+share/doc/HTML/en/kcontrol/khtml-behavior/common
+share/doc/HTML/en/kcontrol/khtml-behavior/index.cache.bz2
+share/doc/HTML/en/kcontrol/khtml-behavior/index.docbook
+share/doc/HTML/en/kcontrol/khtml-general/common
+share/doc/HTML/en/kcontrol/khtml-general/index.cache.bz2
+share/doc/HTML/en/kcontrol/khtml-general/index.docbook
+share/doc/HTML/en/kcontrol/khtml-java-js/common
+share/doc/HTML/en/kcontrol/khtml-java-js/index.cache.bz2
+share/doc/HTML/en/kcontrol/khtml-java-js/index.docbook
+share/doc/HTML/en/kcontrol/khtml-plugins/common
+share/doc/HTML/en/kcontrol/khtml-plugins/index.cache.bz2
+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
-share/doc/HTML/en/kcontrol/nepomuk/common
-share/doc/HTML/en/kcontrol/nepomuk/index.cache.bz2
-share/doc/HTML/en/kcontrol/nepomuk/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/netpref/common
share/doc/HTML/en/kcontrol/netpref/index.cache.bz2
share/doc/HTML/en/kcontrol/netpref/index.docbook
-share/doc/HTML/en/kcontrol/panel/common
-share/doc/HTML/en/kcontrol/panel/index.cache.bz2
-share/doc/HTML/en/kcontrol/panel/index.docbook
-share/doc/HTML/en/kcontrol/panelappearance/common
-share/doc/HTML/en/kcontrol/panelappearance/index.cache.bz2
-share/doc/HTML/en/kcontrol/panelappearance/index.docbook
-share/doc/HTML/en/kcontrol/passwords/common
-share/doc/HTML/en/kcontrol/passwords/index.cache.bz2
-share/doc/HTML/en/kcontrol/passwords/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
@@ -480,17 +465,24 @@ 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
+share/doc/HTML/en/kcontrol/phonon/common
+share/doc/HTML/en/kcontrol/phonon/index.cache.bz2
+share/doc/HTML/en/kcontrol/phonon/index.docbook
share/doc/HTML/en/kcontrol/proxy/common
share/doc/HTML/en/kcontrol/proxy/index.cache.bz2
share/doc/HTML/en/kcontrol/proxy/index.docbook
-share/doc/HTML/en/kcontrol/proxy/socks.docbook
-share/doc/HTML/en/kcontrol/screenshot.png
share/doc/HTML/en/kcontrol/smb/common
share/doc/HTML/en/kcontrol/smb/index.cache.bz2
share/doc/HTML/en/kcontrol/smb/index.docbook
+share/doc/HTML/en/kcontrol/solid-device-automounter/common
+share/doc/HTML/en/kcontrol/solid-device-automounter/index.cache.bz2
+share/doc/HTML/en/kcontrol/solid-device-automounter/index.docbook
share/doc/HTML/en/kcontrol/spellchecking/common
share/doc/HTML/en/kcontrol/spellchecking/index.cache.bz2
share/doc/HTML/en/kcontrol/spellchecking/index.docbook
+share/doc/HTML/en/kcontrol/trash/common
+share/doc/HTML/en/kcontrol/trash/index.cache.bz2
+share/doc/HTML/en/kcontrol/trash/index.docbook
share/doc/HTML/en/kcontrol/useragent/common
share/doc/HTML/en/kcontrol/useragent/index.cache.bz2
share/doc/HTML/en/kcontrol/useragent/index.docbook
@@ -768,10 +760,12 @@ share/kde4/services/bookmarks.protocol
share/kde4/services/bzip.protocol
share/kde4/services/bzip2.protocol
share/kde4/services/cgi.protocol
+share/kde4/services/comicbookthumbnail.desktop
share/kde4/services/componentchooser.desktop
share/kde4/services/cursorthumbnail.desktop
share/kde4/services/desktop.protocol
share/kde4/services/desktopthumbnail.desktop
+share/kde4/services/device_automounter_kcm.desktop
share/kde4/services/directorythumbnail.desktop
share/kde4/services/djvuthumbnail.desktop
share/kde4/services/emoticons.desktop
@@ -787,8 +781,9 @@ share/kde4/services/icons.desktop
share/kde4/services/imagethumbnail.desktop
share/kde4/services/info.protocol
share/kde4/services/jpegthumbnail.desktop
+share/kde4/services/kcm_attica.desktop
share/kde4/services/kcm_kdnssd.desktop
-share/kde4/services/kcm_nepomuk.desktop
+%%NEPOMUK%%share/kde4/services/kcm_nepomuk.desktop
share/kde4/services/kcm_phonon.desktop
share/kde4/services/kcm_phononxine.desktop
share/kde4/services/kcmcgi.desktop
@@ -796,8 +791,10 @@ share/kde4/services/kcmkded.desktop
share/kde4/services/kcmnotify.desktop
share/kde4/services/kcmtrash.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/networkwatcher.desktop
share/kde4/services/kded/phononserver.desktop
share/kde4/services/kded/remotedirnotify.desktop
@@ -816,16 +813,19 @@ share/kde4/services/language.desktop
share/kde4/services/localdomainurifilter.desktop
share/kde4/services/lzma.protocol
share/kde4/services/man.protocol
-share/kde4/services/nepomukfilewatch.desktop
-share/kde4/services/nepomukmigration1.desktop
-share/kde4/services/nepomukontologyloader.desktop
-share/kde4/services/nepomukqueryservice.desktop
-share/kde4/services/nepomuksearch.protocol
-share/kde4/services/nepomukstorage.desktop
-share/kde4/services/nepomukstrigiservice.desktop
+%%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/network.protocol
share/kde4/services/nfs.protocol
share/kde4/services/plasma-scriptengine-applet-simple-javascript.desktop
+share/kde4/services/plasma-scriptengine-dataengine-javascript.desktop
share/kde4/services/plasma-scriptengine-runner-javascript.desktop
share/kde4/services/programs.protocol
share/kde4/services/remote.protocol
@@ -852,6 +852,7 @@ share/kde4/services/searchproviders/dbug.desktop
share/kde4/services/searchproviders/de2en.desktop
share/kde4/services/searchproviders/de2fr.desktop
share/kde4/services/searchproviders/deb.desktop
+share/kde4/services/searchproviders/dictfr.desktop
share/kde4/services/searchproviders/dmoz.desktop
share/kde4/services/searchproviders/docbook.desktop
share/kde4/services/searchproviders/doi.desktop
@@ -925,6 +926,7 @@ share/kde4/services/searchproviders/webster.desktop
share/kde4/services/searchproviders/whatis.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/settings.protocol
share/kde4/services/sftp.protocol
@@ -934,13 +936,221 @@ 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/trash.protocol
+share/kde4/services/windowsexethumbnail.desktop
+share/kde4/services/windowsimagethumbnail.desktop
share/kde4/services/xz.protocol
share/kde4/services/zip.protocol
-share/kde4/servicetypes/nepomukservice.desktop
+%%NEPOMUK%%share/kde4/servicetypes/nepomukservice.desktop
share/kde4/servicetypes/phononbackend.desktop
share/kde4/servicetypes/searchprovider.desktop
share/kde4/servicetypes/thumbcreator.desktop
+share/locale/currency/adf.desktop
+share/locale/currency/adp.desktop
+share/locale/currency/aed.desktop
+share/locale/currency/afa.desktop
+share/locale/currency/afn.desktop
+share/locale/currency/all.desktop
+share/locale/currency/amd.desktop
+share/locale/currency/ang.desktop
+share/locale/currency/aoa.desktop
+share/locale/currency/aon.desktop
+share/locale/currency/ars.desktop
+share/locale/currency/ats.desktop
+share/locale/currency/aud.desktop
+share/locale/currency/awg.desktop
+share/locale/currency/azm.desktop
+share/locale/currency/azn.desktop
+share/locale/currency/bam.desktop
+share/locale/currency/bbd.desktop
+share/locale/currency/bdt.desktop
+share/locale/currency/bef.desktop
+share/locale/currency/bgl.desktop
+share/locale/currency/bgn.desktop
+share/locale/currency/bhd.desktop
+share/locale/currency/bif.desktop
+share/locale/currency/bmd.desktop
+share/locale/currency/bnd.desktop
+share/locale/currency/bob.desktop
+share/locale/currency/bov.desktop
+share/locale/currency/brl.desktop
+share/locale/currency/bsd.desktop
+share/locale/currency/btn.desktop
+share/locale/currency/bwp.desktop
+share/locale/currency/byr.desktop
+share/locale/currency/bzd.desktop
+share/locale/currency/cad.desktop
+share/locale/currency/cdf.desktop
+share/locale/currency/chf.desktop
+share/locale/currency/clf.desktop
+share/locale/currency/clp.desktop
+share/locale/currency/cny.desktop
+share/locale/currency/cop.desktop
+share/locale/currency/cou.desktop
+share/locale/currency/crc.desktop
+share/locale/currency/cuc.desktop
+share/locale/currency/cup.desktop
+share/locale/currency/cve.desktop
+share/locale/currency/cyp.desktop
+share/locale/currency/czk.desktop
+share/locale/currency/dem.desktop
+share/locale/currency/djf.desktop
+share/locale/currency/dkk.desktop
+share/locale/currency/dop.desktop
+share/locale/currency/dzd.desktop
+share/locale/currency/eek.desktop
+share/locale/currency/egp.desktop
+share/locale/currency/ern.desktop
+share/locale/currency/esp.desktop
+share/locale/currency/etb.desktop
+share/locale/currency/eur.desktop
+share/locale/currency/fim.desktop
+share/locale/currency/fjd.desktop
+share/locale/currency/fkp.desktop
+share/locale/currency/frf.desktop
+share/locale/currency/gbp.desktop
+share/locale/currency/gel.desktop
+share/locale/currency/ghc.desktop
+share/locale/currency/ghs.desktop
+share/locale/currency/gip.desktop
+share/locale/currency/gmd.desktop
+share/locale/currency/gnf.desktop
+share/locale/currency/grd.desktop
+share/locale/currency/gtq.desktop
+share/locale/currency/gwp.desktop
+share/locale/currency/gyd.desktop
+share/locale/currency/hkd.desktop
+share/locale/currency/hnl.desktop
+share/locale/currency/hrk.desktop
+share/locale/currency/htg.desktop
+share/locale/currency/huf.desktop
+share/locale/currency/idr.desktop
+share/locale/currency/iep.desktop
+share/locale/currency/ils.desktop
+share/locale/currency/inr.desktop
+share/locale/currency/iqd.desktop
+share/locale/currency/irr.desktop
+share/locale/currency/isk.desktop
+share/locale/currency/itl.desktop
+share/locale/currency/jmd.desktop
+share/locale/currency/jod.desktop
+share/locale/currency/jpy.desktop
+share/locale/currency/kes.desktop
+share/locale/currency/kgs.desktop
+share/locale/currency/khr.desktop
+share/locale/currency/kmf.desktop
+share/locale/currency/kpw.desktop
+share/locale/currency/krw.desktop
+share/locale/currency/kwd.desktop
+share/locale/currency/kyd.desktop
+share/locale/currency/kzt.desktop
+share/locale/currency/lak.desktop
+share/locale/currency/lbp.desktop
+share/locale/currency/lkr.desktop
+share/locale/currency/lrd.desktop
+share/locale/currency/lsl.desktop
+share/locale/currency/ltl.desktop
+share/locale/currency/luf.desktop
+share/locale/currency/lvl.desktop
+share/locale/currency/lyd.desktop
+share/locale/currency/mad.desktop
+share/locale/currency/mdl.desktop
+share/locale/currency/mga.desktop
+share/locale/currency/mgf.desktop
+share/locale/currency/mkd.desktop
+share/locale/currency/mlf.desktop
+share/locale/currency/mmk.desktop
+share/locale/currency/mnt.desktop
+share/locale/currency/mop.desktop
+share/locale/currency/mro.desktop
+share/locale/currency/mtl.desktop
+share/locale/currency/mur.desktop
+share/locale/currency/mvr.desktop
+share/locale/currency/mwk.desktop
+share/locale/currency/mxn.desktop
+share/locale/currency/mxv.desktop
+share/locale/currency/myr.desktop
+share/locale/currency/mzm.desktop
+share/locale/currency/mzn.desktop
+share/locale/currency/nad.desktop
+share/locale/currency/ngn.desktop
+share/locale/currency/nio.desktop
+share/locale/currency/nlg.desktop
+share/locale/currency/nok.desktop
+share/locale/currency/npr.desktop
+share/locale/currency/nzd.desktop
+share/locale/currency/omr.desktop
+share/locale/currency/pab.desktop
+share/locale/currency/pen.desktop
+share/locale/currency/pgk.desktop
+share/locale/currency/php.desktop
+share/locale/currency/pkr.desktop
+share/locale/currency/pln.desktop
+share/locale/currency/pte.desktop
+share/locale/currency/pyg.desktop
+share/locale/currency/qar.desktop
+share/locale/currency/rol.desktop
+share/locale/currency/ron.desktop
+share/locale/currency/rsd.desktop
+share/locale/currency/rub.desktop
+share/locale/currency/rur.desktop
+share/locale/currency/rwf.desktop
+share/locale/currency/sar.desktop
+share/locale/currency/sbd.desktop
+share/locale/currency/scr.desktop
+share/locale/currency/sdd.desktop
+share/locale/currency/sdg.desktop
+share/locale/currency/sek.desktop
+share/locale/currency/sgd.desktop
+share/locale/currency/shp.desktop
+share/locale/currency/sit.desktop
+share/locale/currency/skk.desktop
+share/locale/currency/sll.desktop
+share/locale/currency/sos.desktop
+share/locale/currency/srd.desktop
+share/locale/currency/srg.desktop
+share/locale/currency/std.desktop
+share/locale/currency/svc.desktop
+share/locale/currency/syp.desktop
+share/locale/currency/szl.desktop
+share/locale/currency/thb.desktop
+share/locale/currency/tjs.desktop
+share/locale/currency/tmm.desktop
+share/locale/currency/tmt.desktop
+share/locale/currency/tnd.desktop
+share/locale/currency/top.desktop
+share/locale/currency/tpe.desktop
+share/locale/currency/trl.desktop
+share/locale/currency/try.desktop
+share/locale/currency/ttd.desktop
+share/locale/currency/twd.desktop
+share/locale/currency/tzs.desktop
+share/locale/currency/uah.desktop
+share/locale/currency/ugx.desktop
+share/locale/currency/usd.desktop
+share/locale/currency/usn.desktop
+share/locale/currency/uss.desktop
+share/locale/currency/uyu.desktop
+share/locale/currency/uzs.desktop
+share/locale/currency/veb.desktop
+share/locale/currency/vnd.desktop
+share/locale/currency/vuv.desktop
+share/locale/currency/wst.desktop
+share/locale/currency/xaf.desktop
+share/locale/currency/xag.desktop
+share/locale/currency/xau.desktop
+share/locale/currency/xcd.desktop
+share/locale/currency/xof.desktop
+share/locale/currency/xpd.desktop
+share/locale/currency/xpf.desktop
+share/locale/currency/xpt.desktop
+share/locale/currency/yer.desktop
+share/locale/currency/yum.desktop
+share/locale/currency/zar.desktop
+share/locale/currency/zmk.desktop
+share/locale/currency/zwd.desktop
+share/locale/currency/zwl.desktop
share/locale/en_US/entry.desktop
share/locale/l10n/C/entry.desktop
share/locale/l10n/C/flag.png
@@ -1431,11 +1641,14 @@ 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.afpovertcp.xml
+share/mime/inode/vnd.kde.service.airmouse.xml
share/mime/inode/vnd.kde.service.airport.xml
share/mime/inode/vnd.kde.service.daap.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.http.xml
share/mime/inode/vnd.kde.service.imap.xml
share/mime/inode/vnd.kde.service.ipp.xml
@@ -1443,20 +1656,26 @@ share/mime/inode/vnd.kde.service.kbattleship.xml
share/mime/inode/vnd.kde.service.kfourinline.xml
share/mime/inode/vnd.kde.service.ksirk.xml
share/mime/inode/vnd.kde.service.ldap.xml
+share/mime/inode/vnd.kde.service.libvirt.xml
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.ntp.xml
share/mime/inode/vnd.kde.service.odisk.xml
+share/mime/inode/vnd.kde.service.plasma.xml
share/mime/inode/vnd.kde.service.pop3.xml
share/mime/inode/vnd.kde.service.presence.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
share/mime/inode/vnd.kde.service.raop.xml
share/mime/inode/vnd.kde.service.rdp.xml
+share/mime/inode/vnd.kde.service.realplayfavs.xml
share/mime/inode/vnd.kde.service.rfb.xml
share/mime/inode/vnd.kde.service.rsync.xml
share/mime/inode/vnd.kde.service.sftp-ssh.xml
-share/mime/inode/vnd.kde.service.sftp.xml
+share/mime/inode/vnd.kde.service.sleep-proxy.xml
share/mime/inode/vnd.kde.service.smb.xml
share/mime/inode/vnd.kde.service.ssh.xml
share/mime/inode/vnd.kde.service.svn.xml
@@ -1749,6 +1968,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/locale/l10n/ad
@dirrm share/locale/l10n/C
@dirrm share/locale/l10n
+@dirrm share/locale/currency
@dirrm share/kde4/services/searchproviders
@dirrm share/emoticons/kde4
@dirrm share/doc/HTML/en/network
@@ -1776,51 +1996,50 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/doc/HTML/en/kdesu
@dirrm share/doc/HTML/en/kdebugdialog
@dirrm share/doc/HTML/en/kcontrol/useragent
+@dirrm share/doc/HTML/en/kcontrol/trash
@dirrm share/doc/HTML/en/kcontrol/spellchecking
+@dirrm share/doc/HTML/en/kcontrol/solid-device-automounter
@dirrm share/doc/HTML/en/kcontrol/smb
@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/passwords
-@dirrm share/doc/HTML/en/kcontrol/panelappearance
-@dirrm share/doc/HTML/en/kcontrol/panel
@dirrm share/doc/HTML/en/kcontrol/netpref
-@dirrm share/doc/HTML/en/kcontrol/nepomuk
+%%NEPOMUK%%@dirrm share/doc/HTML/en/kcontrol/nepomuk
@dirrm share/doc/HTML/en/kcontrol/language
-@dirrm share/doc/HTML/en/kcontrol/khtml
-@dirrm share/doc/HTML/en/kcontrol/kdm
-@dirrm share/doc/HTML/en/kcontrol/kcmtaskbar
+@dirrm share/doc/HTML/en/kcontrol/khtml-plugins
+@dirrm share/doc/HTML/en/kcontrol/khtml-java-js
+@dirrm share/doc/HTML/en/kcontrol/khtml-general
+@dirrm share/doc/HTML/en/kcontrol/khtml-behavior
+@dirrm share/doc/HTML/en/kcontrol/khtml-adblock
+@dirrm share/doc/HTML/en/kcontrol/kded
@dirrm share/doc/HTML/en/kcontrol/kcmnotify
@dirrm share/doc/HTML/en/kcontrol/kcmlaunch
-@dirrm share/doc/HTML/en/kcontrol/kcmkonsole
@dirrm share/doc/HTML/en/kcontrol/kcmcss
+@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
-@dirrm share/doc/HTML/en/kcontrol/email
@dirrm share/doc/HTML/en/kcontrol/ebrowsing
-@dirrm share/doc/HTML/en/kcontrol/desktopbehavior
-@dirrm share/doc/HTML/en/kcontrol/desktop
-@dirrm share/doc/HTML/en/kcontrol/crypto
@dirrm share/doc/HTML/en/kcontrol/cookies
+@dirrm share/doc/HTML/en/kcontrol/componentchooser
@dirrm share/doc/HTML/en/kcontrol/cache
@dirrm share/doc/HTML/en/kcontrol/bookmarks
-@dirrm share/doc/HTML/en/kcontrol/background
+@dirrm share/doc/HTML/en/kcontrol/attica
@dirrm share/desktop-directories
@dirrm share/apps/phonon
-@dirrm share/apps/nepomukstrigiservice
-@dirrm share/apps/nepomukstorage
+%%NEPOMUK%%@dirrm share/apps/nepomukstrigiservice
+%%NEPOMUK%%@dirrm share/apps/nepomukstorage
@dirrm share/apps/libphonon
@dirrm share/apps/kwalletd
@dirrm share/apps/ksmserver/windowmanagers
@dirrm share/apps/ksmserver
@dirrm share/apps/konqueror/dirtree/remote
@dirrm share/apps/konqueror/dirtree
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/kio_thumbnail/pics
-@dirrm share/apps/kio_thumbnail
+@dirrmtry share/apps/konqsidebartng/virtual_folders/remote
@dirrm share/apps/kio_info
@dirrm share/apps/kio_finger
@dirrm share/apps/kio_docfilter
@@ -1833,11 +2052,14 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
+@dirrm share/apps/kglobalaccel
@dirrm share/apps/kde
@dirrm share/apps/kcmlocale/pics
@dirrm share/apps/kcmlocale
@dirrm share/apps/kcm_phonon
@dirrm share/apps/drkonqi/pics
+@dirrm share/apps/drkonqi/debuggers/internal
+@dirrm share/apps/drkonqi/debuggers/external
@dirrm share/apps/drkonqi/debuggers
@dirrm share/apps/drkonqi
@dirrm share/apps/desktoptheme/oxygen/widgets
@@ -1845,7 +2067,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/apps/desktoptheme/oxygen/opaque/dialogs
@dirrm share/apps/desktoptheme/oxygen/opaque
@dirrm share/apps/desktoptheme/oxygen/dialogs
-@dirrm share/apps/desktoptheme/oxygen
+@dirrmtry share/apps/desktoptheme/oxygen
@dirrm share/apps/desktoptheme/default/opaque/widgets
@dirrm share/apps/desktoptheme/default/opaque/dialogs
@dirrm share/apps/desktoptheme/default/opaque
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index d39a4c9b849d..2712af2474d6 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase-workspace
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -21,7 +20,8 @@ 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
+ xklavier.12:${PORTSDIR}/x11/libxklavier \
+ gps.19:${PORTSDIR}/astro/gpsd
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 \
@@ -34,8 +34,7 @@ RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
SUB_FILES= kdm
USE_RC_SUBR= kdm4
-USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 oxygen \
- kdeexp
+USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 oxygen
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
@@ -60,10 +59,17 @@ CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
#PyKDE4, Xmms and Googlegadgets could be enabled,
#QEdje has not been ported yet.
-.include <bsd.port.pre.mk>
+OPTIONS= PLASMA_PYTHON "Support for plasmoids written in Python" off \
+ PLASMA_RUBY "Support for plasmoids written in Ruby" off
-.if ${ARCH} == "ia64"
-BROKEN= Segfaults on ia64
+.include <bsd.port.options.mk>
+
+.if defined(WITH_PLASMA_PYTHON)
+RUN_DEPENDS+= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:${PORTSDIR}/x11/plasma-scriptengine-python
+.endif
+
+.if defined(WITH_PLASMA_RUBY)
+RUN_DEPENDS+= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:${PORTSDIR}/x11/plasma-scriptengine-ruby
.endif
.if ${OSVERSION} < 800069
@@ -84,19 +90,16 @@ post-patch:
${CP} ${FILESDIR}/uptime.* ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/
pre-configure:
- ${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|'\
+ ${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\
- laptop/laptopclient.cpp modernsystem/modernsys.cpp\
+.for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp \
+ laptop/laptopclient.cpp modernsystem/modernsys.cpp \
redmond/redmond.cpp
- ${REINPLACE_CMD} -e 's|<qdrawutil.h>|<QtGui/qdrawutil.h>|'\
+ ${REINPLACE_CMD} -e 's|<qdrawutil.h>|<QtGui/qdrawutil.h>|' \
${PATCH_WRKSRC}/kwin/clients/${item}
.endfor
-.if ${OSVERSION} < 900004
- ${REINPLACE_CMD} -e 's|addToUtmp ""|addToUtmp "${LOCALBASE}/lib"|' \
- -e 's|(utempter.h|(${LOCALBASE}/include/utempter.h|' \
- ${PATCH_WRKSRC}/kwrited/CMakeLists.txt
-.endif
post-install:
${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \
@@ -107,4 +110,4 @@ post-install:
@${MV} ${PREFIX}/lib/kde4/libexec/kdm_greet ${PREFIX}/lib/kde4/libexec/kdm-bin_greet
@${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 050113393f27..0f60da74347a 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.3.5.tar.bz2) = a6d2771fcf841e5ca33edf524f60599e
-SHA256 (KDE/kdebase-workspace-4.3.5.tar.bz2) = 7985634ed1f87889bcd6613ef41127196df442017bf895be6fb2afb196ce149b
-SIZE (KDE/kdebase-workspace-4.3.5.tar.bz2) = 62525359
+MD5 (KDE/kdebase-workspace-4.4.3.tar.bz2) = c334e70b425cbae2efc5a7e7dda4365f
+SHA256 (KDE/kdebase-workspace-4.4.3.tar.bz2) = 7f56b2b12f2ca78deea31981bc47de2862d409d99b7bcda90054715d97999239
+SIZE (KDE/kdebase-workspace-4.4.3.tar.bz2) = 77035367
diff --git a/x11/kde4-workspace/files/patch-CVE-2010-0436 b/x11/kde4-workspace/files/patch-CVE-2010-0436
deleted file mode 100644
index bf7c664e3b9c..000000000000
--- a/x11/kde4-workspace/files/patch-CVE-2010-0436
+++ /dev/null
@@ -1,193 +0,0 @@
---- kdm/ConfigureChecks.cmake.orig 2009-05-27 21:53:40.000000000 +0200
-+++ kdm/ConfigureChecks.cmake 2010-04-14 13:39:40.198779887 +0200
-@@ -37,6 +37,35 @@
- }
- " HAVE_SETLOGIN)
-
-+check_c_source_runs("
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <errno.h>
-+int main()
-+{
-+ int fd, fd2;
-+ struct sockaddr_un sa;
-+
-+ if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
-+ return 2;
-+ sa.sun_family = AF_UNIX;
-+ strcpy(sa.sun_path, \"testsock\");
-+ unlink(sa.sun_path);
-+ if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)))
-+ return 2;
-+ chmod(sa.sun_path, 0);
-+ setuid(getuid() + 1000);
-+ if ((fd2 = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
-+ return 2;
-+ connect(fd2, (struct sockaddr *)&sa, sizeof(sa));
-+ return errno != EACCES;
-+}
-+" HONORS_SOCKET_PERMS)
-+
- # for config-kdm.h
- check_function_exists(seteuid HAVE_SETEUID)
-
---- kdm/backend/ctrl.c.orig 2009-03-18 10:59:20.000000000 +0100
-+++ kdm/backend/ctrl.c 2010-04-14 14:08:45.712067919 +0200
-@@ -78,7 +78,25 @@
- }
-
-
-+#ifdef HONORS_SOCKET_PERMS
- static CtrlRec ctrl = { 0, 0, -1, 0 };
-+#else
-+static CtrlRec ctrl = { 0, 0, 0, -1, 0 };
-+
-+static int mkTempDir( char *dir )
-+{
-+ int i, l = strlen( dir ) - 6;
-+
-+ for (i = 0; i < 100; i++) {
-+ randomStr( dir + l );
-+ if (!mkdir( dir, 0700 ))
-+ return True;
-+ if (errno != EEXIST)
-+ break;
-+ }
-+ return False;
-+}
-+#endif
-
- void
- openCtrl( struct display *d )
-@@ -112,22 +130,50 @@
- if (strlen( cr->path ) >= sizeof(sa.sun_path))
- logError( "path %\"s too long; no control sockets will be available\n",
- cr->path );
-- else if (mkdir( sockdir, 0755 ) && errno != EEXIST)
-+#ifdef HONORS_SOCKET_PERMS
-+ else if (mkdir( sockdir, 0700 ) && errno != EEXIST)
- logError( "mkdir %\"s failed; no control sockets will be available\n",
- sockdir );
-+ else if (unlink( cr->path ) && errno != ENOENT)
-+ logError( "unlink %\"s failed: %m; control socket will not be available\n",
-+ cr->path );
- else {
-- if (!d)
-- chown( sockdir, -1, fifoGroup );
-+#else
-+ else if (unlink( sockdir ) && errno != ENOENT)
-+ logError( "unlink %\"s failed: %m; control socket will not be available\n",
-+ sockdir );
-+ else if (!strApp( &cr->realdir, sockdir, "-XXXXXX", (char *)0))
-+ ;
-+ else if (!mkTempDir( cr->realdir )) {
-+ logError( "mkdir %\"s failed: %m; control socket will not be available\n",
-+ cr->realdir );
-+ free( cr->realdir );
-+ cr->realdir = 0;
-+ } else if (symlink( cr->realdir, sockdir )) {
-+ logError( "symlink %\"s => %\"s failed: %m; control socket will not be available\n",
-+ sockdir, cr->realdir );
-+ rmdir( cr->realdir );
-+ free( cr->realdir );
-+ cr->realdir = 0;
-+ } else {
-+ chown( sockdir, 0, d ? 0 : fifoGroup );
- chmod( sockdir, 0750 );
-+#endif
- if ((cr->fd = socket( PF_UNIX, SOCK_STREAM, 0 )) < 0)
- logError( "Cannot create control socket\n" );
- else {
-- unlink( cr->path );
- sa.sun_family = AF_UNIX;
- strcpy( sa.sun_path, cr->path );
- if (!bind( cr->fd, (struct sockaddr *)&sa, sizeof(sa) )) {
- if (!listen( cr->fd, 5 )) {
-+#ifdef HONORS_SOCKET_PERMS
-+ chmod( cr->path, 0660 );
-+ if (!d)
-+ chown( cr->path, -1, fifoGroup );
-+ chmod( sockdir, 0755 );
-+#else
- chmod( cr->path, 0666 );
-+#endif
- registerCloseOnFork( cr->fd );
- registerInput( cr->fd );
- free( sockdir );
-@@ -142,6 +188,14 @@
- close( cr->fd );
- cr->fd = -1;
- }
-+#ifdef HONORS_SOCKET_PERMS
-+ rmdir( sockdir );
-+#else
-+ unlink( sockdir );
-+ rmdir( cr->realdir );
-+ free( cr->realdir );
-+ cr->realdir = 0;
-+#endif
- }
- free( cr->path );
- cr->path = 0;
-@@ -162,7 +216,14 @@
- cr->fd = -1;
- unlink( cr->path );
- *strrchr( cr->path, '/' ) = 0;
-+#ifdef HONORS_SOCKET_PERMS
- rmdir( cr->path );
-+#else
-+ unlink( cr->path );
-+ rmdir( cr->realdir );
-+ free( cr->realdir );
-+ cr->realdir = 0;
-+#endif
- free( cr->path );
- cr->path = 0;
- while (cr->css) {
-@@ -176,12 +237,12 @@
- void
- chownCtrl( CtrlRec *cr, int uid )
- {
-- if (cr->path) {
-- char *ptr = strrchr( cr->path, '/' );
-- *ptr = 0;
-+ if (cr->path)
-+#ifdef HONORS_SOCKET_PERMS
- chown( cr->path, uid, -1 );
-- *ptr = '/';
-- }
-+#else
-+ chown( cr->realdir, uid, -1 );
-+#endif
- }
-
- void
---- kdm/backend/dm.h.orig 2008-11-19 11:18:06.000000000 +0100
-+++ kdm/backend/dm.h 2010-04-14 13:39:40.233775307 +0200
-@@ -232,6 +232,9 @@
- struct cmdsock *css; /* open connections */
-
- char *path; /* filename of the socket */
-+#ifndef HONORS_SOCKET_PERMS
-+ char *realdir; /* real dirname of the socket */
-+#endif
- int fd; /* fd of the socket */
- int gid; /* owner group of the socket */
- } CtrlRec;
---- kdm/config-kdm.h.cmake.orig 2009-05-27 21:53:40.000000000 +0200
-+++ kdm/config-kdm.h.cmake 2010-04-14 13:39:40.250772397 +0200
-@@ -129,6 +129,9 @@
- /* Define to 1 if the ck-connector library is found */
- #cmakedefine HAVE_CKCONNECTOR 1
-
-+/* Define to 1 if OS honors permission bits on socket inodes */
-+#cmakedefine HONORS_SOCKET_PERMS 1
-+
- /* $PATH defaults set by KDM */
- #cmakedefine KDM_DEF_USER_PATH "${KDM_DEF_USER_PATH}"
- #cmakedefine KDM_DEF_SYSTEM_PATH "${KDM_DEF_SYSTEM_PATH}"
diff --git a/x11/kde4-workspace/files/patch-ConfigureChecks.cmake b/x11/kde4-workspace/files/patch-ConfigureChecks.cmake
new file mode 100644
index 000000000000..ed8b60fb95c2
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-ConfigureChecks.cmake
@@ -0,0 +1,20 @@
+--- ./ConfigureChecks.cmake.orig 2009-11-21 12:44:36.000000000 +0300
++++ ./ConfigureChecks.cmake 2010-01-27 00:04:40.445046695 +0300
+@@ -16,16 +16,7 @@
+ endmacro(define_pam_service)
+
+ macro(install_pam_service APP)
+- string(TOUPPER KDE4_${APP}_PAM_SERVICE cvar)
+- install(CODE "
+- set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
+- if (NOT DESTDIR_VALUE)
+- exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS ${${cvar}} RETURN_VALUE ret)
+- if (NOT ret)
+- exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS -P ${${cvar}}-np)
+- endif (NOT ret)
+- endif (NOT DESTDIR_VALUE)
+- ")
++ message("Ignore installing pam service, FreeBSD has it already.")
+ endmacro(install_pam_service)
+
+ define_pam_service(KDM)
diff --git a/x11/kde4-workspace/files/patch-kdm-backend-dm.h b/x11/kde4-workspace/files/patch-kdm-backend-dm.h
deleted file mode 100644
index 3a7191ad9469..000000000000
--- a/x11/kde4-workspace/files/patch-kdm-backend-dm.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- kdm/backend/dm.h
-+++ kdm/backend/dm.h
-@@ -102,7 +102,6 @@
- # define Jmp_buf sigjmp_buf
- #endif
-
--#include <utmp.h>
- #ifdef HAVE_UTMPX
- # include <utmpx.h>
- # define STRUCTUTMP struct utmpx
-@@ -113,15 +112,16 @@
- # define ENDUTENT endutxent
- # define ut_time ut_tv.tv_sec
- #else
-+# include <utmp.h>
- # define STRUCTUTMP struct utmp
- # define UTMPNAME utmpname
- # define SETUTENT setutent
- # define GETUTENT getutent
- # define PUTUTLINE pututline
- # define ENDUTENT endutent
--#endif
--#ifndef HAVE_STRUCT_UTMP_UT_USER
--# define ut_user ut_name
-+# ifndef HAVE_STRUCT_UTMP_UT_USER
-+# define ut_user ut_name
-+# endif
- #endif
- #ifndef WTMP_FILE
- # ifdef _PATH_WTMPX
diff --git a/x11/kde4-workspace/files/patch-kdm-backend-sessreg.c b/x11/kde4-workspace/files/patch-kdm-backend-sessreg.c
deleted file mode 100644
index 5763008b2fbd..000000000000
--- a/x11/kde4-workspace/files/patch-kdm-backend-sessreg.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- kdm/backend/sessreg.c
-+++ kdm/backend/sessreg.c
-@@ -43,6 +43,13 @@
- # define NO_LASTLOG
- #endif
-
-+#ifdef __FreeBSD__
-+# include <sys/param.h>
-+# if __FreeBSD_version >= 900007
-+# define NO_LASTLOG
-+# endif
-+#endif
-+
- #ifndef NO_LASTLOG
- # ifdef HAVE_LASTLOG_H
- # include <lastlog.h>
-@@ -257,7 +264,6 @@
- close( utmp );
- }
- # else
-- UTMPNAME( UTMP_FILE );
- SETUTENT();
- PUTUTLINE( &ut_ent );
- ENDUTENT();
diff --git a/x11/kde4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp b/x11/kde4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp
deleted file mode 100644
index ec72475697a8..000000000000
--- a/x11/kde4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- ksplash/ksplashx/qpngio.cpp.orig 2008-01-05 00:55:38.000000000 +0100
-+++ ksplash/ksplashx/qpngio.cpp 2010-03-29 07:49:55.000000000 +0200
-@@ -151,7 +151,7 @@
- image.setColor( i, qRgba(c,c,c,0xff) );
- }
- if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
-- const int g = info_ptr->trans_values.gray;
-+ const int g = info_ptr->trans_color.gray;
- if (g < ncols) {
- image.setAlphaBuffer(true);
- image.setColor(g, image.color(g) & RGB_MASK);
-@@ -179,7 +179,7 @@
- info_ptr->palette[i].red,
- info_ptr->palette[i].green,
- info_ptr->palette[i].blue,
-- info_ptr->trans[i]
-+ info_ptr->trans_alpha[i]
- )
- );
- i++;
-@@ -307,9 +307,9 @@
- png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
- if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
- QRgb trans = 0xFF000000 | qRgb(
-- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
-- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
-- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
-+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
-+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
-+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
- for (uint y=0; y<height; y++) {
- for (uint x=0; x<info_ptr->width; x++) {
- if (((uint**)jt)[y][x] == trans) {
diff --git a/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt b/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
deleted file mode 100644
index d9b0efedd656..000000000000
--- a/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libs/ksysguard/processui/CMakeLists.txt.orig 2008-06-18 16:41:37.000000000 +0400
-+++ ./libs/ksysguard/processui/CMakeLists.txt 2008-06-28 13:56:54.000000000 +0400
-@@ -1,7 +1,7 @@
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../ ../processcore/)
-
--check_include_files(sys/ptrace.h HAVE_SYS_PTRACE_H)
-+check_include_files(signal.h HAVE_SYS_PTRACE_H)
- check_include_files(sys/endian.h HAVE_SYS_ENDIAN_H)
- check_include_files(byteswap.h HAVE_BYTESWAP_H)
-
diff --git a/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt b/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt
new file mode 100644
index 000000000000..158e9658b879
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt
@@ -0,0 +1,7 @@
+--- ./plasma/generic/scriptengines/CMakeLists.txt.orig 2009-09-16 15:41:05.000000000 +0400
++++ ./plasma/generic/scriptengines/CMakeLists.txt 2010-03-30 20:50:22.446950772 +0400
+@@ -1,4 +1,3 @@
+-add_subdirectory(ruby)
+
+ if(QT_QTWEBKIT_FOUND)
+ add_subdirectory(webkit)
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index e5cc8d272565..4de869873e21 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -30,17 +30,20 @@ bin/kwin_killer_helper
bin/kwin_rules_dialog
bin/kxkb
bin/plasma-desktop
+bin/plasma-netbook
bin/plasma-overlay
bin/plasmaengineexplorer
bin/plasmawallpaperviewer
bin/plasmoidviewer
bin/polkit-kde-authorization
bin/safestartkde
-bin/setscheduler
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.ksysguard.processlisthelper.conf
etc/ksysguarddrc
include/KDE/Plasma/Weather/Ion
include/KDE/Plasma/Weather/WeatherUtils
@@ -61,10 +64,10 @@ include/ksgrd/SensorClient.h
include/ksgrd/SensorManager.h
include/ksgrd/SensorShellAgent.h
include/ksgrd/SensorSocketAgent.h
-include/ksysguard/DisplayProcessDlg.h
include/ksysguard/KTextEditVT.h
include/ksysguard/ProcessFilter.h
include/ksysguard/ProcessModel.h
+include/ksysguard/ksignalplotter.h
include/ksysguard/ksysguardprocesslist.h
include/ksysguard/lsof.h
include/ksysguard/process.h
@@ -79,13 +82,6 @@ include/kwinxrenderutils.h
include/kworkspace/kdisplaymanager.h
include/kworkspace/kwindowlistmenu.h
include/kworkspace/kworkspace.h
-include/nepomuk/nepomukquery_export.h
-include/nepomuk/nepomukqueryclient_export.h
-include/nepomuk/query.h
-include/nepomuk/queryparser.h
-include/nepomuk/queryserviceclient.h
-include/nepomuk/result.h
-include/nepomuk/term.h
include/plasma/geolocation/geolocation_export.h
include/plasma/geolocation/geolocationprovider.h
include/plasma/weather/ion.h
@@ -110,6 +106,8 @@ include/solid/control/ifaces/networkinterface.h
include/solid/control/ifaces/networkmanager.h
include/solid/control/ifaces/networkserialinterface.h
include/solid/control/ifaces/powermanager.h
+include/solid/control/ifaces/remotecontrol.h
+include/solid/control/ifaces/remotecontrolmanager.h
include/solid/control/ifaces/wirednetworkinterface.h
include/solid/control/ifaces/wirelessaccesspoint.h
include/solid/control/ifaces/wirelessnetworkinterface.h
@@ -121,6 +119,9 @@ include/solid/control/networkipv4config.h
include/solid/control/networkmanager.h
include/solid/control/networkserialinterface.h
include/solid/control/powermanager.h
+include/solid/control/remotecontrol.h
+include/solid/control/remotecontrolbutton.h
+include/solid/control/remotecontrolmanager.h
include/solid/control/singletondefs.h
include/solid/control/solid_control_export.h
include/solid/control/wirednetworkinterface.h
@@ -132,7 +133,6 @@ include/systemsettingsview/MenuItem.h
include/systemsettingsview/MenuModel.h
include/systemsettingsview/MenuProxyModel.h
include/systemsettingsview/ModuleView.h
-include/systemsettingsview/ToolTipManager.h
include/systemsettingsview/systemsettingsview_export.h
include/taskmanager/abstractgroupableitem.h
include/taskmanager/abstractgroupingstrategy.h
@@ -151,6 +151,7 @@ lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets-%%KDE4_BUILD_TYPE%%.cmake
lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets.cmake
lib/kconf_update_bin/krdb_clearlibrarypath
lib/kconf_update_bin/kwin_update_default_rules
+lib/kconf_update_bin/kwin_update_tabbox_settings
lib/kconf_update_bin/kwin_update_window_settings
lib/kconf_update_bin/plasma-add-shortcut-to-menu
lib/kconf_update_bin/plasma-to-plasma-desktop
@@ -160,6 +161,7 @@ lib/kde4/icon_mode.so
lib/kde4/ion_bbcukmet.so
lib/kde4/ion_envcan.so
lib/kde4/ion_noaa.so
+lib/kde4/ion_wettercom.so
lib/kde4/kcm_access.so
lib/kde4/kcm_autostart.so
lib/kde4/kcm_bell.so
@@ -167,7 +169,6 @@ lib/kde4/kcm_clock.so
lib/kde4/kcm_colors.so
lib/kde4/kcm_desktopthemedetails.so
lib/kde4/kcm_display.so
-lib/kde4/kcm_energy.so
lib/kde4/kcm_fontinst.so
lib/kde4/kcm_fonts.so
lib/kde4/kcm_hotkeys.so
@@ -176,6 +177,7 @@ 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
lib/kde4/kcm_kwin4_effect_builtins.so
lib/kde4/kcm_kwincompositing.so
@@ -184,6 +186,7 @@ lib/kde4/kcm_kwindesktop.so
lib/kde4/kcm_kwinoptions.so
lib/kde4/kcm_kwinrules.so
lib/kde4/kcm_kwinscreenedges.so
+lib/kde4/kcm_kwintabbox.so
lib/kde4/kcm_launch.so
lib/kde4/kcm_pkk_authorization.so
lib/kde4/kcm_powerdevilconfig.so
@@ -194,12 +197,14 @@ 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_workspaceoptions.so
lib/kde4/kcm_xinerama.so
lib/kde4/kded_kephal.so
lib/kde4/kded_khotkeys.so
lib/kde4/kded_kwrited.so
-lib/kde4/kded_notificationitemwatcher.so
lib/kde4/kded_powerdevil.so
+lib/kde4/kded_randrmonitor.so
+lib/kde4/kded_statusnotifierwatcher.so
lib/kde4/kfontviewpart.so
lib/kde4/kgreet_classic.so
lib/kde4/kgreet_generic.so
@@ -207,52 +212,63 @@ lib/kde4/kgreet_winbind.so
lib/kde4/kio_fonts.so
lib/kde4/krunner_bookmarksrunner.so
lib/kde4/krunner_calculatorrunner.so
+lib/kde4/krunner_kill.so
lib/kde4/krunner_locations.so
lib/kde4/krunner_nepomuksearchrunner.so
lib/kde4/krunner_placesrunner.so
+lib/kde4/krunner_plasma-desktop.so
lib/kde4/krunner_powerdevil.so
lib/kde4/krunner_recentdocuments.so
lib/kde4/krunner_services.so
lib/kde4/krunner_sessions.so
lib/kde4/krunner_shell.so
+lib/kde4/krunner_solid.so
lib/kde4/krunner_webshortcuts.so
+lib/kde4/krunner_windows.so
lib/kde4/kstyle_keramik_config.so
+lib/kde4/kwin3_aurorae.so
lib/kde4/kwin3_b2.so
lib/kde4/kwin3_kde2.so
lib/kde4/kwin3_keramik.so
lib/kde4/kwin3_laptop.so
lib/kde4/kwin3_modernsys.so
lib/kde4/kwin3_oxygen.so
-lib/kde4/kwin3_ozone.so
lib/kde4/kwin3_plastik.so
lib/kde4/kwin3_quartz.so
lib/kde4/kwin3_redmond.so
+lib/kde4/kwin3_tabstrip.so
lib/kde4/kwin3_web.so
lib/kde4/kwin4_effect_builtins.so
+lib/kde4/kwin_aurorae_config.so
lib/kde4/kwin_b2_config.so
lib/kde4/kwin_kde2_config.so
lib/kde4/kwin_keramik_config.so
lib/kde4/kwin_modernsys_config.so
lib/kde4/kwin_oxygen_config.so
-lib/kde4/kwin_ozone_config.so
lib/kde4/kwin_plastik_config.so
lib/kde4/kwin_quartz_config.so
+lib/kde4/kwin_tabstrip_config.so
+lib/kde4/libexec/fontinst
+lib/kde4/libexec/fontinst_helper
+lib/kde4/libexec/fontinst_x11
lib/kde4/libexec/kcheckpass
lib/kde4/libexec/kcmdatetimehelper
lib/kde4/libexec/kdm-bin_config
lib/kde4/libexec/kdm-bin_greet
lib/kde4/libexec/kfontprint
-lib/kde4/libexec/kio_fonts_helper
lib/kde4/libexec/krootimage
lib/kde4/libexec/kscreenlocker
+lib/kde4/libexec/ksysguardprocesslist_helper
lib/kde4/libexec/polkit-kde-manager
lib/kde4/libexec/test_kcm_xinerama
+lib/kde4/plasma-geolocation-gps.so
lib/kde4/plasma-geolocation-ip.so
lib/kde4/plasma_animator_default.so
lib/kde4/plasma_applet_activitybar.so
lib/kde4/plasma_applet_battery.so
lib/kde4/plasma_applet_calendar.so
lib/kde4/plasma_applet_clock.so
+lib/kde4/plasma_applet_currentappcontrol.so
lib/kde4/plasma_applet_devicenotifier.so
lib/kde4/plasma_applet_dig_clock.so
lib/kde4/plasma_applet_icon.so
@@ -261,6 +277,7 @@ lib/kde4/plasma_applet_lockout.so
lib/kde4/plasma_applet_pager.so
lib/kde4/plasma_applet_panelspacer_internal.so
lib/kde4/plasma_applet_quicklaunch.so
+lib/kde4/plasma_applet_searchbox.so
lib/kde4/plasma_applet_simplelauncher.so
lib/kde4/plasma_applet_sm_cpu.so
lib/kde4/plasma_applet_sm_hdd.so
@@ -273,13 +290,25 @@ lib/kde4/plasma_applet_systemtray.so
lib/kde4/plasma_applet_tasks.so
lib/kde4/plasma_applet_trash.so
lib/kde4/plasma_applet_webbrowser.so
+lib/kde4/plasma_applet_windowlist.so
lib/kde4/plasma_appletscriptengine_dashboard.so
lib/kde4/plasma_appletscriptengine_webapplet.so
lib/kde4/plasma_containment_desktop.so
+lib/kde4/plasma_containment_netpanel.so
+lib/kde4/plasma_containment_newspaper.so
lib/kde4/plasma_containment_panel.so
+lib/kde4/plasma_containment_sal.so
lib/kde4/plasma_containment_saverdesktop.so
+lib/kde4/plasma_containmentactions_applauncher.so
+lib/kde4/plasma_containmentactions_contextmenu.so
+lib/kde4/plasma_containmentactions_minimalcontextmenu.so
+lib/kde4/plasma_containmentactions_paste.so
+lib/kde4/plasma_containmentactions_switchactivity.so
+lib/kde4/plasma_containmentactions_switchdesktop.so
+lib/kde4/plasma_containmentactions_switchwindow.so
lib/kde4/plasma_engine_akonadi.so
lib/kde4/plasma_engine_applicationjobs.so
+lib/kde4/plasma_engine_apps.so
lib/kde4/plasma_engine_calendar.so
lib/kde4/plasma_engine_dict.so
lib/kde4/plasma_engine_executable.so
@@ -296,6 +325,7 @@ lib/kde4/plasma_engine_nowplaying.so
lib/kde4/plasma_engine_places.so
lib/kde4/plasma_engine_powermanagement.so
lib/kde4/plasma_engine_rss.so
+lib/kde4/plasma_engine_searchlaunch.so
lib/kde4/plasma_engine_soliddevice.so
lib/kde4/plasma_engine_systemmonitor.so
lib/kde4/plasma_engine_tasks.so
@@ -305,9 +335,12 @@ lib/kde4/plasma_packagestructure_dashboard.so
lib/kde4/plasma_packagestructure_web.so
lib/kde4/plasma_wallpaper_color.so
lib/kde4/plasma_wallpaper_image.so
+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/solid_fakenet.so
+lib/kde4/solid_lirc.so
lib/kde4/solid_wicd.so
lib/libkdecorations.so
lib/libkdecorations.so.5
@@ -324,6 +357,7 @@ 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/libkephal.so
lib/libkephal.so.5
lib/libkephal.so.5.0.1
@@ -342,6 +376,9 @@ lib/libkscreensaver.so.5.0.0
lib/libksgrd.so
lib/libksgrd.so.5
lib/libksgrd.so.5.0.1
+lib/libksignalplotter.so
+lib/libksignalplotter.so.5
+lib/libksignalplotter.so.5.0.1
lib/libkwineffects.so
lib/libkwineffects.so.1
lib/libkwineffects.so.1.0.0
@@ -354,12 +391,6 @@ lib/libkworkspace.so.5.0.1
lib/liblsofui.so
lib/liblsofui.so.5
lib/liblsofui.so.5.0.1
-lib/libnepomukquery.so
-lib/libnepomukquery.so.5
-lib/libnepomukquery.so.5.0.1
-lib/libnepomukqueryclient.so
-lib/libnepomukqueryclient.so.5
-lib/libnepomukqueryclient.so.5.0.1
lib/libplasma-geolocation-interface.so
lib/libplasma-geolocation-interface.so.5
lib/libplasma-geolocation-interface.so.5.0.1
@@ -369,6 +400,9 @@ lib/libplasma_applet-system-monitor.so.5.0.1
lib/libplasmaclock.so
lib/libplasmaclock.so.5
lib/libplasmaclock.so.5.0.1
+lib/libplasmagenericshell.so
+lib/libplasmagenericshell.so.5
+lib/libplasmagenericshell.so.5.0.1
lib/libpolkitkdeprivate.so
lib/libpolkitkdeprivate.so.5
lib/libpolkitkdeprivate.so.5.0.1
@@ -385,16 +419,17 @@ lib/libsolidcontrolifaces.so
lib/libsolidcontrolifaces.so.5
lib/libsolidcontrolifaces.so.5.0.1
lib/libsystemsettingsview.so
+lib/libsystemsettingsview.so.1
lib/libtaskmanager.so
lib/libtaskmanager.so.5
lib/libtaskmanager.so.5.0.1
-lib/libtime_solar.so
-lib/libtime_solar.so.5
-lib/libtime_solar.so.5.0.1
lib/libweather_ion.so
lib/libweather_ion.so.5
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.ksysguard.processlisthelper.policy
share/applications/kde4/kfontview.desktop
share/applications/kde4/klipper.desktop
share/applications/kde4/kmenuedit.desktop
@@ -407,7 +442,6 @@ share/apps/cmake/modules/FindGooglegadgets.cmake
share/apps/cmake/modules/FindKephal.cmake
share/apps/cmake/modules/FindLibXKlavier.cmake
share/apps/cmake/modules/FindPAM.cmake
-share/apps/cmake/modules/FindPolkitQt.cmake
share/apps/cmake/modules/FindQEdje.cmake
share/apps/cmake/modules/FindSensors.cmake
share/apps/cmake/modules/PkgConfigGetVar.cmake
@@ -416,14 +450,21 @@ share/apps/color-schemes/Honeycomb.colors
share/apps/color-schemes/Norway.colors
share/apps/color-schemes/ObsidianCoast.colors
share/apps/color-schemes/Oxygen.colors
+share/apps/color-schemes/OxygenCold.colors
share/apps/color-schemes/Steel.colors
share/apps/color-schemes/WontonSoup.colors
+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/kaccess/kaccess.notifyrc
+share/apps/katepart/syntax/plasma-desktop-js.xml
share/apps/kcminput/cursor_large_black.pcf.gz
share/apps/kcminput/cursor_large_white.pcf.gz
share/apps/kcminput/cursor_small_white.pcf.gz
@@ -452,6 +493,7 @@ share/apps/kconf_update/kwin_focus2.sh
share/apps/kconf_update/kwin_focus2.upd
share/apps/kconf_update/kwin_fsp_workarounds_1.upd
share/apps/kconf_update/kwin_on_off.upd
+share/apps/kconf_update/kwin_update_tabbox_settings.upd
share/apps/kconf_update/kwin_window_shortcuts.sh
share/apps/kconf_update/kwin_window_shortcuts.upd
share/apps/kconf_update/kwiniconify.upd
@@ -566,7 +608,7 @@ 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/1280x800.jpg
+share/apps/kdm/themes/oxygen-air/1920x1200.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
@@ -614,6 +656,7 @@ share/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new.png
share/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new_sep.png
share/apps/kmenuedit/kmenueditui.rc
share/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+share/apps/kscreenlocker/kscreenlocker.notifyrc
share/apps/ksplash/Themes/Default/1024x768/background.png
share/apps/ksplash/Themes/Default/1280x1024/background.png
share/apps/ksplash/Themes/Default/1600x1200/background.png
@@ -643,6 +686,7 @@ 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/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
@@ -667,6 +711,8 @@ share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.png
share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
+share/apps/kwin/DefaultTabBoxLayouts.xml
+share/apps/kwin/aurorae.desktop
share/apps/kwin/b2.desktop
share/apps/kwin/circle-edgy.png
share/apps/kwin/circle.png
@@ -689,7 +735,6 @@ share/apps/kwin/lookingglass.frag
share/apps/kwin/lookingglass.vert
share/apps/kwin/modernsystem.desktop
share/apps/kwin/oxygenclient.desktop
-share/apps/kwin/ozoneclient.desktop
share/apps/kwin/plastik.desktop
share/apps/kwin/quartz.desktop
share/apps/kwin/redmond.desktop
@@ -700,9 +745,12 @@ share/apps/kwin/snow.frag
share/apps/kwin/snow.vert
share/apps/kwin/snowflake.png
share/apps/kwin/sphere.vert
+share/apps/kwin/tabstrip.desktop
share/apps/kwin/trackmouse.png
share/apps/kwin/web.desktop
share/apps/kwrited/kwrited.notifyrc
+share/apps/plasma-desktop/plasma-desktop.notifyrc
+share/apps/plasma-netbook/plasma-default-layoutrc
share/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
share/apps/plasma/dashboard/AppleClasses/AppleButton.js
share/apps/plasma/dashboard/AppleClasses/AppleInfoButton.js
@@ -711,12 +759,12 @@ share/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js
share/apps/plasma/dashboard/AppleClasses/AppleSlider.js
share/apps/plasma/dashboard/button/genericButton.js
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/tasks.operations
-share/apps/plasma_scriptengine_ruby/applet.rb
-share/apps/plasma_scriptengine_ruby/data_engine.rb
share/apps/powerdevil/default.powerdevilprofiles
share/apps/powerdevil/powerdevil.notifyrc
share/apps/solid/actions/test-predicate-openinwindow.desktop
@@ -734,6 +782,7 @@ share/apps/solid/devices/solid-device-OpticalDrive.desktop
share/apps/solid/devices/solid-device-PortableMediaPlayer.desktop
share/apps/solid/devices/solid-device-Processor.desktop
share/apps/solid/devices/solid-device-SerialInterface.desktop
+share/apps/solid/devices/solid-device-SmartCardReader.desktop
share/apps/solid/devices/solid-device-StorageAccess.desktop
share/apps/solid/devices/solid-device-StorageDrive.desktop
share/apps/solid/devices/solid-device-StorageVolume.desktop
@@ -741,6 +790,7 @@ share/apps/solid/devices/solid-device-Video.desktop
share/apps/solidfakenetbackend/fakenetworking.xml
share/apps/systemsettings/classic/main.html
share/apps/systemsettings/classic/systemsettings-classic.css
+share/apps/systemsettings/systemsettings.kcfg
share/apps/systemsettings/systemsettingsui.rc
share/autostart/klipper.desktop
share/autostart/krunner.desktop
@@ -750,6 +800,7 @@ share/config.kcfg/klaunch.kcfg
share/config.kcfg/kscreensaversettings.kcfg
share/config.kcfg/kwin.kcfg
share/config.kcfg/plasma-shell-desktop.kcfg
+share/config/aurorae.knsrc
share/config/background.knsrc
share/config/colorschemes.knsrc
share/config/kdm.knsrc
@@ -767,7 +818,11 @@ share/dbus-1/interfaces/org.kde.krunner.App.xml
share/dbus-1/interfaces/org.kde.screensaver.xml
share/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
share/dbus-1/services/org.kde.PolicyKit.service
+share/dbus-1/services/org.kde.fontinst.service
share/dbus-1/services/org.kde.krunner.service
+share/dbus-1/system-services/org.kde.fontinst.service
+share/dbus-1/system-services/org.kde.kcontrol.kcmclock.service
+share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
share/doc/HTML/en/PolicyKit-kde/authdialog_1.png
share/doc/HTML/en/PolicyKit-kde/authdialog_2.png
share/doc/HTML/en/PolicyKit-kde/authdialog_3.png
@@ -795,14 +850,14 @@ share/doc/HTML/en/kcontrol/clock/index.docbook
share/doc/HTML/en/kcontrol/colors/common
share/doc/HTML/en/kcontrol/colors/index.cache.bz2
share/doc/HTML/en/kcontrol/colors/index.docbook
+share/doc/HTML/en/kcontrol/desktop/common
+share/doc/HTML/en/kcontrol/desktop/index.cache.bz2
+share/doc/HTML/en/kcontrol/desktop/index.docbook
+share/doc/HTML/en/kcontrol/desktopthemedetails/clicking-apply.png
share/doc/HTML/en/kcontrol/desktopthemedetails/common
-share/doc/HTML/en/kcontrol/desktopthemedetails/desktop-settings.png
+share/doc/HTML/en/kcontrol/desktopthemedetails/customizing.png
share/doc/HTML/en/kcontrol/desktopthemedetails/index.cache.bz2
share/doc/HTML/en/kcontrol/desktopthemedetails/index.docbook
-share/doc/HTML/en/kcontrol/desktopthemedetails/message.png
-share/doc/HTML/en/kcontrol/energy/common
-share/doc/HTML/en/kcontrol/energy/index.cache.bz2
-share/doc/HTML/en/kcontrol/energy/index.docbook
share/doc/HTML/en/kcontrol/fontinst/common
share/doc/HTML/en/kcontrol/fontinst/index.cache.bz2
share/doc/HTML/en/kcontrol/fontinst/index.docbook
@@ -843,6 +898,12 @@ share/doc/HTML/en/kcontrol/kwindecoration/common
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
+share/doc/HTML/en/kcontrol/kwinscreenedges/common
+share/doc/HTML/en/kcontrol/kwinscreenedges/index.cache.bz2
+share/doc/HTML/en/kcontrol/kwinscreenedges/index.docbook
+share/doc/HTML/en/kcontrol/kwintabbox/common
+share/doc/HTML/en/kcontrol/kwintabbox/index.cache.bz2
+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
@@ -858,6 +919,9 @@ share/doc/HTML/en/kcontrol/solid-actions/edit-action.png
share/doc/HTML/en/kcontrol/solid-actions/index.cache.bz2
share/doc/HTML/en/kcontrol/solid-actions/index.docbook
share/doc/HTML/en/kcontrol/solid-actions/main.png
+share/doc/HTML/en/kcontrol/solid-hardware/common
+share/doc/HTML/en/kcontrol/solid-hardware/index.cache.bz2
+share/doc/HTML/en/kcontrol/solid-hardware/index.docbook
share/doc/HTML/en/kcontrol/splashscreen/common
share/doc/HTML/en/kcontrol/splashscreen/get-new-theme.png
share/doc/HTML/en/kcontrol/splashscreen/index.cache.bz2
@@ -869,6 +933,9 @@ share/doc/HTML/en/kcontrol/windowbehaviour/index.docbook
share/doc/HTML/en/kcontrol/windowspecific/common
share/doc/HTML/en/kcontrol/windowspecific/index.cache.bz2
share/doc/HTML/en/kcontrol/windowspecific/index.docbook
+share/doc/HTML/en/kcontrol/workspaceoptions/common
+share/doc/HTML/en/kcontrol/workspaceoptions/index.cache.bz2
+share/doc/HTML/en/kcontrol/workspaceoptions/index.docbook
share/doc/HTML/en/kdm/common
share/doc/HTML/en/kdm/index.cache.bz2
share/doc/HTML/en/kdm/index.docbook
@@ -894,11 +961,11 @@ 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/common
-share/doc/HTML/en/plasma/favorite-widgets.png
-share/doc/HTML/en/plasma/index.cache.bz2
-share/doc/HTML/en/plasma/index.docbook
-share/doc/HTML/en/plasma/taskbar-settings.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
share/doc/HTML/en/systemsettings/common
share/doc/HTML/en/systemsettings/index.cache.bz2
share/doc/HTML/en/systemsettings/index.docbook
@@ -1699,7 +1766,6 @@ share/kde4/services/colors.desktop
share/kde4/services/desktop.desktop
share/kde4/services/desktopthemedetails.desktop
share/kde4/services/display.desktop
-share/kde4/services/energy.desktop
share/kde4/services/fontinst.desktop
share/kde4/services/fonts.desktop
share/kde4/services/fonts.protocol
@@ -1707,6 +1773,7 @@ share/kde4/services/fontthumbnail.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/kaccess.desktop
share/kde4/services/kcm_keyboard.desktop
share/kde4/services/kcm_pkk_authorization.desktop
@@ -1717,8 +1784,9 @@ share/kde4/services/kcmsmserver.desktop
share/kde4/services/kded/kephal.desktop
share/kde4/services/kded/khotkeys.desktop
share/kde4/services/kded/kwrited.desktop
-share/kde4/services/kded/notificationitemwatcher.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
@@ -1762,6 +1830,7 @@ share/kde4/services/kwin/mousemark.desktop
share/kde4/services/kwin/mousemark_config.desktop
share/kde4/services/kwin/presentwindows.desktop
share/kde4/services/kwin/presentwindows_config.desktop
+share/kde4/services/kwin/resize.desktop
share/kde4/services/kwin/scalein.desktop
share/kde4/services/kwin/shadow.desktop
share/kde4/services/kwin/shadow_config.desktop
@@ -1773,6 +1842,7 @@ share/kde4/services/kwin/showfps_config.desktop
share/kde4/services/kwin/showpaint.desktop
share/kde4/services/kwin/slide.desktop
share/kde4/services/kwin/slideback.desktop
+share/kde4/services/kwin/slidingpopups.desktop
share/kde4/services/kwin/snaphelper.desktop
share/kde4/services/kwin/snow.desktop
share/kde4/services/kwin/snow_config.desktop
@@ -1796,11 +1866,13 @@ share/kde4/services/kwinmoving.desktop
share/kde4/services/kwinoptions.desktop
share/kde4/services/kwinrules.desktop
share/kde4/services/kwinscreenedges.desktop
+share/kde4/services/kwintabbox.desktop
share/kde4/services/mouse.desktop
share/kde4/services/plasma-animator-default.desktop
share/kde4/services/plasma-applet-activitybar.desktop
share/kde4/services/plasma-applet-analogclock.desktop
share/kde4/services/plasma-applet-calendar.desktop
+share/kde4/services/plasma-applet-currentappcontrol.desktop
share/kde4/services/plasma-applet-devicenotifier.desktop
share/kde4/services/plasma-applet-digitalclock.desktop
share/kde4/services/plasma-applet-icon.desktop
@@ -1808,6 +1880,7 @@ share/kde4/services/plasma-applet-launcher.desktop
share/kde4/services/plasma-applet-lockout.desktop
share/kde4/services/plasma-applet-panelspacer-internal.desktop
share/kde4/services/plasma-applet-quicklaunch.desktop
+share/kde4/services/plasma-applet-searchbox.desktop
share/kde4/services/plasma-applet-simplelauncher.desktop
share/kde4/services/plasma-applet-sm_cpu.desktop
share/kde4/services/plasma-applet-sm_hdd.desktop
@@ -1819,11 +1892,23 @@ share/kde4/services/plasma-applet-system-monitor.desktop
share/kde4/services/plasma-applet-systemtray.desktop
share/kde4/services/plasma-applet-trash.desktop
share/kde4/services/plasma-applet-webbrowser.desktop
+share/kde4/services/plasma-applet-windowlist.desktop
share/kde4/services/plasma-battery-default.desktop
share/kde4/services/plasma-containment-desktop.desktop
+share/kde4/services/plasma-containment-netpanel.desktop
+share/kde4/services/plasma-containment-newspaper.desktop
share/kde4/services/plasma-containment-panel.desktop
+share/kde4/services/plasma-containment-sal.desktop
share/kde4/services/plasma-containment-saverdesktop.desktop
+share/kde4/services/plasma-containmentactions-applauncher.desktop
+share/kde4/services/plasma-containmentactions-contextmenu.desktop
+share/kde4/services/plasma-containmentactions-minimalcontextmenu.desktop
+share/kde4/services/plasma-containmentactions-paste.desktop
+share/kde4/services/plasma-containmentactions-switchactivity.desktop
+share/kde4/services/plasma-containmentactions-switchdesktop.desktop
+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-dict.desktop
share/kde4/services/plasma-dataengine-executable.desktop
@@ -1846,24 +1931,39 @@ share/kde4/services/plasma-dataengine-time.desktop
share/kde4/services/plasma-dataengine-weather.desktop
share/kde4/services/plasma-engine-akonadi.desktop
share/kde4/services/plasma-engine-metadata.desktop
+share/kde4/services/plasma-engine-searchlaunch.desktop
+share/kde4/services/plasma-geolocation-gps.desktop
share/kde4/services/plasma-geolocation-ip.desktop
share/kde4/services/plasma-packagestructure-dashboard.desktop
share/kde4/services/plasma-packagestructure-web.desktop
share/kde4/services/plasma-pager-default.desktop
share/kde4/services/plasma-runner-bookmarks.desktop
share/kde4/services/plasma-runner-calculator.desktop
+share/kde4/services/plasma-runner-kill.desktop
+share/kde4/services/plasma-runner-kill_config.desktop
share/kde4/services/plasma-runner-locations.desktop
share/kde4/services/plasma-runner-nepomuksearch.desktop
share/kde4/services/plasma-runner-places.desktop
+share/kde4/services/plasma-runner-plasma-desktop.desktop
share/kde4/services/plasma-runner-powerdevil.desktop
share/kde4/services/plasma-runner-services.desktop
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-windows.desktop
+share/kde4/services/plasma-sal-bookmarks.desktop
+share/kde4/services/plasma-sal-contacts.desktop
+share/kde4/services/plasma-sal-education.desktop
+share/kde4/services/plasma-sal-games.desktop
+share/kde4/services/plasma-sal-graphics.desktop
+share/kde4/services/plasma-sal-internet.desktop
+share/kde4/services/plasma-sal-multimedia.desktop
+share/kde4/services/plasma-sal-office.desktop
+share/kde4/services/plasma-sal-system.desktop
+share/kde4/services/plasma-sal-utility.desktop
share/kde4/services/plasma-scriptengine-applet-dashboard.desktop
share/kde4/services/plasma-scriptengine-applet-web.desktop
-share/kde4/services/plasma-scriptengine-ruby-applet.desktop
-share/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
share/kde4/services/plasma-tasks-default.desktop
share/kde4/services/plasma-wallpaper-color.desktop
share/kde4/services/plasma-wallpaper-image.desktop
@@ -1896,17 +1996,23 @@ share/kde4/services/settings-system.desktop
share/kde4/services/settings-window-behaviour.desktop
share/kde4/services/solid-actions.desktop
share/kde4/services/solidbackends/solid_fakenet.desktop
+share/kde4/services/solidbackends/solid_lirc.desktop
share/kde4/services/solidbackends/solid_wicd.desktop
share/kde4/services/standard_actions.desktop
share/kde4/services/style.desktop
+share/kde4/services/workspaceoptions.desktop
share/kde4/services/xinerama.desktop
share/kde4/servicetypes/kwineffect.desktop
share/kde4/servicetypes/plasma-geolocationprovider.desktop
+share/kde4/servicetypes/plasma-sal-menu.desktop
share/kde4/servicetypes/screensaver.desktop
+share/kde4/servicetypes/solid-device-type.desktop
share/kde4/servicetypes/solidbluetoothmanager.desktop
share/kde4/servicetypes/solidnetworkmanager.desktop
share/kde4/servicetypes/solidpowermanager.desktop
+share/kde4/servicetypes/solidremotecontrolmanager.desktop
share/kde4/servicetypes/systemsettingscategory.desktop
+share/kde4/servicetypes/systemsettingsexternalapp.desktop
share/kde4/servicetypes/systemsettingsview.desktop
share/sounds/pop.wav
share/wallpapers/Aghi/contents/images/1024x768.jpg
@@ -1928,16 +2034,6 @@ 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/Atra_Dot/contents/images/1024x768.jpg
-share/wallpapers/Atra_Dot/contents/images/1280x1024.jpg
-share/wallpapers/Atra_Dot/contents/images/1280x800.jpg
-share/wallpapers/Atra_Dot/contents/images/1440x900.jpg
-share/wallpapers/Atra_Dot/contents/images/1600x1200.jpg
-share/wallpapers/Atra_Dot/contents/images/1920x1080.jpg
-share/wallpapers/Atra_Dot/contents/images/1920x1200.jpg
-share/wallpapers/Atra_Dot/contents/images/800x600.jpg
-share/wallpapers/Atra_Dot/contents/screnshot.jpg
-share/wallpapers/Atra_Dot/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
@@ -1954,14 +2050,15 @@ 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/EOS/contents/images/1024x768.jpg
-share/wallpapers/EOS/contents/images/1280x1024.jpg
-share/wallpapers/EOS/contents/images/1280x800.jpg
-share/wallpapers/EOS/contents/images/1440x900.jpg
-share/wallpapers/EOS/contents/images/1600x1200.jpg
-share/wallpapers/EOS/contents/images/1920x1200.jpg
-share/wallpapers/EOS/contents/screenshot.png
-share/wallpapers/EOS/metadata.desktop
+share/wallpapers/Ethais/contents/images/1280x1024.png
+share/wallpapers/Ethais/contents/images/1280x800.png
+share/wallpapers/Ethais/contents/images/1366x768.png
+share/wallpapers/Ethais/contents/images/1440x900.png
+share/wallpapers/Ethais/contents/images/1600x1200.png
+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
@@ -1996,6 +2093,15 @@ 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/Media_Life/contents/images/1280x1024.jpg
+share/wallpapers/Media_Life/contents/images/1280x800.jpg
+share/wallpapers/Media_Life/contents/images/1440x900.jpg
+share/wallpapers/Media_Life/contents/images/1480x925.jpg
+share/wallpapers/Media_Life/contents/images/1600x1200.jpg
+share/wallpapers/Media_Life/contents/images/1680x1050.jpg
+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
@@ -2003,6 +2109,16 @@ share/wallpapers/Plasmalicious/contents/images/1600x1200.jpg
share/wallpapers/Plasmalicious/contents/images/1920x1200.jpg
share/wallpapers/Plasmalicious/contents/screenshot.png
share/wallpapers/Plasmalicious/metadata.desktop
+share/wallpapers/Quadros/contents/images/1024x768.jpg
+share/wallpapers/Quadros/contents/images/1280x1024.jpg
+share/wallpapers/Quadros/contents/images/1280x800.jpg
+share/wallpapers/Quadros/contents/images/1440x900.jpg
+share/wallpapers/Quadros/contents/images/1600x1200.jpg
+share/wallpapers/Quadros/contents/images/1920x1080.jpg
+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
@@ -2031,19 +2147,8 @@ 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/There_is_Rain_on_the_Table/contents/images/1024x768.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/images/1280x1024.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/images/1280x800.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/images/1440x900.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/images/1600x1200.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/images/1920x1200.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/screenshot.png
-share/wallpapers/There_is_Rain_on_the_Table/metadata.desktop
share/wallpapers/default_blue.jpg
share/wallpapers/default_blue.jpg.desktop
-@dirrm share/wallpapers/There_is_Rain_on_the_Table/contents/images
-@dirrm share/wallpapers/There_is_Rain_on_the_Table/contents
-@dirrm share/wallpapers/There_is_Rain_on_the_Table
@dirrm share/wallpapers/The_Rings_of_Saturn/contents/images
@dirrm share/wallpapers/The_Rings_of_Saturn/contents
@dirrm share/wallpapers/The_Rings_of_Saturn
@@ -2053,9 +2158,15 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/wallpapers/Red_Leaf/contents/images
@dirrm share/wallpapers/Red_Leaf/contents
@dirrm share/wallpapers/Red_Leaf
+@dirrm share/wallpapers/Quadros/contents/images
+@dirrm share/wallpapers/Quadros/contents
+@dirrm share/wallpapers/Quadros
@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
@dirrm share/wallpapers/Fresh_Morning/contents/images
@dirrm share/wallpapers/Fresh_Morning/contents
@dirrm share/wallpapers/Fresh_Morning
@@ -2068,18 +2179,15 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/wallpapers/Evening/contents/images
@dirrm share/wallpapers/Evening/contents
@dirrm share/wallpapers/Evening
-@dirrm share/wallpapers/EOS/contents/images
-@dirrm share/wallpapers/EOS/contents
-@dirrm share/wallpapers/EOS
+@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
-@dirrm share/wallpapers/Atra_Dot/contents/images
-@dirrm share/wallpapers/Atra_Dot/contents
-@dirrm share/wallpapers/Atra_Dot
@dirrm share/wallpapers/Air/contents/images
@dirrm share/wallpapers/Air/contents
@dirrm share/wallpapers/Air
@@ -2088,7 +2196,6 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/wallpapers/Aghi
@dirrm share/kde4/services/solidbackends
@dirrm share/kde4/services/kwin
-@dirrm share/kde4/services/kded
@dirrm share/icons/Oxygen_Zion_Big/cursors
@dirrm share/icons/Oxygen_Zion_Big
@dirrm share/icons/Oxygen_Zion/cursors
@@ -2110,19 +2217,23 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/icons/Oxygen_Black/cursors
@dirrm share/icons/Oxygen_Black
@dirrm share/doc/HTML/en/systemsettings
-@dirrm share/doc/HTML/en/plasma
+@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/kdm
+@dirrm share/doc/HTML/en/kcontrol/workspaceoptions
@dirrm share/doc/HTML/en/kcontrol/windowspecific
@dirrm share/doc/HTML/en/kcontrol/windowbehaviour
@dirrm share/doc/HTML/en/kcontrol/splashscreen
+@dirrm share/doc/HTML/en/kcontrol/solid-hardware
@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/mouse
+@dirrm share/doc/HTML/en/kcontrol/kwintabbox
+@dirrm share/doc/HTML/en/kcontrol/kwinscreenedges
@dirrm share/doc/HTML/en/kcontrol/kwindecoration
@dirrm share/doc/HTML/en/kcontrol/kwincompositing
@dirrm share/doc/HTML/en/kcontrol/keys
@@ -2134,8 +2245,8 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/doc/HTML/en/kcontrol/joystick
@dirrm share/doc/HTML/en/kcontrol/fonts
@dirrm share/doc/HTML/en/kcontrol/fontinst
-@dirrm share/doc/HTML/en/kcontrol/energy
@dirrm share/doc/HTML/en/kcontrol/desktopthemedetails
+@dirrm share/doc/HTML/en/kcontrol/desktop
@dirrm share/doc/HTML/en/kcontrol/colors
@dirrm share/doc/HTML/en/kcontrol/clock
@dirrm share/doc/HTML/en/kcontrol/bell
@@ -2146,10 +2257,11 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/solidfakenetbackend
@dirrm share/apps/solid/devices
@dirrm share/apps/powerdevil
-@dirrm share/apps/plasma_scriptengine_ruby
@dirrm share/apps/plasma/dashboard/button
@dirrm share/apps/plasma/dashboard/AppleClasses
@dirrm share/apps/plasma/dashboard
+@dirrmtry share/apps/plasma-netbook
+@dirrmtry share/apps/plasma-desktop
@dirrm share/apps/kwrited
@dirrm share/apps/kwin/default_rules
@dirrm share/apps/kthememanager/themes/YellowOnBlue-big
@@ -2166,6 +2278,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
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/Themes/SimpleSmall
@dirrm share/apps/ksplash/Themes/Simple
@@ -2179,6 +2292,7 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/ksplash/Themes/Default
@dirrm share/apps/ksplash/Themes
@dirrm share/apps/ksplash
+@dirrm share/apps/kscreenlocker
@dirrm share/apps/kmenuedit/icons/oxygen/32x32/actions
@dirrm share/apps/kmenuedit/icons/oxygen/32x32
@dirrm share/apps/kmenuedit/icons/oxygen/22x22/actions
@@ -2215,8 +2329,11 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/doc
@dirrm share/apps/desktoptheme/default/system-monitor
@dirrm share/apps/desktoptheme/default/calendar
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
+@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
@dirrm include/taskmanager
@@ -2228,7 +2345,6 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm include/plasma/weather
@dirrm include/plasma/geolocation
@dirrmtry include/plasma
-@dirrmtry include/nepomuk
@dirrm include/kworkspace
@dirrm include/ksysguard
@dirrm include/ksgrd
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 7fb74c30c70c..2874f027ad10 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
@@ -35,7 +34,7 @@ OPTIONS= KDEACCESSIBILITY "Accessibility applications" on \
USE_KDE4= kdelibs kdebase pimlibs workspace kdeprefix runtime oxygen
NO_BUILD= yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if !defined(WITHOUT_KDEACCESSIBILITY)
RUN_DEPENDS+= kdeaccessibility>=4:${PORTSDIR}/accessibility/kdeaccessibility4
@@ -86,4 +85,4 @@ RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_xine.so:${PO
do-install:
${DO_NADA}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 1a7c749095dc..07620680cf57 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,11 +17,12 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
-LIB_DEPENDS= lzma.0:${PORTSDIR}/archivers/xz \
- xine.1:${PORTSDIR}/multimedia/libxine \
- slp.1:${PORTSDIR}/net/openslp
+LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \
+ slp.1:${PORTSDIR}/net/openslp \
+ attica.0:${PORTSDIR}/x11-toolkits/attica \
+ ssh.4:${PORTSDIR}/security/libssh
-USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp
+USE_KDE4= kdelibs kdeprefix kdehier automoc4 #pimlibs
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
@@ -30,12 +31,18 @@ QT_COMPONENTS= corelib opengl dbus phonon \
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
-MAN1= kdesu.1
-MAN8= nepomukserver.8 nepomukservicestub.8
-
+MAN1= kdesu.1
OPTIONS= PULSEAUDIO "Enable playback via PulseAudio soundserver" off
-.include <bsd.port.pre.mk>
+# Explicitly disable alsa, see for details:
+# http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html
+CMAKE_ARGS+= -DWITH_ALSA:BOOL=OFF
+
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} < 900012
+LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz
+.endif
.if defined(WITH_PULSEAUDIO)
CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=ON
@@ -44,6 +51,15 @@ LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
.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 \
@@ -52,4 +68,4 @@ post-patch:
${PATCH_WRKSRC}/kioslave/man/man2html.cpp \
${PATCH_WRKSRC}/cmake/modules/FindCLucene.cmake
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index b01a23aa5476..e7e433bb57e4 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.3.5.tar.bz2) = 2d49beb007c41c0bebac063a579e81d9
-SHA256 (KDE/kdebase-runtime-4.3.5.tar.bz2) = 9dfaa6f60f36bdd7ca4a79ae74fe8a86bd7ec77a1249d57f4d26dec39dcfe334
-SIZE (KDE/kdebase-runtime-4.3.5.tar.bz2) = 7333093
+MD5 (KDE/kdebase-runtime-4.4.3.tar.bz2) = 3d5ad5eb5eeef2656cab860ae9f7c079
+SHA256 (KDE/kdebase-runtime-4.4.3.tar.bz2) = a1be5f6c45d6713197ef0e45628db4b2e1e31fd01dc9c8a2fc1822fa0840cfbb
+SIZE (KDE/kdebase-runtime-4.4.3.tar.bz2) = 7332130
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index c6641ea7dc47..5dc744d58437 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -9,6 +9,7 @@ bin/keditfiletype
bin/kfile4
bin/kglobalaccel
bin/khelpcenter
+bin/khotnewstuff-upload
bin/khotnewstuff4
bin/kiconfinder
bin/kioclient
@@ -23,13 +24,15 @@ bin/ktrash
bin/kuiserver
bin/kwalletd
bin/kwriteconfig
-bin/nepomukserver
-bin/nepomukservicestub
+%%NEPOMUK%%bin/nepomukserver
+%%NEPOMUK%%bin/nepomukservicestub
bin/plasmapkg
bin/solid-hardware
etc/xdg/menus/kde-information.menu
+lib/attica_kde.so
lib/kconf_update_bin/phonon_devicepreference_update
lib/kconf_update_bin/phonon_deviceuids_update
+lib/kde4/comicbookthumbnail.so
lib/kde4/cursorthumbnail.so
lib/kde4/djvuthumbnail.so
lib/kde4/exrthumbnail.so
@@ -37,8 +40,10 @@ lib/kde4/fixhosturifilter.so
lib/kde4/htmlthumbnail.so
lib/kde4/imagethumbnail.so
lib/kde4/jpegthumbnail.so
+lib/kde4/kcm_attica.so
lib/kde4/kcm_cgi.so
lib/kde4/kcm_componentchooser.so
+lib/kde4/kcm_device_automounter.so
lib/kde4/kcm_emoticons.so
lib/kde4/kcm_filetypes.so
lib/kde4/kcm_icons.so
@@ -46,14 +51,16 @@ lib/kde4/kcm_kded.so
lib/kde4/kcm_kdnssd.so
lib/kde4/kcm_knotify.so
lib/kde4/kcm_locale.so
-lib/kde4/kcm_nepomuk.so
+%%NEPOMUK%%lib/kde4/kcm_nepomuk.so
lib/kde4/kcm_phonon.so
lib/kde4/kcm_phononxine.so
lib/kde4/kcm_trash.so
lib/kde4/kcmspellchecking.so
lib/kde4/kded_desktopnotifier.so
+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_networkwatcher.so
lib/kde4/kded_phononserver.so
lib/kde4/kded_remotedirnotify.so
@@ -71,7 +78,8 @@ lib/kde4/kio_fish.so
lib/kde4/kio_floppy.so
lib/kde4/kio_info.so
lib/kde4/kio_man.so
-lib/kde4/kio_nepomuksearch.so
+%%NEPOMUK%%lib/kde4/kio_nepomuk.so
+%%NEPOMUK%%lib/kde4/kio_nepomuksearch.so
lib/kde4/kio_network.so
lib/kde4/kio_nfs.so
lib/kde4/kio_remote.so
@@ -79,6 +87,7 @@ 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_trash.so
lib/kde4/kshorturifilter.so
lib/kde4/kstyle_oxygen_config.so
@@ -100,31 +109,35 @@ lib/kde4/libkmanpart.so
lib/kde4/librenaudioplugin.so
lib/kde4/librenimageplugin.so
lib/kde4/localdomainurifilter.so
-lib/kde4/nepomukfilewatch.so
-lib/kde4/nepomukmigration1.so
-lib/kde4/nepomukontologyloader.so
-lib/kde4/nepomukqueryservice.so
-lib/kde4/nepomukstorage.so
-lib/kde4/nepomukstrigiservice.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/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
+lib/kde4/windowsimagethumbnail.so
lib/libkdeinit4_kcmshell4.so
lib/libkdeinit4_kglobalaccel.so
lib/libkdeinit4_khelpcenter.so
lib/libkdeinit4_kuiserver.so
lib/libkdeinit4_kwalletd.so
-lib/libkdeinit4_nepomukserver.so
+%%NEPOMUK%%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
-lib/strigi/strigiindex_sopranobackend.so
+%%NEPOMUK%%lib/strigi/strigiindex_nepomukbackend.so
share/applications/kde4/Help.desktop
share/applications/kde4/knetattach.desktop
share/apps/cmake/modules/FindCLucene.cmake
@@ -141,6 +154,7 @@ 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/widgets/action-overlays.svgz
share/apps/desktoptheme/default/widgets/analog_meter.svgz
share/apps/desktoptheme/default/widgets/arrows.svgz
share/apps/desktoptheme/default/widgets/background.svgz
@@ -159,11 +173,13 @@ 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/line.svgz
+share/apps/desktoptheme/default/widgets/lineedit.svgz
share/apps/desktoptheme/default/widgets/monitor.svgz
share/apps/desktoptheme/default/widgets/pager.svgz
share/apps/desktoptheme/default/widgets/panel-background.svgz
share/apps/desktoptheme/default/widgets/plot-background.svgz
share/apps/desktoptheme/default/widgets/scrollbar.svgz
+share/apps/desktoptheme/default/widgets/scrollwidget.svgz
share/apps/desktoptheme/default/widgets/slider.svgz
share/apps/desktoptheme/default/widgets/systemtray.svgz
share/apps/desktoptheme/default/widgets/tasks.svgz
@@ -184,6 +200,7 @@ share/apps/desktoptheme/oxygen/opaque/dialogs/shutdowndialog.svgz
share/apps/desktoptheme/oxygen/opaque/widgets/extender-background.svgz
share/apps/desktoptheme/oxygen/opaque/widgets/panel-background.svgz
share/apps/desktoptheme/oxygen/opaque/widgets/tooltip.svgz
+share/apps/desktoptheme/oxygen/widgets/action-overlays.svgz
share/apps/desktoptheme/oxygen/widgets/analog_meter.svgz
share/apps/desktoptheme/oxygen/widgets/arrows.svgz
share/apps/desktoptheme/oxygen/widgets/background.svgz
@@ -202,11 +219,13 @@ share/apps/desktoptheme/oxygen/widgets/extender-dragger.svgz
share/apps/desktoptheme/oxygen/widgets/frame.svgz
share/apps/desktoptheme/oxygen/widgets/glowbar.svgz
share/apps/desktoptheme/oxygen/widgets/line.svgz
+share/apps/desktoptheme/oxygen/widgets/lineedit.svgz
share/apps/desktoptheme/oxygen/widgets/monitor.svgz
share/apps/desktoptheme/oxygen/widgets/pager.svgz
share/apps/desktoptheme/oxygen/widgets/panel-background.svgz
share/apps/desktoptheme/oxygen/widgets/plot-background.svgz
share/apps/desktoptheme/oxygen/widgets/scrollbar.svgz
+share/apps/desktoptheme/oxygen/widgets/scrollwidget.svgz
share/apps/desktoptheme/oxygen/widgets/slider.svgz
share/apps/desktoptheme/oxygen/widgets/systemtray.svgz
share/apps/desktoptheme/oxygen/widgets/tasks.svgz
@@ -215,7 +234,9 @@ share/apps/desktoptheme/oxygen/widgets/toolbox.svgz
share/apps/desktoptheme/oxygen/widgets/tooltip.svgz
share/apps/desktoptheme/oxygen/widgets/translucentbackground.svgz
share/apps/desktoptheme/oxygen/widgets/viewitem.svgz
-share/apps/drkonqi/debuggers/gdbrc
+share/apps/drkonqi/debuggers/external/gdbrc
+share/apps/drkonqi/debuggers/external/kdbgrc
+share/apps/drkonqi/debuggers/internal/gdbrc
share/apps/drkonqi/mappings
share/apps/drkonqi/pics/crash.png
share/apps/kcm_componentchooser/kcm_browser.desktop
@@ -228,6 +249,7 @@ share/apps/kcmlocale/pics/background.png
share/apps/kconf_update/devicepreference.upd
share/apps/kconf_update/kuriikwsfilter.upd
share/apps/kde/kde.notifyrc
+share/apps/kglobalaccel/kglobalaccel.notifyrc
share/apps/khelpcenter/glossary.html.in
share/apps/khelpcenter/glossary.xslt
share/apps/khelpcenter/index.html.in
@@ -274,7 +296,6 @@ share/apps/kio_finger/kio_finger.css
share/apps/kio_finger/kio_finger.pl
share/apps/kio_info/kde-info2html
share/apps/kio_info/kde-info2html.conf
-share/apps/kio_thumbnail/pics/thumbnailfont_7x4.png
share/apps/konqsidebartng/virtual_folders/remote/virtualfolder_network.desktop
share/apps/konqueror/dirtree/remote/smb-network.desktop
share/apps/ksmserver/windowmanagers/compiz-custom.desktop
@@ -282,61 +303,37 @@ 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
-share/apps/nepomuk/ontologies/dces.desktop
-share/apps/nepomuk/ontologies/dces.rdf
-share/apps/nepomuk/ontologies/dcq.desktop
-share/apps/nepomuk/ontologies/dcq.rdf
-share/apps/nepomuk/ontologies/dctype.desktop
-share/apps/nepomuk/ontologies/dctype.rdf
-share/apps/nepomuk/ontologies/nao.desktop
-share/apps/nepomuk/ontologies/nao.trig
-share/apps/nepomuk/ontologies/ncal.desktop
-share/apps/nepomuk/ontologies/ncal.trig
-share/apps/nepomuk/ontologies/nco.desktop
-share/apps/nepomuk/ontologies/nco.trig
-share/apps/nepomuk/ontologies/nexif.desktop
-share/apps/nepomuk/ontologies/nexif.trig
-share/apps/nepomuk/ontologies/nfo.desktop
-share/apps/nepomuk/ontologies/nfo.trig
-share/apps/nepomuk/ontologies/nid3.desktop
-share/apps/nepomuk/ontologies/nid3.trig
-share/apps/nepomuk/ontologies/nie.desktop
-share/apps/nepomuk/ontologies/nie.trig
-share/apps/nepomuk/ontologies/nmo.desktop
-share/apps/nepomuk/ontologies/nmo.trig
-share/apps/nepomuk/ontologies/nrl.desktop
-share/apps/nepomuk/ontologies/nrl.trig
-share/apps/nepomuk/ontologies/pimo.desktop
-share/apps/nepomuk/ontologies/pimo.trig
-share/apps/nepomuk/ontologies/rdf.desktop
-share/apps/nepomuk/ontologies/rdf.rdfs
-share/apps/nepomuk/ontologies/rdfs.desktop
-share/apps/nepomuk/ontologies/rdfs.rdfs
-share/apps/nepomuk/ontologies/xesam.desktop
-share/apps/nepomuk/ontologies/xesam.rdfs
-share/apps/nepomukstorage/nepomukstorage.notifyrc
-share/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
+%%NEPOMUK%%share/apps/nepomukstorage/nepomukstorage.notifyrc
+%%NEPOMUK%%share/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
share/apps/phonon/phonon.notifyrc
share/apps/remoteview/network.desktop
share/apps/remoteview/smb-network.desktop
-share/autostart/nepomukserver.desktop
+%%NEPOMUK%%share/autostart/nepomukserver.desktop
share/config.kcfg/khelpcenter.kcfg
share/config/emoticons.knsrc
share/config/icons.knsrc
share/config/khotnewstuff.knsrc
+share/config/khotnewstuff_upload.knsrc
share/config/kshorturifilterrc
share/dbus-1/interfaces/org.kde.KTimeZoned.xml
-share/dbus-1/interfaces/org.kde.NepomukServer.xml
+%%NEPOMUK%%share/dbus-1/interfaces/org.kde.NepomukServer.xml
share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.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.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
+%%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.network.kioslavenotifier.xml
share/dbus-1/services/org.kde.knotify.service
share/desktop-directories/kde-development-translation.directory
@@ -378,34 +375,24 @@ share/desktop-directories/kde-utilities-peripherals.directory
share/desktop-directories/kde-utilities-pim.directory
share/desktop-directories/kde-utilities-xutils.directory
share/desktop-directories/kde-utilities.directory
-share/doc/HTML/en/kcontrol/background/common
-share/doc/HTML/en/kcontrol/background/index.cache.bz2
-share/doc/HTML/en/kcontrol/background/index.docbook
+share/doc/HTML/en/kcontrol/attica/common
+share/doc/HTML/en/kcontrol/attica/index.cache.bz2
+share/doc/HTML/en/kcontrol/attica/index.docbook
share/doc/HTML/en/kcontrol/bookmarks/common
share/doc/HTML/en/kcontrol/bookmarks/index.cache.bz2
share/doc/HTML/en/kcontrol/bookmarks/index.docbook
share/doc/HTML/en/kcontrol/cache/common
share/doc/HTML/en/kcontrol/cache/index.cache.bz2
share/doc/HTML/en/kcontrol/cache/index.docbook
-share/doc/HTML/en/kcontrol/common
+share/doc/HTML/en/kcontrol/componentchooser/common
+share/doc/HTML/en/kcontrol/componentchooser/index.cache.bz2
+share/doc/HTML/en/kcontrol/componentchooser/index.docbook
share/doc/HTML/en/kcontrol/cookies/common
share/doc/HTML/en/kcontrol/cookies/index.cache.bz2
share/doc/HTML/en/kcontrol/cookies/index.docbook
-share/doc/HTML/en/kcontrol/crypto/common
-share/doc/HTML/en/kcontrol/crypto/index.cache.bz2
-share/doc/HTML/en/kcontrol/crypto/index.docbook
-share/doc/HTML/en/kcontrol/desktop/common
-share/doc/HTML/en/kcontrol/desktop/index.cache.bz2
-share/doc/HTML/en/kcontrol/desktop/index.docbook
-share/doc/HTML/en/kcontrol/desktopbehavior/common
-share/doc/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
-share/doc/HTML/en/kcontrol/desktopbehavior/index.docbook
share/doc/HTML/en/kcontrol/ebrowsing/common
share/doc/HTML/en/kcontrol/ebrowsing/index.cache.bz2
share/doc/HTML/en/kcontrol/ebrowsing/index.docbook
-share/doc/HTML/en/kcontrol/email/common
-share/doc/HTML/en/kcontrol/email/index.cache.bz2
-share/doc/HTML/en/kcontrol/email/index.docbook
share/doc/HTML/en/kcontrol/emoticons/common
share/doc/HTML/en/kcontrol/emoticons/emoticons.png
share/doc/HTML/en/kcontrol/emoticons/index.cache.bz2
@@ -413,14 +400,15 @@ share/doc/HTML/en/kcontrol/emoticons/index.docbook
share/doc/HTML/en/kcontrol/filemanager/common
share/doc/HTML/en/kcontrol/filemanager/index.cache.bz2
share/doc/HTML/en/kcontrol/filemanager/index.docbook
-share/doc/HTML/en/kcontrol/filemanager/kfileman1.png
-share/doc/HTML/en/kcontrol/filemanager/kfileman2.png
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
share/doc/HTML/en/kcontrol/icons/common
share/doc/HTML/en/kcontrol/icons/delete-theme.png
share/doc/HTML/en/kcontrol/icons/effects.png
@@ -431,48 +419,45 @@ share/doc/HTML/en/kcontrol/icons/install-theme.png
share/doc/HTML/en/kcontrol/icons/main.png
share/doc/HTML/en/kcontrol/icons/size.png
share/doc/HTML/en/kcontrol/icons/use-of-icons.png
-share/doc/HTML/en/kcontrol/index.cache.bz2
-share/doc/HTML/en/kcontrol/index.docbook
+share/doc/HTML/en/kcontrol/kcmcgi/common
+share/doc/HTML/en/kcontrol/kcmcgi/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcmcgi/index.docbook
share/doc/HTML/en/kcontrol/kcmcss/common
share/doc/HTML/en/kcontrol/kcmcss/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmcss/index.docbook
-share/doc/HTML/en/kcontrol/kcmkonsole/common
-share/doc/HTML/en/kcontrol/kcmkonsole/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmkonsole/index.docbook
share/doc/HTML/en/kcontrol/kcmlaunch/common
share/doc/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmlaunch/index.docbook
share/doc/HTML/en/kcontrol/kcmnotify/common
share/doc/HTML/en/kcontrol/kcmnotify/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmnotify/index.docbook
-share/doc/HTML/en/kcontrol/kcmtaskbar/common
-share/doc/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmtaskbar/index.docbook
-share/doc/HTML/en/kcontrol/kdm/common
-share/doc/HTML/en/kcontrol/kdm/index.cache.bz2
-share/doc/HTML/en/kcontrol/kdm/index.docbook
-share/doc/HTML/en/kcontrol/khtml/common
-share/doc/HTML/en/kcontrol/khtml/index.cache.bz2
-share/doc/HTML/en/kcontrol/khtml/index.docbook
-share/doc/HTML/en/kcontrol/khtml/nsplugin.docbook
+share/doc/HTML/en/kcontrol/kded/common
+share/doc/HTML/en/kcontrol/kded/index.cache.bz2
+share/doc/HTML/en/kcontrol/kded/index.docbook
+share/doc/HTML/en/kcontrol/khtml-adblock/common
+share/doc/HTML/en/kcontrol/khtml-adblock/index.cache.bz2
+share/doc/HTML/en/kcontrol/khtml-adblock/index.docbook
+share/doc/HTML/en/kcontrol/khtml-behavior/common
+share/doc/HTML/en/kcontrol/khtml-behavior/index.cache.bz2
+share/doc/HTML/en/kcontrol/khtml-behavior/index.docbook
+share/doc/HTML/en/kcontrol/khtml-general/common
+share/doc/HTML/en/kcontrol/khtml-general/index.cache.bz2
+share/doc/HTML/en/kcontrol/khtml-general/index.docbook
+share/doc/HTML/en/kcontrol/khtml-java-js/common
+share/doc/HTML/en/kcontrol/khtml-java-js/index.cache.bz2
+share/doc/HTML/en/kcontrol/khtml-java-js/index.docbook
+share/doc/HTML/en/kcontrol/khtml-plugins/common
+share/doc/HTML/en/kcontrol/khtml-plugins/index.cache.bz2
+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
-share/doc/HTML/en/kcontrol/nepomuk/common
-share/doc/HTML/en/kcontrol/nepomuk/index.cache.bz2
-share/doc/HTML/en/kcontrol/nepomuk/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/netpref/common
share/doc/HTML/en/kcontrol/netpref/index.cache.bz2
share/doc/HTML/en/kcontrol/netpref/index.docbook
-share/doc/HTML/en/kcontrol/panel/common
-share/doc/HTML/en/kcontrol/panel/index.cache.bz2
-share/doc/HTML/en/kcontrol/panel/index.docbook
-share/doc/HTML/en/kcontrol/panelappearance/common
-share/doc/HTML/en/kcontrol/panelappearance/index.cache.bz2
-share/doc/HTML/en/kcontrol/panelappearance/index.docbook
-share/doc/HTML/en/kcontrol/passwords/common
-share/doc/HTML/en/kcontrol/passwords/index.cache.bz2
-share/doc/HTML/en/kcontrol/passwords/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
@@ -480,17 +465,24 @@ 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
+share/doc/HTML/en/kcontrol/phonon/common
+share/doc/HTML/en/kcontrol/phonon/index.cache.bz2
+share/doc/HTML/en/kcontrol/phonon/index.docbook
share/doc/HTML/en/kcontrol/proxy/common
share/doc/HTML/en/kcontrol/proxy/index.cache.bz2
share/doc/HTML/en/kcontrol/proxy/index.docbook
-share/doc/HTML/en/kcontrol/proxy/socks.docbook
-share/doc/HTML/en/kcontrol/screenshot.png
share/doc/HTML/en/kcontrol/smb/common
share/doc/HTML/en/kcontrol/smb/index.cache.bz2
share/doc/HTML/en/kcontrol/smb/index.docbook
+share/doc/HTML/en/kcontrol/solid-device-automounter/common
+share/doc/HTML/en/kcontrol/solid-device-automounter/index.cache.bz2
+share/doc/HTML/en/kcontrol/solid-device-automounter/index.docbook
share/doc/HTML/en/kcontrol/spellchecking/common
share/doc/HTML/en/kcontrol/spellchecking/index.cache.bz2
share/doc/HTML/en/kcontrol/spellchecking/index.docbook
+share/doc/HTML/en/kcontrol/trash/common
+share/doc/HTML/en/kcontrol/trash/index.cache.bz2
+share/doc/HTML/en/kcontrol/trash/index.docbook
share/doc/HTML/en/kcontrol/useragent/common
share/doc/HTML/en/kcontrol/useragent/index.cache.bz2
share/doc/HTML/en/kcontrol/useragent/index.docbook
@@ -768,10 +760,12 @@ share/kde4/services/bookmarks.protocol
share/kde4/services/bzip.protocol
share/kde4/services/bzip2.protocol
share/kde4/services/cgi.protocol
+share/kde4/services/comicbookthumbnail.desktop
share/kde4/services/componentchooser.desktop
share/kde4/services/cursorthumbnail.desktop
share/kde4/services/desktop.protocol
share/kde4/services/desktopthumbnail.desktop
+share/kde4/services/device_automounter_kcm.desktop
share/kde4/services/directorythumbnail.desktop
share/kde4/services/djvuthumbnail.desktop
share/kde4/services/emoticons.desktop
@@ -787,8 +781,9 @@ share/kde4/services/icons.desktop
share/kde4/services/imagethumbnail.desktop
share/kde4/services/info.protocol
share/kde4/services/jpegthumbnail.desktop
+share/kde4/services/kcm_attica.desktop
share/kde4/services/kcm_kdnssd.desktop
-share/kde4/services/kcm_nepomuk.desktop
+%%NEPOMUK%%share/kde4/services/kcm_nepomuk.desktop
share/kde4/services/kcm_phonon.desktop
share/kde4/services/kcm_phononxine.desktop
share/kde4/services/kcmcgi.desktop
@@ -796,8 +791,10 @@ share/kde4/services/kcmkded.desktop
share/kde4/services/kcmnotify.desktop
share/kde4/services/kcmtrash.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/networkwatcher.desktop
share/kde4/services/kded/phononserver.desktop
share/kde4/services/kded/remotedirnotify.desktop
@@ -816,16 +813,19 @@ share/kde4/services/language.desktop
share/kde4/services/localdomainurifilter.desktop
share/kde4/services/lzma.protocol
share/kde4/services/man.protocol
-share/kde4/services/nepomukfilewatch.desktop
-share/kde4/services/nepomukmigration1.desktop
-share/kde4/services/nepomukontologyloader.desktop
-share/kde4/services/nepomukqueryservice.desktop
-share/kde4/services/nepomuksearch.protocol
-share/kde4/services/nepomukstorage.desktop
-share/kde4/services/nepomukstrigiservice.desktop
+%%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/network.protocol
share/kde4/services/nfs.protocol
share/kde4/services/plasma-scriptengine-applet-simple-javascript.desktop
+share/kde4/services/plasma-scriptengine-dataengine-javascript.desktop
share/kde4/services/plasma-scriptengine-runner-javascript.desktop
share/kde4/services/programs.protocol
share/kde4/services/remote.protocol
@@ -852,6 +852,7 @@ share/kde4/services/searchproviders/dbug.desktop
share/kde4/services/searchproviders/de2en.desktop
share/kde4/services/searchproviders/de2fr.desktop
share/kde4/services/searchproviders/deb.desktop
+share/kde4/services/searchproviders/dictfr.desktop
share/kde4/services/searchproviders/dmoz.desktop
share/kde4/services/searchproviders/docbook.desktop
share/kde4/services/searchproviders/doi.desktop
@@ -925,6 +926,7 @@ share/kde4/services/searchproviders/webster.desktop
share/kde4/services/searchproviders/whatis.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/settings.protocol
share/kde4/services/sftp.protocol
@@ -934,13 +936,221 @@ 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/trash.protocol
+share/kde4/services/windowsexethumbnail.desktop
+share/kde4/services/windowsimagethumbnail.desktop
share/kde4/services/xz.protocol
share/kde4/services/zip.protocol
-share/kde4/servicetypes/nepomukservice.desktop
+%%NEPOMUK%%share/kde4/servicetypes/nepomukservice.desktop
share/kde4/servicetypes/phononbackend.desktop
share/kde4/servicetypes/searchprovider.desktop
share/kde4/servicetypes/thumbcreator.desktop
+share/locale/currency/adf.desktop
+share/locale/currency/adp.desktop
+share/locale/currency/aed.desktop
+share/locale/currency/afa.desktop
+share/locale/currency/afn.desktop
+share/locale/currency/all.desktop
+share/locale/currency/amd.desktop
+share/locale/currency/ang.desktop
+share/locale/currency/aoa.desktop
+share/locale/currency/aon.desktop
+share/locale/currency/ars.desktop
+share/locale/currency/ats.desktop
+share/locale/currency/aud.desktop
+share/locale/currency/awg.desktop
+share/locale/currency/azm.desktop
+share/locale/currency/azn.desktop
+share/locale/currency/bam.desktop
+share/locale/currency/bbd.desktop
+share/locale/currency/bdt.desktop
+share/locale/currency/bef.desktop
+share/locale/currency/bgl.desktop
+share/locale/currency/bgn.desktop
+share/locale/currency/bhd.desktop
+share/locale/currency/bif.desktop
+share/locale/currency/bmd.desktop
+share/locale/currency/bnd.desktop
+share/locale/currency/bob.desktop
+share/locale/currency/bov.desktop
+share/locale/currency/brl.desktop
+share/locale/currency/bsd.desktop
+share/locale/currency/btn.desktop
+share/locale/currency/bwp.desktop
+share/locale/currency/byr.desktop
+share/locale/currency/bzd.desktop
+share/locale/currency/cad.desktop
+share/locale/currency/cdf.desktop
+share/locale/currency/chf.desktop
+share/locale/currency/clf.desktop
+share/locale/currency/clp.desktop
+share/locale/currency/cny.desktop
+share/locale/currency/cop.desktop
+share/locale/currency/cou.desktop
+share/locale/currency/crc.desktop
+share/locale/currency/cuc.desktop
+share/locale/currency/cup.desktop
+share/locale/currency/cve.desktop
+share/locale/currency/cyp.desktop
+share/locale/currency/czk.desktop
+share/locale/currency/dem.desktop
+share/locale/currency/djf.desktop
+share/locale/currency/dkk.desktop
+share/locale/currency/dop.desktop
+share/locale/currency/dzd.desktop
+share/locale/currency/eek.desktop
+share/locale/currency/egp.desktop
+share/locale/currency/ern.desktop
+share/locale/currency/esp.desktop
+share/locale/currency/etb.desktop
+share/locale/currency/eur.desktop
+share/locale/currency/fim.desktop
+share/locale/currency/fjd.desktop
+share/locale/currency/fkp.desktop
+share/locale/currency/frf.desktop
+share/locale/currency/gbp.desktop
+share/locale/currency/gel.desktop
+share/locale/currency/ghc.desktop
+share/locale/currency/ghs.desktop
+share/locale/currency/gip.desktop
+share/locale/currency/gmd.desktop
+share/locale/currency/gnf.desktop
+share/locale/currency/grd.desktop
+share/locale/currency/gtq.desktop
+share/locale/currency/gwp.desktop
+share/locale/currency/gyd.desktop
+share/locale/currency/hkd.desktop
+share/locale/currency/hnl.desktop
+share/locale/currency/hrk.desktop
+share/locale/currency/htg.desktop
+share/locale/currency/huf.desktop
+share/locale/currency/idr.desktop
+share/locale/currency/iep.desktop
+share/locale/currency/ils.desktop
+share/locale/currency/inr.desktop
+share/locale/currency/iqd.desktop
+share/locale/currency/irr.desktop
+share/locale/currency/isk.desktop
+share/locale/currency/itl.desktop
+share/locale/currency/jmd.desktop
+share/locale/currency/jod.desktop
+share/locale/currency/jpy.desktop
+share/locale/currency/kes.desktop
+share/locale/currency/kgs.desktop
+share/locale/currency/khr.desktop
+share/locale/currency/kmf.desktop
+share/locale/currency/kpw.desktop
+share/locale/currency/krw.desktop
+share/locale/currency/kwd.desktop
+share/locale/currency/kyd.desktop
+share/locale/currency/kzt.desktop
+share/locale/currency/lak.desktop
+share/locale/currency/lbp.desktop
+share/locale/currency/lkr.desktop
+share/locale/currency/lrd.desktop
+share/locale/currency/lsl.desktop
+share/locale/currency/ltl.desktop
+share/locale/currency/luf.desktop
+share/locale/currency/lvl.desktop
+share/locale/currency/lyd.desktop
+share/locale/currency/mad.desktop
+share/locale/currency/mdl.desktop
+share/locale/currency/mga.desktop
+share/locale/currency/mgf.desktop
+share/locale/currency/mkd.desktop
+share/locale/currency/mlf.desktop
+share/locale/currency/mmk.desktop
+share/locale/currency/mnt.desktop
+share/locale/currency/mop.desktop
+share/locale/currency/mro.desktop
+share/locale/currency/mtl.desktop
+share/locale/currency/mur.desktop
+share/locale/currency/mvr.desktop
+share/locale/currency/mwk.desktop
+share/locale/currency/mxn.desktop
+share/locale/currency/mxv.desktop
+share/locale/currency/myr.desktop
+share/locale/currency/mzm.desktop
+share/locale/currency/mzn.desktop
+share/locale/currency/nad.desktop
+share/locale/currency/ngn.desktop
+share/locale/currency/nio.desktop
+share/locale/currency/nlg.desktop
+share/locale/currency/nok.desktop
+share/locale/currency/npr.desktop
+share/locale/currency/nzd.desktop
+share/locale/currency/omr.desktop
+share/locale/currency/pab.desktop
+share/locale/currency/pen.desktop
+share/locale/currency/pgk.desktop
+share/locale/currency/php.desktop
+share/locale/currency/pkr.desktop
+share/locale/currency/pln.desktop
+share/locale/currency/pte.desktop
+share/locale/currency/pyg.desktop
+share/locale/currency/qar.desktop
+share/locale/currency/rol.desktop
+share/locale/currency/ron.desktop
+share/locale/currency/rsd.desktop
+share/locale/currency/rub.desktop
+share/locale/currency/rur.desktop
+share/locale/currency/rwf.desktop
+share/locale/currency/sar.desktop
+share/locale/currency/sbd.desktop
+share/locale/currency/scr.desktop
+share/locale/currency/sdd.desktop
+share/locale/currency/sdg.desktop
+share/locale/currency/sek.desktop
+share/locale/currency/sgd.desktop
+share/locale/currency/shp.desktop
+share/locale/currency/sit.desktop
+share/locale/currency/skk.desktop
+share/locale/currency/sll.desktop
+share/locale/currency/sos.desktop
+share/locale/currency/srd.desktop
+share/locale/currency/srg.desktop
+share/locale/currency/std.desktop
+share/locale/currency/svc.desktop
+share/locale/currency/syp.desktop
+share/locale/currency/szl.desktop
+share/locale/currency/thb.desktop
+share/locale/currency/tjs.desktop
+share/locale/currency/tmm.desktop
+share/locale/currency/tmt.desktop
+share/locale/currency/tnd.desktop
+share/locale/currency/top.desktop
+share/locale/currency/tpe.desktop
+share/locale/currency/trl.desktop
+share/locale/currency/try.desktop
+share/locale/currency/ttd.desktop
+share/locale/currency/twd.desktop
+share/locale/currency/tzs.desktop
+share/locale/currency/uah.desktop
+share/locale/currency/ugx.desktop
+share/locale/currency/usd.desktop
+share/locale/currency/usn.desktop
+share/locale/currency/uss.desktop
+share/locale/currency/uyu.desktop
+share/locale/currency/uzs.desktop
+share/locale/currency/veb.desktop
+share/locale/currency/vnd.desktop
+share/locale/currency/vuv.desktop
+share/locale/currency/wst.desktop
+share/locale/currency/xaf.desktop
+share/locale/currency/xag.desktop
+share/locale/currency/xau.desktop
+share/locale/currency/xcd.desktop
+share/locale/currency/xof.desktop
+share/locale/currency/xpd.desktop
+share/locale/currency/xpf.desktop
+share/locale/currency/xpt.desktop
+share/locale/currency/yer.desktop
+share/locale/currency/yum.desktop
+share/locale/currency/zar.desktop
+share/locale/currency/zmk.desktop
+share/locale/currency/zwd.desktop
+share/locale/currency/zwl.desktop
share/locale/en_US/entry.desktop
share/locale/l10n/C/entry.desktop
share/locale/l10n/C/flag.png
@@ -1431,11 +1641,14 @@ 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.afpovertcp.xml
+share/mime/inode/vnd.kde.service.airmouse.xml
share/mime/inode/vnd.kde.service.airport.xml
share/mime/inode/vnd.kde.service.daap.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.http.xml
share/mime/inode/vnd.kde.service.imap.xml
share/mime/inode/vnd.kde.service.ipp.xml
@@ -1443,20 +1656,26 @@ share/mime/inode/vnd.kde.service.kbattleship.xml
share/mime/inode/vnd.kde.service.kfourinline.xml
share/mime/inode/vnd.kde.service.ksirk.xml
share/mime/inode/vnd.kde.service.ldap.xml
+share/mime/inode/vnd.kde.service.libvirt.xml
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.ntp.xml
share/mime/inode/vnd.kde.service.odisk.xml
+share/mime/inode/vnd.kde.service.plasma.xml
share/mime/inode/vnd.kde.service.pop3.xml
share/mime/inode/vnd.kde.service.presence.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
share/mime/inode/vnd.kde.service.raop.xml
share/mime/inode/vnd.kde.service.rdp.xml
+share/mime/inode/vnd.kde.service.realplayfavs.xml
share/mime/inode/vnd.kde.service.rfb.xml
share/mime/inode/vnd.kde.service.rsync.xml
share/mime/inode/vnd.kde.service.sftp-ssh.xml
-share/mime/inode/vnd.kde.service.sftp.xml
+share/mime/inode/vnd.kde.service.sleep-proxy.xml
share/mime/inode/vnd.kde.service.smb.xml
share/mime/inode/vnd.kde.service.ssh.xml
share/mime/inode/vnd.kde.service.svn.xml
@@ -1749,6 +1968,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/locale/l10n/ad
@dirrm share/locale/l10n/C
@dirrm share/locale/l10n
+@dirrm share/locale/currency
@dirrm share/kde4/services/searchproviders
@dirrm share/emoticons/kde4
@dirrm share/doc/HTML/en/network
@@ -1776,51 +1996,50 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/doc/HTML/en/kdesu
@dirrm share/doc/HTML/en/kdebugdialog
@dirrm share/doc/HTML/en/kcontrol/useragent
+@dirrm share/doc/HTML/en/kcontrol/trash
@dirrm share/doc/HTML/en/kcontrol/spellchecking
+@dirrm share/doc/HTML/en/kcontrol/solid-device-automounter
@dirrm share/doc/HTML/en/kcontrol/smb
@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/passwords
-@dirrm share/doc/HTML/en/kcontrol/panelappearance
-@dirrm share/doc/HTML/en/kcontrol/panel
@dirrm share/doc/HTML/en/kcontrol/netpref
-@dirrm share/doc/HTML/en/kcontrol/nepomuk
+%%NEPOMUK%%@dirrm share/doc/HTML/en/kcontrol/nepomuk
@dirrm share/doc/HTML/en/kcontrol/language
-@dirrm share/doc/HTML/en/kcontrol/khtml
-@dirrm share/doc/HTML/en/kcontrol/kdm
-@dirrm share/doc/HTML/en/kcontrol/kcmtaskbar
+@dirrm share/doc/HTML/en/kcontrol/khtml-plugins
+@dirrm share/doc/HTML/en/kcontrol/khtml-java-js
+@dirrm share/doc/HTML/en/kcontrol/khtml-general
+@dirrm share/doc/HTML/en/kcontrol/khtml-behavior
+@dirrm share/doc/HTML/en/kcontrol/khtml-adblock
+@dirrm share/doc/HTML/en/kcontrol/kded
@dirrm share/doc/HTML/en/kcontrol/kcmnotify
@dirrm share/doc/HTML/en/kcontrol/kcmlaunch
-@dirrm share/doc/HTML/en/kcontrol/kcmkonsole
@dirrm share/doc/HTML/en/kcontrol/kcmcss
+@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
-@dirrm share/doc/HTML/en/kcontrol/email
@dirrm share/doc/HTML/en/kcontrol/ebrowsing
-@dirrm share/doc/HTML/en/kcontrol/desktopbehavior
-@dirrm share/doc/HTML/en/kcontrol/desktop
-@dirrm share/doc/HTML/en/kcontrol/crypto
@dirrm share/doc/HTML/en/kcontrol/cookies
+@dirrm share/doc/HTML/en/kcontrol/componentchooser
@dirrm share/doc/HTML/en/kcontrol/cache
@dirrm share/doc/HTML/en/kcontrol/bookmarks
-@dirrm share/doc/HTML/en/kcontrol/background
+@dirrm share/doc/HTML/en/kcontrol/attica
@dirrm share/desktop-directories
@dirrm share/apps/phonon
-@dirrm share/apps/nepomukstrigiservice
-@dirrm share/apps/nepomukstorage
+%%NEPOMUK%%@dirrm share/apps/nepomukstrigiservice
+%%NEPOMUK%%@dirrm share/apps/nepomukstorage
@dirrm share/apps/libphonon
@dirrm share/apps/kwalletd
@dirrm share/apps/ksmserver/windowmanagers
@dirrm share/apps/ksmserver
@dirrm share/apps/konqueror/dirtree/remote
@dirrm share/apps/konqueror/dirtree
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/kio_thumbnail/pics
-@dirrm share/apps/kio_thumbnail
+@dirrmtry share/apps/konqsidebartng/virtual_folders/remote
@dirrm share/apps/kio_info
@dirrm share/apps/kio_finger
@dirrm share/apps/kio_docfilter
@@ -1833,11 +2052,14 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
@dirrm share/apps/khelpcenter/plugins/Manpages
@dirrm share/apps/khelpcenter/plugins/Applications
+@dirrm share/apps/kglobalaccel
@dirrm share/apps/kde
@dirrm share/apps/kcmlocale/pics
@dirrm share/apps/kcmlocale
@dirrm share/apps/kcm_phonon
@dirrm share/apps/drkonqi/pics
+@dirrm share/apps/drkonqi/debuggers/internal
+@dirrm share/apps/drkonqi/debuggers/external
@dirrm share/apps/drkonqi/debuggers
@dirrm share/apps/drkonqi
@dirrm share/apps/desktoptheme/oxygen/widgets
@@ -1845,7 +2067,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrm share/apps/desktoptheme/oxygen/opaque/dialogs
@dirrm share/apps/desktoptheme/oxygen/opaque
@dirrm share/apps/desktoptheme/oxygen/dialogs
-@dirrm share/apps/desktoptheme/oxygen
+@dirrmtry share/apps/desktoptheme/oxygen
@dirrm share/apps/desktoptheme/default/opaque/widgets
@dirrm share/apps/desktoptheme/default/opaque/dialogs
@dirrm share/apps/desktoptheme/default/opaque
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index d39a4c9b849d..2712af2474d6 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase-workspace
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -21,7 +20,8 @@ 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
+ xklavier.12:${PORTSDIR}/x11/libxklavier \
+ gps.19:${PORTSDIR}/astro/gpsd
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 \
@@ -34,8 +34,7 @@ RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
SUB_FILES= kdm
USE_RC_SUBR= kdm4
-USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 oxygen \
- kdeexp
+USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4 oxygen
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
@@ -60,10 +59,17 @@ CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
#PyKDE4, Xmms and Googlegadgets could be enabled,
#QEdje has not been ported yet.
-.include <bsd.port.pre.mk>
+OPTIONS= PLASMA_PYTHON "Support for plasmoids written in Python" off \
+ PLASMA_RUBY "Support for plasmoids written in Ruby" off
-.if ${ARCH} == "ia64"
-BROKEN= Segfaults on ia64
+.include <bsd.port.options.mk>
+
+.if defined(WITH_PLASMA_PYTHON)
+RUN_DEPENDS+= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:${PORTSDIR}/x11/plasma-scriptengine-python
+.endif
+
+.if defined(WITH_PLASMA_RUBY)
+RUN_DEPENDS+= ${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:${PORTSDIR}/x11/plasma-scriptengine-ruby
.endif
.if ${OSVERSION} < 800069
@@ -84,19 +90,16 @@ post-patch:
${CP} ${FILESDIR}/uptime.* ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/
pre-configure:
- ${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|'\
+ ${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\
- laptop/laptopclient.cpp modernsystem/modernsys.cpp\
+.for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp \
+ laptop/laptopclient.cpp modernsystem/modernsys.cpp \
redmond/redmond.cpp
- ${REINPLACE_CMD} -e 's|<qdrawutil.h>|<QtGui/qdrawutil.h>|'\
+ ${REINPLACE_CMD} -e 's|<qdrawutil.h>|<QtGui/qdrawutil.h>|' \
${PATCH_WRKSRC}/kwin/clients/${item}
.endfor
-.if ${OSVERSION} < 900004
- ${REINPLACE_CMD} -e 's|addToUtmp ""|addToUtmp "${LOCALBASE}/lib"|' \
- -e 's|(utempter.h|(${LOCALBASE}/include/utempter.h|' \
- ${PATCH_WRKSRC}/kwrited/CMakeLists.txt
-.endif
post-install:
${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \
@@ -107,4 +110,4 @@ post-install:
@${MV} ${PREFIX}/lib/kde4/libexec/kdm_greet ${PREFIX}/lib/kde4/libexec/kdm-bin_greet
@${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 050113393f27..0f60da74347a 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.3.5.tar.bz2) = a6d2771fcf841e5ca33edf524f60599e
-SHA256 (KDE/kdebase-workspace-4.3.5.tar.bz2) = 7985634ed1f87889bcd6613ef41127196df442017bf895be6fb2afb196ce149b
-SIZE (KDE/kdebase-workspace-4.3.5.tar.bz2) = 62525359
+MD5 (KDE/kdebase-workspace-4.4.3.tar.bz2) = c334e70b425cbae2efc5a7e7dda4365f
+SHA256 (KDE/kdebase-workspace-4.4.3.tar.bz2) = 7f56b2b12f2ca78deea31981bc47de2862d409d99b7bcda90054715d97999239
+SIZE (KDE/kdebase-workspace-4.4.3.tar.bz2) = 77035367
diff --git a/x11/kdebase4-workspace/files/patch-CVE-2010-0436 b/x11/kdebase4-workspace/files/patch-CVE-2010-0436
deleted file mode 100644
index bf7c664e3b9c..000000000000
--- a/x11/kdebase4-workspace/files/patch-CVE-2010-0436
+++ /dev/null
@@ -1,193 +0,0 @@
---- kdm/ConfigureChecks.cmake.orig 2009-05-27 21:53:40.000000000 +0200
-+++ kdm/ConfigureChecks.cmake 2010-04-14 13:39:40.198779887 +0200
-@@ -37,6 +37,35 @@
- }
- " HAVE_SETLOGIN)
-
-+check_c_source_runs("
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <errno.h>
-+int main()
-+{
-+ int fd, fd2;
-+ struct sockaddr_un sa;
-+
-+ if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
-+ return 2;
-+ sa.sun_family = AF_UNIX;
-+ strcpy(sa.sun_path, \"testsock\");
-+ unlink(sa.sun_path);
-+ if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)))
-+ return 2;
-+ chmod(sa.sun_path, 0);
-+ setuid(getuid() + 1000);
-+ if ((fd2 = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
-+ return 2;
-+ connect(fd2, (struct sockaddr *)&sa, sizeof(sa));
-+ return errno != EACCES;
-+}
-+" HONORS_SOCKET_PERMS)
-+
- # for config-kdm.h
- check_function_exists(seteuid HAVE_SETEUID)
-
---- kdm/backend/ctrl.c.orig 2009-03-18 10:59:20.000000000 +0100
-+++ kdm/backend/ctrl.c 2010-04-14 14:08:45.712067919 +0200
-@@ -78,7 +78,25 @@
- }
-
-
-+#ifdef HONORS_SOCKET_PERMS
- static CtrlRec ctrl = { 0, 0, -1, 0 };
-+#else
-+static CtrlRec ctrl = { 0, 0, 0, -1, 0 };
-+
-+static int mkTempDir( char *dir )
-+{
-+ int i, l = strlen( dir ) - 6;
-+
-+ for (i = 0; i < 100; i++) {
-+ randomStr( dir + l );
-+ if (!mkdir( dir, 0700 ))
-+ return True;
-+ if (errno != EEXIST)
-+ break;
-+ }
-+ return False;
-+}
-+#endif
-
- void
- openCtrl( struct display *d )
-@@ -112,22 +130,50 @@
- if (strlen( cr->path ) >= sizeof(sa.sun_path))
- logError( "path %\"s too long; no control sockets will be available\n",
- cr->path );
-- else if (mkdir( sockdir, 0755 ) && errno != EEXIST)
-+#ifdef HONORS_SOCKET_PERMS
-+ else if (mkdir( sockdir, 0700 ) && errno != EEXIST)
- logError( "mkdir %\"s failed; no control sockets will be available\n",
- sockdir );
-+ else if (unlink( cr->path ) && errno != ENOENT)
-+ logError( "unlink %\"s failed: %m; control socket will not be available\n",
-+ cr->path );
- else {
-- if (!d)
-- chown( sockdir, -1, fifoGroup );
-+#else
-+ else if (unlink( sockdir ) && errno != ENOENT)
-+ logError( "unlink %\"s failed: %m; control socket will not be available\n",
-+ sockdir );
-+ else if (!strApp( &cr->realdir, sockdir, "-XXXXXX", (char *)0))
-+ ;
-+ else if (!mkTempDir( cr->realdir )) {
-+ logError( "mkdir %\"s failed: %m; control socket will not be available\n",
-+ cr->realdir );
-+ free( cr->realdir );
-+ cr->realdir = 0;
-+ } else if (symlink( cr->realdir, sockdir )) {
-+ logError( "symlink %\"s => %\"s failed: %m; control socket will not be available\n",
-+ sockdir, cr->realdir );
-+ rmdir( cr->realdir );
-+ free( cr->realdir );
-+ cr->realdir = 0;
-+ } else {
-+ chown( sockdir, 0, d ? 0 : fifoGroup );
- chmod( sockdir, 0750 );
-+#endif
- if ((cr->fd = socket( PF_UNIX, SOCK_STREAM, 0 )) < 0)
- logError( "Cannot create control socket\n" );
- else {
-- unlink( cr->path );
- sa.sun_family = AF_UNIX;
- strcpy( sa.sun_path, cr->path );
- if (!bind( cr->fd, (struct sockaddr *)&sa, sizeof(sa) )) {
- if (!listen( cr->fd, 5 )) {
-+#ifdef HONORS_SOCKET_PERMS
-+ chmod( cr->path, 0660 );
-+ if (!d)
-+ chown( cr->path, -1, fifoGroup );
-+ chmod( sockdir, 0755 );
-+#else
- chmod( cr->path, 0666 );
-+#endif
- registerCloseOnFork( cr->fd );
- registerInput( cr->fd );
- free( sockdir );
-@@ -142,6 +188,14 @@
- close( cr->fd );
- cr->fd = -1;
- }
-+#ifdef HONORS_SOCKET_PERMS
-+ rmdir( sockdir );
-+#else
-+ unlink( sockdir );
-+ rmdir( cr->realdir );
-+ free( cr->realdir );
-+ cr->realdir = 0;
-+#endif
- }
- free( cr->path );
- cr->path = 0;
-@@ -162,7 +216,14 @@
- cr->fd = -1;
- unlink( cr->path );
- *strrchr( cr->path, '/' ) = 0;
-+#ifdef HONORS_SOCKET_PERMS
- rmdir( cr->path );
-+#else
-+ unlink( cr->path );
-+ rmdir( cr->realdir );
-+ free( cr->realdir );
-+ cr->realdir = 0;
-+#endif
- free( cr->path );
- cr->path = 0;
- while (cr->css) {
-@@ -176,12 +237,12 @@
- void
- chownCtrl( CtrlRec *cr, int uid )
- {
-- if (cr->path) {
-- char *ptr = strrchr( cr->path, '/' );
-- *ptr = 0;
-+ if (cr->path)
-+#ifdef HONORS_SOCKET_PERMS
- chown( cr->path, uid, -1 );
-- *ptr = '/';
-- }
-+#else
-+ chown( cr->realdir, uid, -1 );
-+#endif
- }
-
- void
---- kdm/backend/dm.h.orig 2008-11-19 11:18:06.000000000 +0100
-+++ kdm/backend/dm.h 2010-04-14 13:39:40.233775307 +0200
-@@ -232,6 +232,9 @@
- struct cmdsock *css; /* open connections */
-
- char *path; /* filename of the socket */
-+#ifndef HONORS_SOCKET_PERMS
-+ char *realdir; /* real dirname of the socket */
-+#endif
- int fd; /* fd of the socket */
- int gid; /* owner group of the socket */
- } CtrlRec;
---- kdm/config-kdm.h.cmake.orig 2009-05-27 21:53:40.000000000 +0200
-+++ kdm/config-kdm.h.cmake 2010-04-14 13:39:40.250772397 +0200
-@@ -129,6 +129,9 @@
- /* Define to 1 if the ck-connector library is found */
- #cmakedefine HAVE_CKCONNECTOR 1
-
-+/* Define to 1 if OS honors permission bits on socket inodes */
-+#cmakedefine HONORS_SOCKET_PERMS 1
-+
- /* $PATH defaults set by KDM */
- #cmakedefine KDM_DEF_USER_PATH "${KDM_DEF_USER_PATH}"
- #cmakedefine KDM_DEF_SYSTEM_PATH "${KDM_DEF_SYSTEM_PATH}"
diff --git a/x11/kdebase4-workspace/files/patch-ConfigureChecks.cmake b/x11/kdebase4-workspace/files/patch-ConfigureChecks.cmake
new file mode 100644
index 000000000000..ed8b60fb95c2
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-ConfigureChecks.cmake
@@ -0,0 +1,20 @@
+--- ./ConfigureChecks.cmake.orig 2009-11-21 12:44:36.000000000 +0300
++++ ./ConfigureChecks.cmake 2010-01-27 00:04:40.445046695 +0300
+@@ -16,16 +16,7 @@
+ endmacro(define_pam_service)
+
+ macro(install_pam_service APP)
+- string(TOUPPER KDE4_${APP}_PAM_SERVICE cvar)
+- install(CODE "
+- set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
+- if (NOT DESTDIR_VALUE)
+- exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS ${${cvar}} RETURN_VALUE ret)
+- if (NOT ret)
+- exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS -P ${${cvar}}-np)
+- endif (NOT ret)
+- endif (NOT DESTDIR_VALUE)
+- ")
++ message("Ignore installing pam service, FreeBSD has it already.")
+ endmacro(install_pam_service)
+
+ define_pam_service(KDM)
diff --git a/x11/kdebase4-workspace/files/patch-kdm-backend-dm.h b/x11/kdebase4-workspace/files/patch-kdm-backend-dm.h
deleted file mode 100644
index 3a7191ad9469..000000000000
--- a/x11/kdebase4-workspace/files/patch-kdm-backend-dm.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- kdm/backend/dm.h
-+++ kdm/backend/dm.h
-@@ -102,7 +102,6 @@
- # define Jmp_buf sigjmp_buf
- #endif
-
--#include <utmp.h>
- #ifdef HAVE_UTMPX
- # include <utmpx.h>
- # define STRUCTUTMP struct utmpx
-@@ -113,15 +112,16 @@
- # define ENDUTENT endutxent
- # define ut_time ut_tv.tv_sec
- #else
-+# include <utmp.h>
- # define STRUCTUTMP struct utmp
- # define UTMPNAME utmpname
- # define SETUTENT setutent
- # define GETUTENT getutent
- # define PUTUTLINE pututline
- # define ENDUTENT endutent
--#endif
--#ifndef HAVE_STRUCT_UTMP_UT_USER
--# define ut_user ut_name
-+# ifndef HAVE_STRUCT_UTMP_UT_USER
-+# define ut_user ut_name
-+# endif
- #endif
- #ifndef WTMP_FILE
- # ifdef _PATH_WTMPX
diff --git a/x11/kdebase4-workspace/files/patch-kdm-backend-sessreg.c b/x11/kdebase4-workspace/files/patch-kdm-backend-sessreg.c
deleted file mode 100644
index 5763008b2fbd..000000000000
--- a/x11/kdebase4-workspace/files/patch-kdm-backend-sessreg.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- kdm/backend/sessreg.c
-+++ kdm/backend/sessreg.c
-@@ -43,6 +43,13 @@
- # define NO_LASTLOG
- #endif
-
-+#ifdef __FreeBSD__
-+# include <sys/param.h>
-+# if __FreeBSD_version >= 900007
-+# define NO_LASTLOG
-+# endif
-+#endif
-+
- #ifndef NO_LASTLOG
- # ifdef HAVE_LASTLOG_H
- # include <lastlog.h>
-@@ -257,7 +264,6 @@
- close( utmp );
- }
- # else
-- UTMPNAME( UTMP_FILE );
- SETUTENT();
- PUTUTLINE( &ut_ent );
- ENDUTENT();
diff --git a/x11/kdebase4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp b/x11/kdebase4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp
deleted file mode 100644
index ec72475697a8..000000000000
--- a/x11/kdebase4-workspace/files/patch-ksplash-ksplashx-qpngio.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- ksplash/ksplashx/qpngio.cpp.orig 2008-01-05 00:55:38.000000000 +0100
-+++ ksplash/ksplashx/qpngio.cpp 2010-03-29 07:49:55.000000000 +0200
-@@ -151,7 +151,7 @@
- image.setColor( i, qRgba(c,c,c,0xff) );
- }
- if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
-- const int g = info_ptr->trans_values.gray;
-+ const int g = info_ptr->trans_color.gray;
- if (g < ncols) {
- image.setAlphaBuffer(true);
- image.setColor(g, image.color(g) & RGB_MASK);
-@@ -179,7 +179,7 @@
- info_ptr->palette[i].red,
- info_ptr->palette[i].green,
- info_ptr->palette[i].blue,
-- info_ptr->trans[i]
-+ info_ptr->trans_alpha[i]
- )
- );
- i++;
-@@ -307,9 +307,9 @@
- png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
- if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
- QRgb trans = 0xFF000000 | qRgb(
-- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
-- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
-- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
-+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
-+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
-+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
- for (uint y=0; y<height; y++) {
- for (uint x=0; x<info_ptr->width; x++) {
- if (((uint**)jt)[y][x] == trans) {
diff --git a/x11/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt b/x11/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
deleted file mode 100644
index d9b0efedd656..000000000000
--- a/x11/kdebase4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libs/ksysguard/processui/CMakeLists.txt.orig 2008-06-18 16:41:37.000000000 +0400
-+++ ./libs/ksysguard/processui/CMakeLists.txt 2008-06-28 13:56:54.000000000 +0400
-@@ -1,7 +1,7 @@
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../ ../processcore/)
-
--check_include_files(sys/ptrace.h HAVE_SYS_PTRACE_H)
-+check_include_files(signal.h HAVE_SYS_PTRACE_H)
- check_include_files(sys/endian.h HAVE_SYS_ENDIAN_H)
- check_include_files(byteswap.h HAVE_BYTESWAP_H)
-
diff --git a/x11/kdebase4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt b/x11/kdebase4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt
new file mode 100644
index 000000000000..158e9658b879
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt
@@ -0,0 +1,7 @@
+--- ./plasma/generic/scriptengines/CMakeLists.txt.orig 2009-09-16 15:41:05.000000000 +0400
++++ ./plasma/generic/scriptengines/CMakeLists.txt 2010-03-30 20:50:22.446950772 +0400
+@@ -1,4 +1,3 @@
+-add_subdirectory(ruby)
+
+ if(QT_QTWEBKIT_FOUND)
+ add_subdirectory(webkit)
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index e5cc8d272565..4de869873e21 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -30,17 +30,20 @@ bin/kwin_killer_helper
bin/kwin_rules_dialog
bin/kxkb
bin/plasma-desktop
+bin/plasma-netbook
bin/plasma-overlay
bin/plasmaengineexplorer
bin/plasmawallpaperviewer
bin/plasmoidviewer
bin/polkit-kde-authorization
bin/safestartkde
-bin/setscheduler
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.ksysguard.processlisthelper.conf
etc/ksysguarddrc
include/KDE/Plasma/Weather/Ion
include/KDE/Plasma/Weather/WeatherUtils
@@ -61,10 +64,10 @@ include/ksgrd/SensorClient.h
include/ksgrd/SensorManager.h
include/ksgrd/SensorShellAgent.h
include/ksgrd/SensorSocketAgent.h
-include/ksysguard/DisplayProcessDlg.h
include/ksysguard/KTextEditVT.h
include/ksysguard/ProcessFilter.h
include/ksysguard/ProcessModel.h
+include/ksysguard/ksignalplotter.h
include/ksysguard/ksysguardprocesslist.h
include/ksysguard/lsof.h
include/ksysguard/process.h
@@ -79,13 +82,6 @@ include/kwinxrenderutils.h
include/kworkspace/kdisplaymanager.h
include/kworkspace/kwindowlistmenu.h
include/kworkspace/kworkspace.h
-include/nepomuk/nepomukquery_export.h
-include/nepomuk/nepomukqueryclient_export.h
-include/nepomuk/query.h
-include/nepomuk/queryparser.h
-include/nepomuk/queryserviceclient.h
-include/nepomuk/result.h
-include/nepomuk/term.h
include/plasma/geolocation/geolocation_export.h
include/plasma/geolocation/geolocationprovider.h
include/plasma/weather/ion.h
@@ -110,6 +106,8 @@ include/solid/control/ifaces/networkinterface.h
include/solid/control/ifaces/networkmanager.h
include/solid/control/ifaces/networkserialinterface.h
include/solid/control/ifaces/powermanager.h
+include/solid/control/ifaces/remotecontrol.h
+include/solid/control/ifaces/remotecontrolmanager.h
include/solid/control/ifaces/wirednetworkinterface.h
include/solid/control/ifaces/wirelessaccesspoint.h
include/solid/control/ifaces/wirelessnetworkinterface.h
@@ -121,6 +119,9 @@ include/solid/control/networkipv4config.h
include/solid/control/networkmanager.h
include/solid/control/networkserialinterface.h
include/solid/control/powermanager.h
+include/solid/control/remotecontrol.h
+include/solid/control/remotecontrolbutton.h
+include/solid/control/remotecontrolmanager.h
include/solid/control/singletondefs.h
include/solid/control/solid_control_export.h
include/solid/control/wirednetworkinterface.h
@@ -132,7 +133,6 @@ include/systemsettingsview/MenuItem.h
include/systemsettingsview/MenuModel.h
include/systemsettingsview/MenuProxyModel.h
include/systemsettingsview/ModuleView.h
-include/systemsettingsview/ToolTipManager.h
include/systemsettingsview/systemsettingsview_export.h
include/taskmanager/abstractgroupableitem.h
include/taskmanager/abstractgroupingstrategy.h
@@ -151,6 +151,7 @@ lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets-%%KDE4_BUILD_TYPE%%.cmake
lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets.cmake
lib/kconf_update_bin/krdb_clearlibrarypath
lib/kconf_update_bin/kwin_update_default_rules
+lib/kconf_update_bin/kwin_update_tabbox_settings
lib/kconf_update_bin/kwin_update_window_settings
lib/kconf_update_bin/plasma-add-shortcut-to-menu
lib/kconf_update_bin/plasma-to-plasma-desktop
@@ -160,6 +161,7 @@ lib/kde4/icon_mode.so
lib/kde4/ion_bbcukmet.so
lib/kde4/ion_envcan.so
lib/kde4/ion_noaa.so
+lib/kde4/ion_wettercom.so
lib/kde4/kcm_access.so
lib/kde4/kcm_autostart.so
lib/kde4/kcm_bell.so
@@ -167,7 +169,6 @@ lib/kde4/kcm_clock.so
lib/kde4/kcm_colors.so
lib/kde4/kcm_desktopthemedetails.so
lib/kde4/kcm_display.so
-lib/kde4/kcm_energy.so
lib/kde4/kcm_fontinst.so
lib/kde4/kcm_fonts.so
lib/kde4/kcm_hotkeys.so
@@ -176,6 +177,7 @@ 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
lib/kde4/kcm_kwin4_effect_builtins.so
lib/kde4/kcm_kwincompositing.so
@@ -184,6 +186,7 @@ lib/kde4/kcm_kwindesktop.so
lib/kde4/kcm_kwinoptions.so
lib/kde4/kcm_kwinrules.so
lib/kde4/kcm_kwinscreenedges.so
+lib/kde4/kcm_kwintabbox.so
lib/kde4/kcm_launch.so
lib/kde4/kcm_pkk_authorization.so
lib/kde4/kcm_powerdevilconfig.so
@@ -194,12 +197,14 @@ 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_workspaceoptions.so
lib/kde4/kcm_xinerama.so
lib/kde4/kded_kephal.so
lib/kde4/kded_khotkeys.so
lib/kde4/kded_kwrited.so
-lib/kde4/kded_notificationitemwatcher.so
lib/kde4/kded_powerdevil.so
+lib/kde4/kded_randrmonitor.so
+lib/kde4/kded_statusnotifierwatcher.so
lib/kde4/kfontviewpart.so
lib/kde4/kgreet_classic.so
lib/kde4/kgreet_generic.so
@@ -207,52 +212,63 @@ lib/kde4/kgreet_winbind.so
lib/kde4/kio_fonts.so
lib/kde4/krunner_bookmarksrunner.so
lib/kde4/krunner_calculatorrunner.so
+lib/kde4/krunner_kill.so
lib/kde4/krunner_locations.so
lib/kde4/krunner_nepomuksearchrunner.so
lib/kde4/krunner_placesrunner.so
+lib/kde4/krunner_plasma-desktop.so
lib/kde4/krunner_powerdevil.so
lib/kde4/krunner_recentdocuments.so
lib/kde4/krunner_services.so
lib/kde4/krunner_sessions.so
lib/kde4/krunner_shell.so
+lib/kde4/krunner_solid.so
lib/kde4/krunner_webshortcuts.so
+lib/kde4/krunner_windows.so
lib/kde4/kstyle_keramik_config.so
+lib/kde4/kwin3_aurorae.so
lib/kde4/kwin3_b2.so
lib/kde4/kwin3_kde2.so
lib/kde4/kwin3_keramik.so
lib/kde4/kwin3_laptop.so
lib/kde4/kwin3_modernsys.so
lib/kde4/kwin3_oxygen.so
-lib/kde4/kwin3_ozone.so
lib/kde4/kwin3_plastik.so
lib/kde4/kwin3_quartz.so
lib/kde4/kwin3_redmond.so
+lib/kde4/kwin3_tabstrip.so
lib/kde4/kwin3_web.so
lib/kde4/kwin4_effect_builtins.so
+lib/kde4/kwin_aurorae_config.so
lib/kde4/kwin_b2_config.so
lib/kde4/kwin_kde2_config.so
lib/kde4/kwin_keramik_config.so
lib/kde4/kwin_modernsys_config.so
lib/kde4/kwin_oxygen_config.so
-lib/kde4/kwin_ozone_config.so
lib/kde4/kwin_plastik_config.so
lib/kde4/kwin_quartz_config.so
+lib/kde4/kwin_tabstrip_config.so
+lib/kde4/libexec/fontinst
+lib/kde4/libexec/fontinst_helper
+lib/kde4/libexec/fontinst_x11
lib/kde4/libexec/kcheckpass
lib/kde4/libexec/kcmdatetimehelper
lib/kde4/libexec/kdm-bin_config
lib/kde4/libexec/kdm-bin_greet
lib/kde4/libexec/kfontprint
-lib/kde4/libexec/kio_fonts_helper
lib/kde4/libexec/krootimage
lib/kde4/libexec/kscreenlocker
+lib/kde4/libexec/ksysguardprocesslist_helper
lib/kde4/libexec/polkit-kde-manager
lib/kde4/libexec/test_kcm_xinerama
+lib/kde4/plasma-geolocation-gps.so
lib/kde4/plasma-geolocation-ip.so
lib/kde4/plasma_animator_default.so
lib/kde4/plasma_applet_activitybar.so
lib/kde4/plasma_applet_battery.so
lib/kde4/plasma_applet_calendar.so
lib/kde4/plasma_applet_clock.so
+lib/kde4/plasma_applet_currentappcontrol.so
lib/kde4/plasma_applet_devicenotifier.so
lib/kde4/plasma_applet_dig_clock.so
lib/kde4/plasma_applet_icon.so
@@ -261,6 +277,7 @@ lib/kde4/plasma_applet_lockout.so
lib/kde4/plasma_applet_pager.so
lib/kde4/plasma_applet_panelspacer_internal.so
lib/kde4/plasma_applet_quicklaunch.so
+lib/kde4/plasma_applet_searchbox.so
lib/kde4/plasma_applet_simplelauncher.so
lib/kde4/plasma_applet_sm_cpu.so
lib/kde4/plasma_applet_sm_hdd.so
@@ -273,13 +290,25 @@ lib/kde4/plasma_applet_systemtray.so
lib/kde4/plasma_applet_tasks.so
lib/kde4/plasma_applet_trash.so
lib/kde4/plasma_applet_webbrowser.so
+lib/kde4/plasma_applet_windowlist.so
lib/kde4/plasma_appletscriptengine_dashboard.so
lib/kde4/plasma_appletscriptengine_webapplet.so
lib/kde4/plasma_containment_desktop.so
+lib/kde4/plasma_containment_netpanel.so
+lib/kde4/plasma_containment_newspaper.so
lib/kde4/plasma_containment_panel.so
+lib/kde4/plasma_containment_sal.so
lib/kde4/plasma_containment_saverdesktop.so
+lib/kde4/plasma_containmentactions_applauncher.so
+lib/kde4/plasma_containmentactions_contextmenu.so
+lib/kde4/plasma_containmentactions_minimalcontextmenu.so
+lib/kde4/plasma_containmentactions_paste.so
+lib/kde4/plasma_containmentactions_switchactivity.so
+lib/kde4/plasma_containmentactions_switchdesktop.so
+lib/kde4/plasma_containmentactions_switchwindow.so
lib/kde4/plasma_engine_akonadi.so
lib/kde4/plasma_engine_applicationjobs.so
+lib/kde4/plasma_engine_apps.so
lib/kde4/plasma_engine_calendar.so
lib/kde4/plasma_engine_dict.so
lib/kde4/plasma_engine_executable.so
@@ -296,6 +325,7 @@ lib/kde4/plasma_engine_nowplaying.so
lib/kde4/plasma_engine_places.so
lib/kde4/plasma_engine_powermanagement.so
lib/kde4/plasma_engine_rss.so
+lib/kde4/plasma_engine_searchlaunch.so
lib/kde4/plasma_engine_soliddevice.so
lib/kde4/plasma_engine_systemmonitor.so
lib/kde4/plasma_engine_tasks.so
@@ -305,9 +335,12 @@ lib/kde4/plasma_packagestructure_dashboard.so
lib/kde4/plasma_packagestructure_web.so
lib/kde4/plasma_wallpaper_color.so
lib/kde4/plasma_wallpaper_image.so
+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/solid_fakenet.so
+lib/kde4/solid_lirc.so
lib/kde4/solid_wicd.so
lib/libkdecorations.so
lib/libkdecorations.so.5
@@ -324,6 +357,7 @@ 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/libkephal.so
lib/libkephal.so.5
lib/libkephal.so.5.0.1
@@ -342,6 +376,9 @@ lib/libkscreensaver.so.5.0.0
lib/libksgrd.so
lib/libksgrd.so.5
lib/libksgrd.so.5.0.1
+lib/libksignalplotter.so
+lib/libksignalplotter.so.5
+lib/libksignalplotter.so.5.0.1
lib/libkwineffects.so
lib/libkwineffects.so.1
lib/libkwineffects.so.1.0.0
@@ -354,12 +391,6 @@ lib/libkworkspace.so.5.0.1
lib/liblsofui.so
lib/liblsofui.so.5
lib/liblsofui.so.5.0.1
-lib/libnepomukquery.so
-lib/libnepomukquery.so.5
-lib/libnepomukquery.so.5.0.1
-lib/libnepomukqueryclient.so
-lib/libnepomukqueryclient.so.5
-lib/libnepomukqueryclient.so.5.0.1
lib/libplasma-geolocation-interface.so
lib/libplasma-geolocation-interface.so.5
lib/libplasma-geolocation-interface.so.5.0.1
@@ -369,6 +400,9 @@ lib/libplasma_applet-system-monitor.so.5.0.1
lib/libplasmaclock.so
lib/libplasmaclock.so.5
lib/libplasmaclock.so.5.0.1
+lib/libplasmagenericshell.so
+lib/libplasmagenericshell.so.5
+lib/libplasmagenericshell.so.5.0.1
lib/libpolkitkdeprivate.so
lib/libpolkitkdeprivate.so.5
lib/libpolkitkdeprivate.so.5.0.1
@@ -385,16 +419,17 @@ lib/libsolidcontrolifaces.so
lib/libsolidcontrolifaces.so.5
lib/libsolidcontrolifaces.so.5.0.1
lib/libsystemsettingsview.so
+lib/libsystemsettingsview.so.1
lib/libtaskmanager.so
lib/libtaskmanager.so.5
lib/libtaskmanager.so.5.0.1
-lib/libtime_solar.so
-lib/libtime_solar.so.5
-lib/libtime_solar.so.5.0.1
lib/libweather_ion.so
lib/libweather_ion.so.5
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.ksysguard.processlisthelper.policy
share/applications/kde4/kfontview.desktop
share/applications/kde4/klipper.desktop
share/applications/kde4/kmenuedit.desktop
@@ -407,7 +442,6 @@ share/apps/cmake/modules/FindGooglegadgets.cmake
share/apps/cmake/modules/FindKephal.cmake
share/apps/cmake/modules/FindLibXKlavier.cmake
share/apps/cmake/modules/FindPAM.cmake
-share/apps/cmake/modules/FindPolkitQt.cmake
share/apps/cmake/modules/FindQEdje.cmake
share/apps/cmake/modules/FindSensors.cmake
share/apps/cmake/modules/PkgConfigGetVar.cmake
@@ -416,14 +450,21 @@ share/apps/color-schemes/Honeycomb.colors
share/apps/color-schemes/Norway.colors
share/apps/color-schemes/ObsidianCoast.colors
share/apps/color-schemes/Oxygen.colors
+share/apps/color-schemes/OxygenCold.colors
share/apps/color-schemes/Steel.colors
share/apps/color-schemes/WontonSoup.colors
+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/kaccess/kaccess.notifyrc
+share/apps/katepart/syntax/plasma-desktop-js.xml
share/apps/kcminput/cursor_large_black.pcf.gz
share/apps/kcminput/cursor_large_white.pcf.gz
share/apps/kcminput/cursor_small_white.pcf.gz
@@ -452,6 +493,7 @@ share/apps/kconf_update/kwin_focus2.sh
share/apps/kconf_update/kwin_focus2.upd
share/apps/kconf_update/kwin_fsp_workarounds_1.upd
share/apps/kconf_update/kwin_on_off.upd
+share/apps/kconf_update/kwin_update_tabbox_settings.upd
share/apps/kconf_update/kwin_window_shortcuts.sh
share/apps/kconf_update/kwin_window_shortcuts.upd
share/apps/kconf_update/kwiniconify.upd
@@ -566,7 +608,7 @@ 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/1280x800.jpg
+share/apps/kdm/themes/oxygen-air/1920x1200.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
@@ -614,6 +656,7 @@ share/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new.png
share/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new_sep.png
share/apps/kmenuedit/kmenueditui.rc
share/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+share/apps/kscreenlocker/kscreenlocker.notifyrc
share/apps/ksplash/Themes/Default/1024x768/background.png
share/apps/ksplash/Themes/Default/1280x1024/background.png
share/apps/ksplash/Themes/Default/1600x1200/background.png
@@ -643,6 +686,7 @@ 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/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
@@ -667,6 +711,8 @@ share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.png
share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
+share/apps/kwin/DefaultTabBoxLayouts.xml
+share/apps/kwin/aurorae.desktop
share/apps/kwin/b2.desktop
share/apps/kwin/circle-edgy.png
share/apps/kwin/circle.png
@@ -689,7 +735,6 @@ share/apps/kwin/lookingglass.frag
share/apps/kwin/lookingglass.vert
share/apps/kwin/modernsystem.desktop
share/apps/kwin/oxygenclient.desktop
-share/apps/kwin/ozoneclient.desktop
share/apps/kwin/plastik.desktop
share/apps/kwin/quartz.desktop
share/apps/kwin/redmond.desktop
@@ -700,9 +745,12 @@ share/apps/kwin/snow.frag
share/apps/kwin/snow.vert
share/apps/kwin/snowflake.png
share/apps/kwin/sphere.vert
+share/apps/kwin/tabstrip.desktop
share/apps/kwin/trackmouse.png
share/apps/kwin/web.desktop
share/apps/kwrited/kwrited.notifyrc
+share/apps/plasma-desktop/plasma-desktop.notifyrc
+share/apps/plasma-netbook/plasma-default-layoutrc
share/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
share/apps/plasma/dashboard/AppleClasses/AppleButton.js
share/apps/plasma/dashboard/AppleClasses/AppleInfoButton.js
@@ -711,12 +759,12 @@ share/apps/plasma/dashboard/AppleClasses/AppleScrollbar.js
share/apps/plasma/dashboard/AppleClasses/AppleSlider.js
share/apps/plasma/dashboard/button/genericButton.js
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/tasks.operations
-share/apps/plasma_scriptengine_ruby/applet.rb
-share/apps/plasma_scriptengine_ruby/data_engine.rb
share/apps/powerdevil/default.powerdevilprofiles
share/apps/powerdevil/powerdevil.notifyrc
share/apps/solid/actions/test-predicate-openinwindow.desktop
@@ -734,6 +782,7 @@ share/apps/solid/devices/solid-device-OpticalDrive.desktop
share/apps/solid/devices/solid-device-PortableMediaPlayer.desktop
share/apps/solid/devices/solid-device-Processor.desktop
share/apps/solid/devices/solid-device-SerialInterface.desktop
+share/apps/solid/devices/solid-device-SmartCardReader.desktop
share/apps/solid/devices/solid-device-StorageAccess.desktop
share/apps/solid/devices/solid-device-StorageDrive.desktop
share/apps/solid/devices/solid-device-StorageVolume.desktop
@@ -741,6 +790,7 @@ share/apps/solid/devices/solid-device-Video.desktop
share/apps/solidfakenetbackend/fakenetworking.xml
share/apps/systemsettings/classic/main.html
share/apps/systemsettings/classic/systemsettings-classic.css
+share/apps/systemsettings/systemsettings.kcfg
share/apps/systemsettings/systemsettingsui.rc
share/autostart/klipper.desktop
share/autostart/krunner.desktop
@@ -750,6 +800,7 @@ share/config.kcfg/klaunch.kcfg
share/config.kcfg/kscreensaversettings.kcfg
share/config.kcfg/kwin.kcfg
share/config.kcfg/plasma-shell-desktop.kcfg
+share/config/aurorae.knsrc
share/config/background.knsrc
share/config/colorschemes.knsrc
share/config/kdm.knsrc
@@ -767,7 +818,11 @@ share/dbus-1/interfaces/org.kde.krunner.App.xml
share/dbus-1/interfaces/org.kde.screensaver.xml
share/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
share/dbus-1/services/org.kde.PolicyKit.service
+share/dbus-1/services/org.kde.fontinst.service
share/dbus-1/services/org.kde.krunner.service
+share/dbus-1/system-services/org.kde.fontinst.service
+share/dbus-1/system-services/org.kde.kcontrol.kcmclock.service
+share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
share/doc/HTML/en/PolicyKit-kde/authdialog_1.png
share/doc/HTML/en/PolicyKit-kde/authdialog_2.png
share/doc/HTML/en/PolicyKit-kde/authdialog_3.png
@@ -795,14 +850,14 @@ share/doc/HTML/en/kcontrol/clock/index.docbook
share/doc/HTML/en/kcontrol/colors/common
share/doc/HTML/en/kcontrol/colors/index.cache.bz2
share/doc/HTML/en/kcontrol/colors/index.docbook
+share/doc/HTML/en/kcontrol/desktop/common
+share/doc/HTML/en/kcontrol/desktop/index.cache.bz2
+share/doc/HTML/en/kcontrol/desktop/index.docbook
+share/doc/HTML/en/kcontrol/desktopthemedetails/clicking-apply.png
share/doc/HTML/en/kcontrol/desktopthemedetails/common
-share/doc/HTML/en/kcontrol/desktopthemedetails/desktop-settings.png
+share/doc/HTML/en/kcontrol/desktopthemedetails/customizing.png
share/doc/HTML/en/kcontrol/desktopthemedetails/index.cache.bz2
share/doc/HTML/en/kcontrol/desktopthemedetails/index.docbook
-share/doc/HTML/en/kcontrol/desktopthemedetails/message.png
-share/doc/HTML/en/kcontrol/energy/common
-share/doc/HTML/en/kcontrol/energy/index.cache.bz2
-share/doc/HTML/en/kcontrol/energy/index.docbook
share/doc/HTML/en/kcontrol/fontinst/common
share/doc/HTML/en/kcontrol/fontinst/index.cache.bz2
share/doc/HTML/en/kcontrol/fontinst/index.docbook
@@ -843,6 +898,12 @@ share/doc/HTML/en/kcontrol/kwindecoration/common
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
+share/doc/HTML/en/kcontrol/kwinscreenedges/common
+share/doc/HTML/en/kcontrol/kwinscreenedges/index.cache.bz2
+share/doc/HTML/en/kcontrol/kwinscreenedges/index.docbook
+share/doc/HTML/en/kcontrol/kwintabbox/common
+share/doc/HTML/en/kcontrol/kwintabbox/index.cache.bz2
+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
@@ -858,6 +919,9 @@ share/doc/HTML/en/kcontrol/solid-actions/edit-action.png
share/doc/HTML/en/kcontrol/solid-actions/index.cache.bz2
share/doc/HTML/en/kcontrol/solid-actions/index.docbook
share/doc/HTML/en/kcontrol/solid-actions/main.png
+share/doc/HTML/en/kcontrol/solid-hardware/common
+share/doc/HTML/en/kcontrol/solid-hardware/index.cache.bz2
+share/doc/HTML/en/kcontrol/solid-hardware/index.docbook
share/doc/HTML/en/kcontrol/splashscreen/common
share/doc/HTML/en/kcontrol/splashscreen/get-new-theme.png
share/doc/HTML/en/kcontrol/splashscreen/index.cache.bz2
@@ -869,6 +933,9 @@ share/doc/HTML/en/kcontrol/windowbehaviour/index.docbook
share/doc/HTML/en/kcontrol/windowspecific/common
share/doc/HTML/en/kcontrol/windowspecific/index.cache.bz2
share/doc/HTML/en/kcontrol/windowspecific/index.docbook
+share/doc/HTML/en/kcontrol/workspaceoptions/common
+share/doc/HTML/en/kcontrol/workspaceoptions/index.cache.bz2
+share/doc/HTML/en/kcontrol/workspaceoptions/index.docbook
share/doc/HTML/en/kdm/common
share/doc/HTML/en/kdm/index.cache.bz2
share/doc/HTML/en/kdm/index.docbook
@@ -894,11 +961,11 @@ 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/common
-share/doc/HTML/en/plasma/favorite-widgets.png
-share/doc/HTML/en/plasma/index.cache.bz2
-share/doc/HTML/en/plasma/index.docbook
-share/doc/HTML/en/plasma/taskbar-settings.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
share/doc/HTML/en/systemsettings/common
share/doc/HTML/en/systemsettings/index.cache.bz2
share/doc/HTML/en/systemsettings/index.docbook
@@ -1699,7 +1766,6 @@ share/kde4/services/colors.desktop
share/kde4/services/desktop.desktop
share/kde4/services/desktopthemedetails.desktop
share/kde4/services/display.desktop
-share/kde4/services/energy.desktop
share/kde4/services/fontinst.desktop
share/kde4/services/fonts.desktop
share/kde4/services/fonts.protocol
@@ -1707,6 +1773,7 @@ share/kde4/services/fontthumbnail.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/kaccess.desktop
share/kde4/services/kcm_keyboard.desktop
share/kde4/services/kcm_pkk_authorization.desktop
@@ -1717,8 +1784,9 @@ share/kde4/services/kcmsmserver.desktop
share/kde4/services/kded/kephal.desktop
share/kde4/services/kded/khotkeys.desktop
share/kde4/services/kded/kwrited.desktop
-share/kde4/services/kded/notificationitemwatcher.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
@@ -1762,6 +1830,7 @@ share/kde4/services/kwin/mousemark.desktop
share/kde4/services/kwin/mousemark_config.desktop
share/kde4/services/kwin/presentwindows.desktop
share/kde4/services/kwin/presentwindows_config.desktop
+share/kde4/services/kwin/resize.desktop
share/kde4/services/kwin/scalein.desktop
share/kde4/services/kwin/shadow.desktop
share/kde4/services/kwin/shadow_config.desktop
@@ -1773,6 +1842,7 @@ share/kde4/services/kwin/showfps_config.desktop
share/kde4/services/kwin/showpaint.desktop
share/kde4/services/kwin/slide.desktop
share/kde4/services/kwin/slideback.desktop
+share/kde4/services/kwin/slidingpopups.desktop
share/kde4/services/kwin/snaphelper.desktop
share/kde4/services/kwin/snow.desktop
share/kde4/services/kwin/snow_config.desktop
@@ -1796,11 +1866,13 @@ share/kde4/services/kwinmoving.desktop
share/kde4/services/kwinoptions.desktop
share/kde4/services/kwinrules.desktop
share/kde4/services/kwinscreenedges.desktop
+share/kde4/services/kwintabbox.desktop
share/kde4/services/mouse.desktop
share/kde4/services/plasma-animator-default.desktop
share/kde4/services/plasma-applet-activitybar.desktop
share/kde4/services/plasma-applet-analogclock.desktop
share/kde4/services/plasma-applet-calendar.desktop
+share/kde4/services/plasma-applet-currentappcontrol.desktop
share/kde4/services/plasma-applet-devicenotifier.desktop
share/kde4/services/plasma-applet-digitalclock.desktop
share/kde4/services/plasma-applet-icon.desktop
@@ -1808,6 +1880,7 @@ share/kde4/services/plasma-applet-launcher.desktop
share/kde4/services/plasma-applet-lockout.desktop
share/kde4/services/plasma-applet-panelspacer-internal.desktop
share/kde4/services/plasma-applet-quicklaunch.desktop
+share/kde4/services/plasma-applet-searchbox.desktop
share/kde4/services/plasma-applet-simplelauncher.desktop
share/kde4/services/plasma-applet-sm_cpu.desktop
share/kde4/services/plasma-applet-sm_hdd.desktop
@@ -1819,11 +1892,23 @@ share/kde4/services/plasma-applet-system-monitor.desktop
share/kde4/services/plasma-applet-systemtray.desktop
share/kde4/services/plasma-applet-trash.desktop
share/kde4/services/plasma-applet-webbrowser.desktop
+share/kde4/services/plasma-applet-windowlist.desktop
share/kde4/services/plasma-battery-default.desktop
share/kde4/services/plasma-containment-desktop.desktop
+share/kde4/services/plasma-containment-netpanel.desktop
+share/kde4/services/plasma-containment-newspaper.desktop
share/kde4/services/plasma-containment-panel.desktop
+share/kde4/services/plasma-containment-sal.desktop
share/kde4/services/plasma-containment-saverdesktop.desktop
+share/kde4/services/plasma-containmentactions-applauncher.desktop
+share/kde4/services/plasma-containmentactions-contextmenu.desktop
+share/kde4/services/plasma-containmentactions-minimalcontextmenu.desktop
+share/kde4/services/plasma-containmentactions-paste.desktop
+share/kde4/services/plasma-containmentactions-switchactivity.desktop
+share/kde4/services/plasma-containmentactions-switchdesktop.desktop
+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-dict.desktop
share/kde4/services/plasma-dataengine-executable.desktop
@@ -1846,24 +1931,39 @@ share/kde4/services/plasma-dataengine-time.desktop
share/kde4/services/plasma-dataengine-weather.desktop
share/kde4/services/plasma-engine-akonadi.desktop
share/kde4/services/plasma-engine-metadata.desktop
+share/kde4/services/plasma-engine-searchlaunch.desktop
+share/kde4/services/plasma-geolocation-gps.desktop
share/kde4/services/plasma-geolocation-ip.desktop
share/kde4/services/plasma-packagestructure-dashboard.desktop
share/kde4/services/plasma-packagestructure-web.desktop
share/kde4/services/plasma-pager-default.desktop
share/kde4/services/plasma-runner-bookmarks.desktop
share/kde4/services/plasma-runner-calculator.desktop
+share/kde4/services/plasma-runner-kill.desktop
+share/kde4/services/plasma-runner-kill_config.desktop
share/kde4/services/plasma-runner-locations.desktop
share/kde4/services/plasma-runner-nepomuksearch.desktop
share/kde4/services/plasma-runner-places.desktop
+share/kde4/services/plasma-runner-plasma-desktop.desktop
share/kde4/services/plasma-runner-powerdevil.desktop
share/kde4/services/plasma-runner-services.desktop
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-windows.desktop
+share/kde4/services/plasma-sal-bookmarks.desktop
+share/kde4/services/plasma-sal-contacts.desktop
+share/kde4/services/plasma-sal-education.desktop
+share/kde4/services/plasma-sal-games.desktop
+share/kde4/services/plasma-sal-graphics.desktop
+share/kde4/services/plasma-sal-internet.desktop
+share/kde4/services/plasma-sal-multimedia.desktop
+share/kde4/services/plasma-sal-office.desktop
+share/kde4/services/plasma-sal-system.desktop
+share/kde4/services/plasma-sal-utility.desktop
share/kde4/services/plasma-scriptengine-applet-dashboard.desktop
share/kde4/services/plasma-scriptengine-applet-web.desktop
-share/kde4/services/plasma-scriptengine-ruby-applet.desktop
-share/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
share/kde4/services/plasma-tasks-default.desktop
share/kde4/services/plasma-wallpaper-color.desktop
share/kde4/services/plasma-wallpaper-image.desktop
@@ -1896,17 +1996,23 @@ share/kde4/services/settings-system.desktop
share/kde4/services/settings-window-behaviour.desktop
share/kde4/services/solid-actions.desktop
share/kde4/services/solidbackends/solid_fakenet.desktop
+share/kde4/services/solidbackends/solid_lirc.desktop
share/kde4/services/solidbackends/solid_wicd.desktop
share/kde4/services/standard_actions.desktop
share/kde4/services/style.desktop
+share/kde4/services/workspaceoptions.desktop
share/kde4/services/xinerama.desktop
share/kde4/servicetypes/kwineffect.desktop
share/kde4/servicetypes/plasma-geolocationprovider.desktop
+share/kde4/servicetypes/plasma-sal-menu.desktop
share/kde4/servicetypes/screensaver.desktop
+share/kde4/servicetypes/solid-device-type.desktop
share/kde4/servicetypes/solidbluetoothmanager.desktop
share/kde4/servicetypes/solidnetworkmanager.desktop
share/kde4/servicetypes/solidpowermanager.desktop
+share/kde4/servicetypes/solidremotecontrolmanager.desktop
share/kde4/servicetypes/systemsettingscategory.desktop
+share/kde4/servicetypes/systemsettingsexternalapp.desktop
share/kde4/servicetypes/systemsettingsview.desktop
share/sounds/pop.wav
share/wallpapers/Aghi/contents/images/1024x768.jpg
@@ -1928,16 +2034,6 @@ 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/Atra_Dot/contents/images/1024x768.jpg
-share/wallpapers/Atra_Dot/contents/images/1280x1024.jpg
-share/wallpapers/Atra_Dot/contents/images/1280x800.jpg
-share/wallpapers/Atra_Dot/contents/images/1440x900.jpg
-share/wallpapers/Atra_Dot/contents/images/1600x1200.jpg
-share/wallpapers/Atra_Dot/contents/images/1920x1080.jpg
-share/wallpapers/Atra_Dot/contents/images/1920x1200.jpg
-share/wallpapers/Atra_Dot/contents/images/800x600.jpg
-share/wallpapers/Atra_Dot/contents/screnshot.jpg
-share/wallpapers/Atra_Dot/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
@@ -1954,14 +2050,15 @@ 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/EOS/contents/images/1024x768.jpg
-share/wallpapers/EOS/contents/images/1280x1024.jpg
-share/wallpapers/EOS/contents/images/1280x800.jpg
-share/wallpapers/EOS/contents/images/1440x900.jpg
-share/wallpapers/EOS/contents/images/1600x1200.jpg
-share/wallpapers/EOS/contents/images/1920x1200.jpg
-share/wallpapers/EOS/contents/screenshot.png
-share/wallpapers/EOS/metadata.desktop
+share/wallpapers/Ethais/contents/images/1280x1024.png
+share/wallpapers/Ethais/contents/images/1280x800.png
+share/wallpapers/Ethais/contents/images/1366x768.png
+share/wallpapers/Ethais/contents/images/1440x900.png
+share/wallpapers/Ethais/contents/images/1600x1200.png
+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
@@ -1996,6 +2093,15 @@ 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/Media_Life/contents/images/1280x1024.jpg
+share/wallpapers/Media_Life/contents/images/1280x800.jpg
+share/wallpapers/Media_Life/contents/images/1440x900.jpg
+share/wallpapers/Media_Life/contents/images/1480x925.jpg
+share/wallpapers/Media_Life/contents/images/1600x1200.jpg
+share/wallpapers/Media_Life/contents/images/1680x1050.jpg
+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
@@ -2003,6 +2109,16 @@ share/wallpapers/Plasmalicious/contents/images/1600x1200.jpg
share/wallpapers/Plasmalicious/contents/images/1920x1200.jpg
share/wallpapers/Plasmalicious/contents/screenshot.png
share/wallpapers/Plasmalicious/metadata.desktop
+share/wallpapers/Quadros/contents/images/1024x768.jpg
+share/wallpapers/Quadros/contents/images/1280x1024.jpg
+share/wallpapers/Quadros/contents/images/1280x800.jpg
+share/wallpapers/Quadros/contents/images/1440x900.jpg
+share/wallpapers/Quadros/contents/images/1600x1200.jpg
+share/wallpapers/Quadros/contents/images/1920x1080.jpg
+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
@@ -2031,19 +2147,8 @@ 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/There_is_Rain_on_the_Table/contents/images/1024x768.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/images/1280x1024.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/images/1280x800.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/images/1440x900.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/images/1600x1200.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/images/1920x1200.jpg
-share/wallpapers/There_is_Rain_on_the_Table/contents/screenshot.png
-share/wallpapers/There_is_Rain_on_the_Table/metadata.desktop
share/wallpapers/default_blue.jpg
share/wallpapers/default_blue.jpg.desktop
-@dirrm share/wallpapers/There_is_Rain_on_the_Table/contents/images
-@dirrm share/wallpapers/There_is_Rain_on_the_Table/contents
-@dirrm share/wallpapers/There_is_Rain_on_the_Table
@dirrm share/wallpapers/The_Rings_of_Saturn/contents/images
@dirrm share/wallpapers/The_Rings_of_Saturn/contents
@dirrm share/wallpapers/The_Rings_of_Saturn
@@ -2053,9 +2158,15 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/wallpapers/Red_Leaf/contents/images
@dirrm share/wallpapers/Red_Leaf/contents
@dirrm share/wallpapers/Red_Leaf
+@dirrm share/wallpapers/Quadros/contents/images
+@dirrm share/wallpapers/Quadros/contents
+@dirrm share/wallpapers/Quadros
@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
@dirrm share/wallpapers/Fresh_Morning/contents/images
@dirrm share/wallpapers/Fresh_Morning/contents
@dirrm share/wallpapers/Fresh_Morning
@@ -2068,18 +2179,15 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/wallpapers/Evening/contents/images
@dirrm share/wallpapers/Evening/contents
@dirrm share/wallpapers/Evening
-@dirrm share/wallpapers/EOS/contents/images
-@dirrm share/wallpapers/EOS/contents
-@dirrm share/wallpapers/EOS
+@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
-@dirrm share/wallpapers/Atra_Dot/contents/images
-@dirrm share/wallpapers/Atra_Dot/contents
-@dirrm share/wallpapers/Atra_Dot
@dirrm share/wallpapers/Air/contents/images
@dirrm share/wallpapers/Air/contents
@dirrm share/wallpapers/Air
@@ -2088,7 +2196,6 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/wallpapers/Aghi
@dirrm share/kde4/services/solidbackends
@dirrm share/kde4/services/kwin
-@dirrm share/kde4/services/kded
@dirrm share/icons/Oxygen_Zion_Big/cursors
@dirrm share/icons/Oxygen_Zion_Big
@dirrm share/icons/Oxygen_Zion/cursors
@@ -2110,19 +2217,23 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/icons/Oxygen_Black/cursors
@dirrm share/icons/Oxygen_Black
@dirrm share/doc/HTML/en/systemsettings
-@dirrm share/doc/HTML/en/plasma
+@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/kdm
+@dirrm share/doc/HTML/en/kcontrol/workspaceoptions
@dirrm share/doc/HTML/en/kcontrol/windowspecific
@dirrm share/doc/HTML/en/kcontrol/windowbehaviour
@dirrm share/doc/HTML/en/kcontrol/splashscreen
+@dirrm share/doc/HTML/en/kcontrol/solid-hardware
@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/mouse
+@dirrm share/doc/HTML/en/kcontrol/kwintabbox
+@dirrm share/doc/HTML/en/kcontrol/kwinscreenedges
@dirrm share/doc/HTML/en/kcontrol/kwindecoration
@dirrm share/doc/HTML/en/kcontrol/kwincompositing
@dirrm share/doc/HTML/en/kcontrol/keys
@@ -2134,8 +2245,8 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/doc/HTML/en/kcontrol/joystick
@dirrm share/doc/HTML/en/kcontrol/fonts
@dirrm share/doc/HTML/en/kcontrol/fontinst
-@dirrm share/doc/HTML/en/kcontrol/energy
@dirrm share/doc/HTML/en/kcontrol/desktopthemedetails
+@dirrm share/doc/HTML/en/kcontrol/desktop
@dirrm share/doc/HTML/en/kcontrol/colors
@dirrm share/doc/HTML/en/kcontrol/clock
@dirrm share/doc/HTML/en/kcontrol/bell
@@ -2146,10 +2257,11 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/solidfakenetbackend
@dirrm share/apps/solid/devices
@dirrm share/apps/powerdevil
-@dirrm share/apps/plasma_scriptengine_ruby
@dirrm share/apps/plasma/dashboard/button
@dirrm share/apps/plasma/dashboard/AppleClasses
@dirrm share/apps/plasma/dashboard
+@dirrmtry share/apps/plasma-netbook
+@dirrmtry share/apps/plasma-desktop
@dirrm share/apps/kwrited
@dirrm share/apps/kwin/default_rules
@dirrm share/apps/kthememanager/themes/YellowOnBlue-big
@@ -2166,6 +2278,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
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/Themes/SimpleSmall
@dirrm share/apps/ksplash/Themes/Simple
@@ -2179,6 +2292,7 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/ksplash/Themes/Default
@dirrm share/apps/ksplash/Themes
@dirrm share/apps/ksplash
+@dirrm share/apps/kscreenlocker
@dirrm share/apps/kmenuedit/icons/oxygen/32x32/actions
@dirrm share/apps/kmenuedit/icons/oxygen/32x32
@dirrm share/apps/kmenuedit/icons/oxygen/22x22/actions
@@ -2215,8 +2329,11 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/doc
@dirrm share/apps/desktoptheme/default/system-monitor
@dirrm share/apps/desktoptheme/default/calendar
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
+@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
@dirrm include/taskmanager
@@ -2228,7 +2345,6 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm include/plasma/weather
@dirrm include/plasma/geolocation
@dirrmtry include/plasma
-@dirrmtry include/nepomuk
@dirrm include/kworkspace
@dirrm include/ksysguard
@dirrm include/ksgrd
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index fd3215bc754e..eb86e7804ea1 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -30,7 +29,7 @@ QT_COMPONENTS= corelib opengl dbus qt3support \
qmake_build moc_build rcc_build uic_build
USE_GETTEXT= yes
-USE_KDE4= kdelibs workspace kdeprefix kdehier automoc4
+USE_KDE4= kdelibs kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
MAKE_JOBS_SAFE= yes
@@ -38,23 +37,25 @@ 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 \
kfind.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${OSVERSION} < 800069
LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
.endif
-post-patch:
-.if ${OSVERSION} > 800090
- @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-libusb20
-.endif
-.if ${OSVERSION} >= 800100
- @${REINPLACE_CMD} -e 's,usb_revision.h,usbdi.h,g' \
- ${PATCH_WRKSRC}/apps/kinfocenter/usbview/usbdevices.h
+.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.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index b9e3be5ff46d..4b189887e082 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-4.3.5.tar.bz2) = 8780164dc328992cfbd9a6d5c9e8a8f5
-SHA256 (KDE/kdebase-4.3.5.tar.bz2) = 2f2d4881face2e55a8b86c841a6d9ad438cfa5f7dfa58010e53c86f2dd1b1513
-SIZE (KDE/kdebase-4.3.5.tar.bz2) = 4151612
+MD5 (KDE/kdebase-4.4.3.tar.bz2) = 034eaeaafc1fb0c48fc54336283891ce
+SHA256 (KDE/kdebase-4.4.3.tar.bz2) = 4fc9b7aea066675f3e96ab3641bef5217e6af380ff2deb8f6f4f5f9a03ad4d95
+SIZE (KDE/kdebase-4.4.3.tar.bz2) = 4052525
diff --git a/x11/kdebase4/files/extra-patch-libusb20 b/x11/kdebase4/files/extra-patch-libusb20
deleted file mode 100644
index 18f4782c4506..000000000000
--- a/x11/kdebase4/files/extra-patch-libusb20
+++ /dev/null
@@ -1,193 +0,0 @@
-diff -u -r ./apps/kinfocenter/usbview/CMakeLists.txt ./apps/kinfocenter/usbview/CMakeLists.txt
---- ./apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:54:55.000000000 +0200
-+++ ./apps/kinfocenter/usbview/CMakeLists.txt 2009-06-07 10:55:58.000000000 +0200
-@@ -9,7 +9,7 @@
- kde4_add_plugin(kcm_usb ${kcm_usb_PART_SRCS})
-
-
--target_link_libraries(kcm_usb ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
-+target_link_libraries(kcm_usb ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} -lusb)
-
- install(TARGETS kcm_usb DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-diff -u -r ./apps/kinfocenter/usbview/usbdevices.cpp ./apps/kinfocenter/usbview/usbdevices.cpp
---- ./apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:54:55.000000000 +0200
-+++ ./apps/kinfocenter/usbview/usbdevices.cpp 2009-06-07 10:55:58.000000000 +0200
-@@ -294,17 +294,25 @@
-
- /*
- * FreeBSD support by Markus Brueffer <markus@brueffer.de>
-+ * libusb20 support by Hans Petter Selasky <hselasky@freebsd.org>
- *
- * Basic idea and some code fragments were taken from FreeBSD's usbdevs(8),
- * originally developed for NetBSD, so this code should work with no or
- * only little modification on NetBSD.
- */
-
--void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent)
-+void USBDevice::collectData(struct libusb20_backend *pbe,
-+ struct libusb20_device *pdev)
- {
-+ char tempbuf[32];
-+ struct usb_device_info di;
-+
-+ if (libusb20_dev_get_info(pdev, &di))
-+ memset(&di, 0, sizeof(di));
-+
- // determine data for this device
-- _level = level;
-- _parent = parent;
-+ _level = 0;
-+ _parent = 0;
-
- _bus = di.udi_bus;
- _device = di.udi_addr;
-@@ -320,88 +328,47 @@
- _power = di.udi_power;
- _channels = di.udi_nports;
-
-- // determine the speed
--#if defined(__DragonFly__) || (defined(Q_OS_FREEBSD) && __FreeBSD_version > 490102) || defined(Q_OS_NETBSD)
- switch (di.udi_speed) {
- case USB_SPEED_LOW: _speed = 1.5; break;
- case USB_SPEED_FULL: _speed = 12.0; break;
- case USB_SPEED_HIGH: _speed = 480.0; break;
-+ case USB_SPEED_VARIABLE: _speed = 480.0; break;
-+ case USB_SPEED_SUPER: _speed = 4800.0; break;
-+ default: _speed = 480.0; break;
- }
--#else
-- _speed = di.udi_lowspeed ? 1.5 : 12.0;
--#endif
-
- // Get all attached devicenodes
-- for ( int i = 0; i < USB_MAX_DEVNAMES; ++i )
-- if ( di.udi_devnames[i][0] )
-- _devnodes << di.udi_devnames[i];
-+ for ( int i = 0; i < 32; ++i ) {
-+ if (libusb20_dev_get_iface_desc(
-+ pdev, i, tempbuf, sizeof(tempbuf)) == 0) {
-+ _devnodes << tempbuf;
-+ } else {
-+ break;
-+ }
-+ }
-
- // For compatibility, split the revision number
- sscanf( di.udi_release, "%x.%x", &_revMajor, &_revMinor );
--
-- // Cycle through the attached devices if there are any
-- for ( int p = 0; p < di.udi_nports; ++p ) {
-- // Get data for device
-- struct usb_device_info di2;
--
-- di2.udi_addr = di.udi_ports[p];
--
-- if ( di2.udi_addr >= USB_MAX_DEVICES )
-- continue;
--
-- if ( ioctl(fd, USB_DEVICEINFO, &di2) == -1 )
-- continue;
--
-- // Only add the device if we didn't detect it, yet
-- if (!find( di2.udi_bus, di2.udi_addr ) )
-- {
-- USBDevice *device = new USBDevice();
-- device->collectData( fd, level + 1, di2, di.udi_addr );
-- }
-- }
- }
-
- bool USBDevice::parse(const QString &fname)
- {
- static bool showErrorMessage = true;
-- bool error = false;
-+ struct libusb20_backend *pbe;
-+ struct libusb20_device *pdev;
- _devices.clear();
-
-- QFile controller("/dev/usb0");
-- int i = 1;
-- while ( controller.exists() )
-- {
-- // If the devicenode exists, continue with further inspection
-- if ( controller.open(QIODevice::ReadOnly) )
-- {
-- for ( int addr = 1; addr < USB_MAX_DEVICES; ++addr )
-- {
-- struct usb_device_info di;
--
-- di.udi_addr = addr;
-- if ( ioctl(controller.handle(), USB_DEVICEINFO, &di) != -1 )
-- {
-- if (!find( di.udi_bus, di.udi_addr ) )
-- {
-- USBDevice *device = new USBDevice();
-- device->collectData( controller.handle(), 0, di, 0);
-- }
-- }
-- }
-- controller.close();
--#ifndef Q_OS_NETBSD
-- } else {
-- error = true;
--#endif
-- }
-- controller.setFileName( QString::fromLocal8Bit("/dev/usb%1").arg(i++) );
-+ pbe = libusb20_be_alloc_default();
-+ if (pbe == NULL)
-+ return (false);
-+
-+ pdev = NULL;
-+
-+ while ((pdev = libusb20_be_device_foreach(pbe, pdev))) {
-+ USBDevice *device = new USBDevice();
-+ device->collectData(pbe, pdev);
- }
--
-- if ( showErrorMessage && error ) {
-- showErrorMessage = false;
-- KMessageBox::error( 0, i18n("Could not open one or more USB controller. Make sure, you have read access to all USB controllers that should be listed here."));
-- }
--
-+ libusb20_be_free(pbe);
- return true;
- }
- #endif
-diff -u -r ./apps/kinfocenter/usbview/usbdevices.h ./apps/kinfocenter/usbview/usbdevices.h
---- ./apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:54:55.000000000 +0200
-+++ ./apps/kinfocenter/usbview/usbdevices.h 2009-06-07 10:59:11.000000000 +0200
-@@ -14,18 +14,11 @@
- #include <QList>
- #include <QString>
-
--#if defined(__DragonFly__)
--#include <bus/usb/usb.h>
--#include <QStringList>
--#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
- #include <sys/param.h>
--#if __FreeBSD_version >= 800061
--#include <legacy/dev/usb/usb.h>
--#else
--#include <dev/usb/usb.h>
--#endif
-+#include <libusb20.h>
-+#include <dev/usb/usb_ioctl.h>
-+#include <dev/usb/usb_revision.h>
- #include <QStringList>
--#endif
-
- class USBDB;
-
-@@ -81,10 +74,8 @@
-
- unsigned int _vendorID, _prodID, _revMajor, _revMinor;
-
--#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-- void collectData( int fd, int level, usb_device_info &di, int parent );
-+ void collectData(struct libusb20_backend *, struct libusb20_device *);
- QStringList _devnodes;
--#endif
- };
-
- #endif
diff --git a/x11/kdebase4/files/patch-apps-konsole-src-ProcessInfo.cpp b/x11/kdebase4/files/patch-apps-konsole-src-ProcessInfo.cpp
deleted file mode 100644
index 34dd2af1bd30..000000000000
--- a/x11/kdebase4/files/patch-apps-konsole-src-ProcessInfo.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
---- apps/konsole/src/ProcessInfo.cpp.orig 2009-04-15 12:25:25.000000000 +0200
-+++ apps/konsole/src/ProcessInfo.cpp 2009-08-14 03:00:37.000000000 +0200
-@@ -27,6 +27,14 @@
- #include <unistd.h>
- #include <pwd.h>
-
-+// FreeBSD
-+#ifdef Q_OS_FREEBSD
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#include <libutil.h>
-+#endif
-+
- // Qt
- #include <KDebug>
- #include <QtCore/QDir>
-@@ -657,6 +665,120 @@
- }
- } ;
-
-+#ifdef Q_OS_FREEBSD
-+class FreeBSDProcessInfo : public UnixProcessInfo
-+{
-+public:
-+ FreeBSDProcessInfo(int pid, bool readEnvironment)
-+ : UnixProcessInfo(pid,readEnvironment)
-+ {
-+ }
-+private:
-+ virtual bool readProcInfo(int pid)
-+ {
-+ struct kinfo_proc *kip;
-+ int name[4];
-+ size_t len;
-+
-+ name[0] = CTL_KERN;
-+ name[1] = KERN_PROC;
-+ name[2] = KERN_PROC_PID;
-+ name[3] = pid;
-+
-+ len = 0;
-+ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0)
-+ return false;
-+
-+ kip = static_cast<struct kinfo_proc*>(malloc(len));
-+ if (kip == NULL)
-+ return false;
-+
-+ if (sysctl(name, 4, kip, &len, NULL, 0) < 0) {
-+ free(kip);
-+ return false;
-+ }
-+
-+ if (len != sizeof(*kip) || (kip->ki_structsize != sizeof(*kip)) || (kip->ki_pid != pid)) {
-+ free(kip);
-+ return false;
-+ }
-+
-+ setParentPid(kip->ki_ppid);
-+ setForegroundPid(kip->ki_pgid);
-+ setName(kip->ki_comm);
-+ setPid(pid);
-+
-+ setUserId(kip->ki_uid);
-+ readUserName();
-+
-+ free(kip);
-+
-+ return true;
-+ }
-+
-+ virtual bool readArguments(int pid)
-+ {
-+ char args[ARG_MAX];
-+ int name[4];
-+ size_t len;
-+
-+ name[0] = CTL_KERN;
-+ name[1] = KERN_PROC;
-+ name[2] = KERN_PROC_ARGS;
-+ name[3] = pid;
-+
-+ len = sizeof(args);
-+ if (sysctl(name, 4, args, &len, NULL, 0) < 0);
-+ return false;
-+
-+ for (char *cp = args; cp < args + len; cp += strlen(cp) + 1)
-+ addArgument(QString(cp));
-+
-+ return true;
-+ }
-+
-+ virtual bool readEnvironment(int /*pid*/)
-+ {
-+ // Not supported in FreeBSD
-+ return true;
-+ }
-+
-+ virtual bool readCurrentDir(int pid)
-+ {
-+ struct kinfo_file *kif;
-+ int count;
-+
-+ kif = kinfo_getfile(pid, &count);
-+ if (kif == NULL)
-+ return false;
-+
-+ for (int i = 0; i < count; i++) {
-+ if (kif[i].kf_fd == KF_FD_TYPE_CWD) {
-+ QFileInfo info(QString(kif[i].kf_path));
-+ free(kif);
-+
-+ const bool readable = info.isReadable();
-+
-+ if (readable) {
-+ if(info.isSymLink())
-+ setCurrentDir(info.symLinkTarget());
-+ else
-+ setCurrentDir(info.filePath());
-+ return true;
-+ } else {
-+ if (!readable)
-+ setError(PermissionsError);
-+ else
-+ setError(UnknownError);
-+
-+ return false;
-+ }
-+ }
-+ }
-+ }
-+};
-+#endif
-+
- SSHProcessInfo::SSHProcessInfo(const ProcessInfo& process)
- : _process(process)
- {
-@@ -802,6 +924,8 @@
- return new LinuxProcessInfo(pid,enableEnvironmentRead);
- #elif defined(Q_OS_SOLARIS)
- return new SolarisProcessInfo(pid,enableEnvironmentRead);
-+#elif defined(Q_OS_FREEBSD)
-+ return new FreeBSDProcessInfo(pid,enableEnvironmentRead);
- #else
- return new NullProcessInfo(pid,enableEnvironmentRead);
- #endif
diff --git a/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h b/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h
deleted file mode 100644
index 57c5437c6ff9..000000000000
--- a/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./apps/kinfocenter/usbview/usbdevices.h.orig 2008-10-17 03:00:14.000000000 -0800
-+++ ./apps/kinfocenter/usbview/usbdevices.h 2009-03-01 21:01:18.000000000 -0900
-@@ -18,7 +18,12 @@
- #include <bus/usb/usb.h>
- #include <QStringList>
- #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-+#include <sys/param.h>
-+#if __FreeBSD_version >= 800061
-+#include <legacy/dev/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
- #include <QStringList>
- #endif
-
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index de7d863ec5d6..3d30d89c622b 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -13,10 +13,14 @@ bin/konsoleprofile
bin/kwrite
bin/nspluginscan
bin/nspluginviewer
+bin/servicemenudeinstallation
+bin/servicemenuinstallation
include/knewmenu.h
include/konq_dndpopupmenuplugin.h
include/konq_events.h
include/konq_fileitemcapabilities.h
+include/konq_historyentry.h
+include/konq_historyprovider.h
include/konq_menuactions.h
include/konq_operations.h
include/konq_popupmenu.h
@@ -24,8 +28,10 @@ include/konq_popupmenuinformation.h
include/konq_popupmenuplugin.h
include/konqmimedata.h
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
@@ -55,8 +61,8 @@ lib/kde4/konq_shellcmdplugin.so
lib/kde4/konq_sidebar.so
lib/kde4/konq_sidebartree_bookmarks.so
lib/kde4/konq_sidebartree_dirtree.so
-lib/kde4/konq_sidebartree_history.so
lib/kde4/konq_sound.so
+lib/kde4/konqsidebar_history.so
lib/kde4/konqsidebar_tree.so
lib/kde4/konqsidebar_web.so
lib/kde4/libkcminit_nsplugins.so
@@ -97,6 +103,7 @@ share/applications/kde4/konqbrowser.desktop
share/applications/kde4/konquerorsu.desktop
share/applications/kde4/konsole.desktop
share/applications/kde4/kwrite.desktop
+share/apps/dolphin/dolphinsearchcommands.desktop
share/apps/dolphin/dolphinui.rc
share/apps/dolphinpart/dolphinpart.rc
share/apps/dolphinpart/kpartplugins/kshellcmdplugin.desktop
@@ -336,9 +343,7 @@ 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
-share/apps/kconf_update/konqsidebartng.upd
share/apps/kconf_update/move_favicons.sh
-share/apps/kconf_update/move_konqsidebartng_entries.sh
share/apps/kcontrol/pics/onlyone.png
share/apps/kcontrol/pics/overlapping.png
share/apps/kdm/pics/users/Blackbox.png
@@ -354,20 +359,18 @@ 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/about/top-right-kinfocenter.png
share/apps/kinfocenter/kinfocenterui.rc
-share/apps/konqsidebartng/add/virtualfolderadd.desktop
-share/apps/konqsidebartng/add/webmodule_add.desktop
share/apps/konqsidebartng/dirtree/bookmarks_module.desktop
share/apps/konqsidebartng/dirtree/dirtree_module.desktop
-share/apps/konqsidebartng/dirtree/history_module.desktop
-share/apps/konqsidebartng/entries/.version
share/apps/konqsidebartng/entries/bookmarks.desktop
share/apps/konqsidebartng/entries/history.desktop
share/apps/konqsidebartng/entries/home.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_tree.desktop
+share/apps/konqsidebartng/plugins/konqsidebar_web.desktop
share/apps/konqsidebartng/virtual_folders/remote/.directory
share/apps/konqsidebartng/virtual_folders/remote/ftp/.directory
share/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop
@@ -378,7 +381,6 @@ share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
share/apps/konqsidebartng/virtual_folders/services/.directory
share/apps/konqsidebartng/virtual_folders/services/applications.desktop
-share/apps/konqsidebartng/websidebar/websidebar.html
share/apps/konqueror/about/box-centre-konqueror.png
share/apps/konqueror/about/intro.html
share/apps/konqueror/about/konq.css
@@ -419,6 +421,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/kwrite/kwriteui.rc
share/apps/plugin/nspluginpart.rc
share/autostart/konqy_preload.desktop
@@ -427,11 +431,13 @@ share/config.kcfg/dolphin_detailsmodesettings.kcfg
share/config.kcfg/dolphin_directoryviewpropertysettings.kcfg
share/config.kcfg/dolphin_generalsettings.kcfg
share/config.kcfg/dolphin_iconsmodesettings.kcfg
+share/config.kcfg/dolphin_versioncontrolsettings.kcfg
share/config.kcfg/kcm_useraccount.kcfg
share/config.kcfg/kcm_useraccount_pass.kcfg
share/config.kcfg/keditbookmarks.kcfg
share/config.kcfg/konqueror.kcfg
-share/config/konqsidebartng.rc
+share/config/konqsidebartngrc
+share/config/servicemenu.knsrc
share/dbus-1/interfaces/org.kde.FavIcon.xml
share/dbus-1/interfaces/org.kde.Konqueror.Main.xml
share/dbus-1/interfaces/org.kde.Konqueror.MainWindow.xml
@@ -441,24 +447,20 @@ share/dbus-1/interfaces/org.kde.nsplugins.CallBack.xml
share/dbus-1/interfaces/org.kde.nsplugins.class.xml
share/dbus-1/interfaces/org.kde.nsplugins.instance.xml
share/dbus-1/interfaces/org.kde.nsplugins.viewer.xml
-share/doc/HTML/en/dolphin/bookmarkbutton.png
-share/doc/HTML/en/dolphin/bookmarksidebar.png
-share/doc/HTML/en/dolphin/breadcrumb.png
-share/doc/HTML/en/dolphin/browsebutton.png
share/doc/HTML/en/dolphin/common
-share/doc/HTML/en/dolphin/configurationwindow.png
-share/doc/HTML/en/dolphin/configurationwindow2.png
-share/doc/HTML/en/dolphin/configurationwindow3.png
-share/doc/HTML/en/dolphin/directorypath.png
-share/doc/HTML/en/dolphin/dolphin.png
-share/doc/HTML/en/dolphin/hiddenfolder.png
+share/doc/HTML/en/dolphin/default-ui.png
share/doc/HTML/en/dolphin/index.cache.bz2
share/doc/HTML/en/dolphin/index.docbook
-share/doc/HTML/en/dolphin/informationsidebar.png
-share/doc/HTML/en/dolphin/split.png
-share/doc/HTML/en/dolphin/systemmediadirectory.png
-share/doc/HTML/en/dolphin/toolbarbuttons.png
-share/doc/HTML/en/dolphin/workspacebuttons.png
+share/doc/HTML/en/dolphin/locationbar-breadcrumb.png
+share/doc/HTML/en/dolphin/locationbar-editable.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
+share/doc/HTML/en/dolphin/preferences-trash.png
+share/doc/HTML/en/dolphin/preferences-viewmodes-icons.png
+share/doc/HTML/en/dolphin/toolbar-navigation.png
+share/doc/HTML/en/dolphin/toolbar-view-appearance.png
+share/doc/HTML/en/dolphin/viewproperties-dialog.png
share/doc/HTML/en/kdepasswd/common
share/doc/HTML/en/kdepasswd/index.cache.bz2
share/doc/HTML/en/kdepasswd/index.docbook
@@ -482,6 +484,7 @@ 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
@@ -497,9 +500,6 @@ 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/pcmcia/common
-share/doc/HTML/en/kinfocenter/pcmcia/index.cache.bz2
-share/doc/HTML/en/kinfocenter/pcmcia/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
@@ -518,6 +518,9 @@ 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
@@ -541,6 +544,7 @@ share/doc/HTML/en/konqueror/man-kbookmarkmerger.1.docbook
share/doc/HTML/en/konqueror/parts.png
share/doc/HTML/en/konqueror/path-complete.docbook
share/doc/HTML/en/konqueror/plugins.docbook
+share/doc/HTML/en/konqueror/reset.png
share/doc/HTML/en/konqueror/save-settings.docbook
share/doc/HTML/en/konqueror/shortcut1.png
share/doc/HTML/en/konqueror/shortcut2.png
@@ -776,6 +780,7 @@ 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
@@ -805,7 +810,6 @@ share/kde4/services/konq_aboutpage.desktop
share/kde4/services/konq_sidebartng.desktop
share/kde4/services/konqueror.desktop
share/kde4/services/konsolepart.desktop
-share/kde4/services/lanbrowser.desktop
share/kde4/services/netpref.desktop
share/kde4/services/nic.desktop
share/kde4/services/opengl.desktop
@@ -843,6 +847,7 @@ share/kde4/services/useragentstrings/safari32.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
@@ -873,6 +878,7 @@ share/templates/linkFloppy.desktop
share/templates/linkHD.desktop
share/templates/linkMO.desktop
share/templates/linkNFS.desktop
+share/templates/linkPath.desktop
share/templates/linkProgram.desktop
share/templates/linkURL.desktop
share/templates/linkZIP.desktop
@@ -881,13 +887,13 @@ share/templates/linkZIP.desktop
@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/pcmcia
@dirrm share/doc/HTML/en/kinfocenter/pci
@dirrm share/doc/HTML/en/kinfocenter/partitions
@dirrm share/doc/HTML/en/kinfocenter/opengl
@@ -903,17 +909,18 @@ share/templates/linkZIP.desktop
@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
@dirrm share/apps/konsole
@dirrm share/apps/konqueror/profiles
@dirrm share/apps/konqueror/pics
@dirrm share/apps/konqueror/about
-@dirrm share/apps/konqsidebartng/websidebar
@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
@dirrm share/apps/konqsidebartng/virtual_folders/remote
+@dirrm share/apps/konqsidebartng/plugins
@dirrm share/apps/konqsidebartng/entries
@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/konqsidebartng/add
@dirrm share/apps/kinfocenter/about
@dirrm share/apps/kinfocenter
@dirrm share/apps/keditbookmarks
diff --git a/x11/kdelibs4-experimental/Makefile b/x11/kdelibs4-experimental/Makefile
deleted file mode 100644
index ee2d9c416348..000000000000
--- a/x11/kdelibs4-experimental/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for: KDE libraries 4
-# Date created: 19 January 2008
-# Whom: arved at FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= kdelibs-experimental
-PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
-CATEGORIES= x11 kde ipv6
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
-PKGNAMESUFFIX?= # empty
-DIST_SUBDIR= KDE
-
-MAINTAINER= kde@FreeBSD.org
-COMMENT= Experimantal set of libraries needed by KDE programs
-
-LATEST_LINK= ${PORTNAME}4
-
-USE_KDE4= kdelibs kdeprefix kdehier automoc4
-KDE4_BUILDENV= yes
-USE_BZIP2= yes
-USE_GETTEXT= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib opengl dbus phonon \
- qmake_build moc_build rcc_build uic_build
-MAKE_JOBS_SAFE= yes
-
-.include <bsd.port.mk>
diff --git a/x11/kdelibs4-experimental/distinfo b/x11/kdelibs4-experimental/distinfo
deleted file mode 100644
index f9ceed55f110..000000000000
--- a/x11/kdelibs4-experimental/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (KDE/kdelibs-experimental-4.3.5.tar.bz2) = 5b6bf1e49f2e18ffcd844392928ad30e
-SHA256 (KDE/kdelibs-experimental-4.3.5.tar.bz2) = e747fdc1ed01087a0edb0490c187fb6cdb9e5da67de72ee13a0620c5d1d44a07
-SIZE (KDE/kdelibs-experimental-4.3.5.tar.bz2) = 26914
diff --git a/x11/kdelibs4-experimental/files/patch-knotificationitem__CMakeLists.txt b/x11/kdelibs4-experimental/files/patch-knotificationitem__CMakeLists.txt
deleted file mode 100644
index 9a4639257bfa..000000000000
--- a/x11/kdelibs4-experimental/files/patch-knotificationitem__CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./knotificationitem/CMakeLists.txt.orig 2009-06-09 20:09:26.000000000 +0400
-+++ ./knotificationitem/CMakeLists.txt 2009-10-03 15:21:42.000000000 +0400
-@@ -41,4 +41,4 @@
- install(FILES
- org.kde.NotificationItem.xml
- org.kde.NotificationItemWatcher.xml
-- DESTINATION ${KDE4_DBUS_INTERFACES_DIR})
-+ DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
diff --git a/x11/kdelibs4-experimental/pkg-descr b/x11/kdelibs4-experimental/pkg-descr
deleted file mode 100644
index 1813dd4f9d16..000000000000
--- a/x11/kdelibs4-experimental/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the base set of libraries needed by KDE programs.
-
-WWW: http://www.kde.org/
diff --git a/x11/kdelibs4-experimental/pkg-plist b/x11/kdelibs4-experimental/pkg-plist
deleted file mode 100644
index a302821793da..000000000000
--- a/x11/kdelibs4-experimental/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-include/knotificationitem-1/knotificationitem.h
-include/knotificationitem-1/knotificationitem_export.h
-lib/libknotificationitem-1.so
-lib/libknotificationitem-1.so.1
-lib/libknotificationitem-1.so.1.0.0
-share/dbus-1/interfaces/org.kde.NotificationItem.xml
-share/dbus-1/interfaces/org.kde.NotificationItemWatcher.xml
-@dirrm include/knotificationitem-1
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 72592d0ff823..c1392126fe61 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -18,7 +18,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Base set of libraries needed by KDE programs
-BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell
+BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell \
+ ${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies
LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \
soprano.4:${PORTSDIR}/textproc/soprano \
IlmImf:${PORTSDIR}/graphics/OpenEXR \
@@ -32,14 +33,18 @@ LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \
jpeg:${PORTSDIR}/graphics/jpeg \
idn:${PORTSDIR}/dns/libidn \
hal.1:${PORTSDIR}/sysutils/hal \
- lzma.0:${PORTSDIR}/archivers/xz \
+ 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
+
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 \
showrgb:${PORTSDIR}/x11/rgb \
iceauth:${PORTSDIR}/x11/iceauth \
xauth:${PORTSDIR}/x11/xauth
-CONFLICTS= kdebase-workspace-4.1.*
+CONFLICTS= kdebase-workspace-4.1.* kdebase-workspace-4.3.[1-4] kdelibs-experimental-4.3*
LATEST_LINK= ${PORTNAME}4
@@ -77,6 +82,10 @@ MAN8= kbuildsycoca4.8 \
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 900012
+LIB_DEPENDS+= lzma.0:${PORTSDIR}/archivers/xz
+.endif
+
.if ${OSVERSION} < 900004
LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter
EXTRA_PATCHES= ${FILESDIR}/extra-patch-ConfigureChecks.cmake
@@ -109,11 +118,15 @@ pre-configure:
${PATCH_WRKSRC}/cmake/modules/*.cmake \
${PATCH_WRKSRC}/ConfigureChecks.cmake \
${PATCH_WRKSRC}/doc/api/doxygen.sh
+ ${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \
+ ${PATCH_WRKSRC}/cmake/modules/FindDNSSD.cmake
+ ${REINPLACE_CMD} -e 's|soprano/cmake|cmake/Modules|g' \
+ ${PATCH_WRKSRC}/cmake/modules/FindSoprano.cmake
# FindBerkeleyDB.cmake should be rewritten to support multiple version
# provided by ports, instead of hardcoding one of them
-# ${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \
-# -e 's|NAMES db|NAMES ${BDB_LIB_NAME} ${LOCALBASE}/lib|' \
-# ${PATCH_WRKSRC}/cmake/modules/FindBerkeleyDB.cmake
+# ${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \
+# -e 's|NAMES db|NAMES ${BDB_LIB_NAME} ${LOCALBASE}/lib|' \
+# ${PATCH_WRKSRC}/cmake/modules/FindBerkeleyDB.cmake
# prevent updating mime during build
# ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
# ${PATCH_WRKSRC}/mimetypes/CMakeLists.txt
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 97a3b4773c6c..12f688423ba6 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-4.3.5.tar.bz2) = 8db761475eb6f03f634c388f1c05b329
-SHA256 (KDE/kdelibs-4.3.5.tar.bz2) = 65823e34e2b4f6579251f3dddb23774f381c3576cca420417964027b8fe4b40e
-SIZE (KDE/kdelibs-4.3.5.tar.bz2) = 10524879
+MD5 (KDE/kdelibs-4.4.3.tar.bz2) = bd2122af41660bfff642bd077ef798a2
+SHA256 (KDE/kdelibs-4.4.3.tar.bz2) = 93f20f145f9f66e62a25a925d3ca25e76aed10dff73caf92002f00ea1e4f0428
+SIZE (KDE/kdelibs-4.4.3.tar.bz2) = 14082821
diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
index 060db0ae57ba..1e8ca51c0902 100644
--- a/x11/kdelibs4/files/patch-KDE4Defaults.cmake
+++ b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
@@ -1,16 +1,16 @@
---- ./cmake/modules/KDE4Defaults.cmake.orgi 2009-05-10 10:28:06.000000000 +0200
+--- ./cmake/modules/KDE4Defaults.cmake.orig 2009-05-10 10:28:06.000000000 +0200
+++ ./cmake/modules/KDE4Defaults.cmake 2009-05-10 10:29:00.000000000 +0200
-@@ -24,12 +24,12 @@
+@@ -25,12 +25,12 @@
# 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.3.0")
+-set(GENERIC_LIB_VERSION "4.4.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.3.0")
+-set(KDE_NON_GENERIC_LIB_VERSION "5.4.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-CMakeLists.txt b/x11/kdelibs4/files/patch-cmake-modules-CMakeLists.txt
new file mode 100644
index 000000000000..066a9387b202
--- /dev/null
+++ b/x11/kdelibs4/files/patch-cmake-modules-CMakeLists.txt
@@ -0,0 +1,21 @@
+--- ./cmake/modules/CMakeLists.txt~ 2009-12-01 10:27:12.000000000 +1000
++++ ./cmake/modules/CMakeLists.txt 2009-12-07 02:42:29.159330039 +1000
+@@ -7,8 +7,7 @@
+ # to have it around, so there is a place where the modules which are not installed
+ # are listed explicitely:
+ set(cmakeFilesDontInstall
+- FindPolkitQt.cmake
+- FindPolkitQt-1.cmake)
++ )
+
+ # Explicitely list all files which will be installed.
+ # We don't use a GLOB anymore so we can have also cmake files here
+@@ -89,6 +88,8 @@
+ FindPhonon.cmake
+ FindPkgConfig.cmake
+ FindPlasma.cmake
++ FindPolkitQt.cmake
++ FindPolkitQt-1.cmake
+ FindPopplerQt4.cmake
+ FindPostgreSQL.cmake
+ FindPulseAudio.cmake
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake
deleted file mode 100644
index 94c8f88c9efc..000000000000
--- a/x11/kdelibs4/files/patch-cmake_modules_FindQt4.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./cmake/modules/FindQt4.cmake.orig 2008-10-17 15:01:33.000000000 +0400
-+++ ./cmake/modules/FindQt4.cmake 2008-12-16 00:40:06.000000000 +0300
-@@ -1096,13 +1096,13 @@
- )
-
- FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
-- NAMES lupdate
-+ NAMES lupdate-qt4
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH
- )
-
- FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
-- NAMES lrelease
-+ NAMES lrelease-qt4
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH
- )
diff --git a/x11/kdelibs4/files/patch-kio_kfile_kdiskfreespaceinfo.cpp b/x11/kdelibs4/files/patch-kio_kfile_kdiskfreespaceinfo.cpp
new file mode 100644
index 000000000000..2fce5693e205
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kio_kfile_kdiskfreespaceinfo.cpp
@@ -0,0 +1,11 @@
+--- ./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/files/patch-solid_solid_backends_hal_halstorageaccess.cpp b/x11/kdelibs4/files/patch-solid_solid_backends_hal_halstorageaccess.cpp
new file mode 100644
index 000000000000..30b575694878
--- /dev/null
+++ b/x11/kdelibs4/files/patch-solid_solid_backends_hal_halstorageaccess.cpp
@@ -0,0 +1,39 @@
+--- ./solid/solid/backends/hal/halstorageaccess.cpp.orig 2009-12-11 02:14:57.000000000 +0300
++++ ./solid/solid/backends/hal/halstorageaccess.cpp 2010-04-11 14:13:21.934934943 +0400
+@@ -317,11 +317,17 @@
+
+ #ifdef Q_OS_FREEBSD
+ char *cType;
+- if ( fstype=="vfat" && halOptions.contains("-L=")) {
+- if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) )
++ if ( fstype=="vfat" ) {
++ if ( halOptions.contains("-L=") && (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) )
+ options << "-L="+QString(cType);
++ if ( halOptions.contains("large") )
++ options << "large";
++ if ( halOptions.contains("-m=") )
++ options << "-m=644";
++ if ( halOptions.contains("-M=") )
++ options << "-M=755";
+ }
+- else if ( (fstype.startsWith(QLatin1String("ntfs")) || fstype=="iso9660" || fstype=="udf") && halOptions.contains("-C=") ) {
++ else if ( (fstype=="ntfs" || fstype=="iso9660" || fstype=="udf") && halOptions.contains("-C=") ) {
+ if ((cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) )
+ options << "-C="+QString(nl_langinfo(CODESET));
+ }
+@@ -336,6 +342,7 @@
+ if (halOptions.contains("flush"))
+ options<<"flush";
+ }
++#endif
+ // pass our locale to the ntfs-3g driver so it can translate local characters
+ else if ( halOptions.contains("locale=") ) {
+ // have to obtain LC_CTYPE as returned by the `locale` command
+@@ -345,7 +352,6 @@
+ options << "locale="+QString(cType);
+ }
+ }
+-#endif
+
+ msg << "" << fstype << options;
+
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index eb55c374e4c0..18a1244d71d8 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -17,6 +17,8 @@ bin/makekdewidgets
bin/meinproc4
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
@@ -220,6 +222,10 @@ include/KDE/KArchiveEntry
include/KDE/KArchiveFile
include/KDE/KArrowButton
include/KDE/KAssistantDialog
+include/KDE/KAuth/Action
+include/KDE/KAuth/ActionReply
+include/KDE/KAuth/ActionWatcher
+include/KDE/KAuth/HelperSupport
include/KDE/KAuthorized
include/KDE/KAutoMount
include/KDE/KAutoUnmount
@@ -306,6 +312,7 @@ include/KDE/KDialog
include/KDE/KDialogButtonBox
include/KDE/KDirLister
include/KDE/KDirModel
+include/KDE/KDirNotify
include/KDE/KDirOperator
include/KDE/KDirSelectDialog
include/KDE/KDirSortFilterProxyModel
@@ -313,7 +320,6 @@ include/KDE/KDirWatch
include/KDE/KDiskFreeSpace
include/KDE/KDiskFreeSpaceInfo
include/KDE/KDoubleNumInput
-include/KDE/KDoubleSpinBox
include/KDE/KDoubleValidator
include/KDE/KEMailSettings
include/KDE/KEditListBox
@@ -362,6 +368,7 @@ include/KDE/KGlobal
include/KDE/KGlobalAccel
include/KDE/KGlobalSettings
include/KDE/KGradientSelector
+include/KDE/KGraphicsWebView
include/KDE/KGuiItem
include/KDE/KHBox
include/KDE/KHE/CharColumnInterface
@@ -386,7 +393,6 @@ include/KDE/KIO/CopyInfo
include/KDE/KIO/CopyJob
include/KDE/KIO/DavJob
include/KDE/KIO/DeleteJob
-include/KDE/KIO/DirectCopyJob
include/KDE/KIO/FileCopyJob
include/KDE/KIO/FileJob
include/KDE/KIO/ForwardingSlaveBase
@@ -396,7 +402,6 @@ include/KDE/KIO/ListJob
include/KDE/KIO/MetaData
include/KDE/KIO/MetaInfoJob
include/KDE/KIO/MimetypeJob
-include/KDE/KIO/MkdirJob
include/KDE/KIO/MultiGetJob
include/KDE/KIO/NetAccess
include/KDE/KIO/NetRC
@@ -417,7 +422,6 @@ include/KDE/KIO/StoredTransferJob
include/KDE/KIO/TCPSlaveBase
include/KDE/KIO/Task
include/KDE/KIO/TransferJob
-include/KDE/KIO/UDSField
include/KDE/KIcon
include/KDE/KIconButton
include/KDE/KIconCanvas
@@ -475,6 +479,10 @@ include/KDE/KNS/Engine
include/KDE/KNS/Entry
include/KDE/KNS/Installation
include/KDE/KNS/KTranslatable
+include/KDE/KNS3/DownloadDialog
+include/KDE/KNS3/Entry
+include/KDE/KNS3/KNewStuffAction
+include/KDE/KNS3/KNewStuffButton
include/KDE/KNSBookmarkExporter
include/KDE/KNSBookmarkExporterImpl
include/KDE/KNSBookmarkImporter
@@ -530,7 +538,7 @@ include/KDE/KParts/GenericFactoryBase
include/KDE/KParts/HistoryProvider
include/KDE/KParts/LiveConnectExtension
include/KDE/KParts/MainWindow
-include/KDE/KParts/OpenURLEvent
+include/KDE/KParts/OpenUrlEvent
include/KDE/KParts/Part
include/KDE/KParts/PartActivateEvent
include/KDE/KParts/PartBase
@@ -540,7 +548,6 @@ include/KDE/KParts/Plugin
include/KDE/KParts/ReadOnlyPart
include/KDE/KParts/ReadWritePart
include/KDE/KParts/StatusBarExtension
-include/KDE/KParts/URLArgs
include/KDE/KParts/WindowArgs
include/KDE/KPassivePopup
include/KDE/KPassivePopupMessageHandler
@@ -550,6 +557,8 @@ include/KDE/KPixmapCache
include/KDE/KPixmapProvider
include/KDE/KPixmapRegionSelectorDialog
include/KDE/KPixmapRegionSelectorWidget
+include/KDE/KPixmapSequence
+include/KDE/KPixmapSequenceOverlayPainter
include/KDE/KPlotAxis
include/KDE/KPlotObject
include/KDE/KPlotPoint
@@ -621,6 +630,7 @@ include/KDE/KStartupInfo
include/KDE/KStartupInfoData
include/KDE/KStartupInfoId
include/KDE/KStatusBar
+include/KDE/KStatusNotifierItem
include/KDE/KStringHandler
include/KDE/KStringListValidator
include/KDE/KStyle
@@ -654,8 +664,10 @@ include/KDE/KTextEditor/Document
include/KDE/KTextEditor/Editor
include/KDE/KTextEditor/EditorChooser
include/KDE/KTextEditor/Factory
+include/KDE/KTextEditor/HighlightInterface
include/KDE/KTextEditor/MarkInterface
include/KDE/KTextEditor/ModificationInterface
+include/KDE/KTextEditor/ParameterizedSessionConfigInterface
include/KDE/KTextEditor/Plugin
include/KDE/KTextEditor/Range
include/KDE/KTextEditor/SearchInterface
@@ -696,6 +708,10 @@ include/KDE/KTzfileTimeZone
include/KDE/KTzfileTimeZoneSource
include/KDE/KUndoStack
include/KDE/KUniqueApplication
+include/KDE/KUnitConversion/Converter
+include/KDE/KUnitConversion/Unit
+include/KDE/KUnitConversion/UnitCategory
+include/KDE/KUnitConversion/Value
include/KDE/KUnitTest/Runner
include/KDE/KUnitTest/SlotTester
include/KDE/KUnitTest/TestResults
@@ -716,6 +732,9 @@ include/KDE/KUser
include/KDE/KUserGroup
include/KDE/KVBox
include/KDE/KWallet/Wallet
+include/KDE/KWebPage
+include/KDE/KWebPluginFactory
+include/KDE/KWebView
include/KDE/KWidgetItemDelegate
include/KDE/KWindowInfo
include/KDE/KWindowSystem
@@ -734,17 +753,52 @@ include/KDE/KZipFileEntry
include/KDE/KZoneAllocator
include/KDE/KonqBookmarkMenu
include/KDE/KonqBookmarkOwner
+include/KDE/Kross/Action
+include/KDE/Kross/ActionCollection
+include/KDE/Kross/ActionCollectionEditor
+include/KDE/Kross/ActionCollectionModel
+include/KDE/Kross/ActionCollectionProxyModel
+include/KDE/Kross/ActionCollectionView
+include/KDE/Kross/ChildrenInterface
+include/KDE/Kross/ErrorInterface
+include/KDE/Kross/Interpreter
+include/KDE/Kross/InterpreterInfo
+include/KDE/Kross/Manager
+include/KDE/Kross/MetaFunction
+include/KDE/Kross/MetaType
+include/KDE/Kross/MetaTypeHandler
+include/KDE/Kross/MetaTypeImpl
+include/KDE/Kross/MetaTypeVariant
+include/KDE/Kross/MetaTypeVoidStar
+include/KDE/Kross/Object
+include/KDE/Kross/Script
+include/KDE/Kross/ScriptingPlugin
+include/KDE/Kross/WrapperInterface
include/KDE/NET
include/KDE/NETRootInfo
include/KDE/NETWinInfo
include/KDE/Nepomuk/KRatingPainter
include/KDE/Nepomuk/KRatingWidget
+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/OrTerm
+include/KDE/Nepomuk/Query/Query
+include/KDE/Nepomuk/Query/QueryParser
+include/KDE/Nepomuk/Query/QueryServiceClient
+include/KDE/Nepomuk/Query/ResourceTerm
+include/KDE/Nepomuk/Query/ResourceTypeTerm
+include/KDE/Nepomuk/Query/Result
+include/KDE/Nepomuk/Query/SimpleTerm
+include/KDE/Nepomuk/Query/Term
include/KDE/Nepomuk/Resource
include/KDE/Nepomuk/ResourceManager
include/KDE/Nepomuk/Service
include/KDE/Nepomuk/Tag
include/KDE/Nepomuk/Thing
-include/KDE/Nepomuk/Tools
include/KDE/Nepomuk/Types/Class
include/KDE/Nepomuk/Types/Literal
include/KDE/Nepomuk/Types/Ontology
@@ -752,18 +806,30 @@ include/KDE/Nepomuk/Types/Property
include/KDE/Nepomuk/Variant
include/KDE/OrgKdeKDirNotifyInterface
include/KDE/OrgKdeKLauncherInterface
+include/KDE/Plasma/AbstractAnimation
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
+include/KDE/Plasma/AuthorizationInterface
+include/KDE/Plasma/AuthorizationManager
+include/KDE/Plasma/AuthorizationRule
include/KDE/Plasma/BusyWidget
include/KDE/Plasma/CheckBox
+include/KDE/Plasma/ClientPinRequest
include/KDE/Plasma/ComboBox
include/KDE/Plasma/ConfigLoader
include/KDE/Plasma/Containment
+include/KDE/Plasma/ContainmentActions
include/KDE/Plasma/Context
include/KDE/Plasma/Corona
+include/KDE/Plasma/Credentials
include/KDE/Plasma/DataContainer
include/KDE/Plasma/DataEngine
include/KDE/Plasma/DataEngineManager
@@ -779,6 +845,7 @@ include/KDE/Plasma/FrameSvg
include/KDE/Plasma/GLApplet
include/KDE/Plasma/GroupBox
include/KDE/Plasma/IconWidget
+include/KDE/Plasma/ItemBackground
include/KDE/Plasma/Label
include/KDE/Plasma/LineEdit
include/KDE/Plasma/Meter
@@ -797,6 +864,7 @@ include/KDE/Plasma/RunnerScript
include/KDE/Plasma/ScriptEngine
include/KDE/Plasma/ScrollBar
include/KDE/Plasma/ScrollWidget
+include/KDE/Plasma/Separator
include/KDE/Plasma/Service
include/KDE/Plasma/ServiceJob
include/KDE/Plasma/SignalPlotter
@@ -816,7 +884,9 @@ include/KDE/Plasma/Version
include/KDE/Plasma/VideoWidget
include/KDE/Plasma/View
include/KDE/Plasma/Wallpaper
+include/KDE/Plasma/WallpaperScript
include/KDE/Plasma/WebView
+include/KDE/Plasma/WindowEffects
include/KDE/PtyProcess
include/KDE/Solid/AcAdapter
include/KDE/Solid/AudioInterface
@@ -982,6 +1052,11 @@ include/karchive.h
include/karrowbutton.h
include/kascii.h
include/kassistantdialog.h
+include/kauth.h
+include/kauthaction.h
+include/kauthactionreply.h
+include/kauthactionwatcher.h
+include/kauthhelpersupport.h
include/kauthorized.h
include/kautomount.h
include/kautosavefile.h
@@ -1039,6 +1114,7 @@ include/kconfiggroup.h
include/kconfigskeleton.h
include/kcoreconfigskeleton.h
include/kcrash.h
+include/kcurrencycode.h
include/kcursor.h
include/kdatatool.h
include/kdatepicker.h
@@ -1069,6 +1145,7 @@ include/kdesu/su.h
include/kdeui_export.h
include/kdeversion.h
include/kdevicelistmodel.h
+include/kdewebkit_export.h
include/kdialog.h
include/kdialogbuttonbox.h
include/kdialogjobuidelegate.h
@@ -1132,6 +1209,7 @@ include/kglobalaccel.h
include/kglobalsettings.h
include/kglobalshortcutinfo.h
include/kglobalshortcutinfo_p.h
+include/kgraphicswebview.h
include/kguiitem.h
include/khbox.h
include/khelpmenu.h
@@ -1154,6 +1232,7 @@ include/kicondialog.h
include/kiconeffect.h
include/kiconloader.h
include/kicontheme.h
+include/kidletime.h
include/kimagefilepreview.h
include/kimageio.h
include/kimproxy.h
@@ -1251,6 +1330,13 @@ include/knewstuff2/core/ktranslatable.h
include/knewstuff2/engine.h
include/knewstuff2/knewstuff_export.h
include/knewstuff2/ui/knewstuffaction.h
+include/knewstuff2/ui/knewstuffbutton.h
+include/knewstuff3/downloaddialog.h
+include/knewstuff3/entry.h
+include/knewstuff3/knewstuff_export.h
+include/knewstuff3/knewstuffaction.h
+include/knewstuff3/knewstuffbutton.h
+include/knewstuff3/uploaddialog.h
include/knfsshare.h
include/knotification.h
include/knotificationrestrictions.h
@@ -1267,6 +1353,7 @@ include/kpagewidget.h
include/kpagewidgetmodel.h
include/kparts/browserextension.h
include/kparts/browserinterface.h
+include/kparts/browseropenorsavequestion.h
include/kparts/browserrun.h
include/kparts/componentfactory.h
include/kparts/event.h
@@ -1287,6 +1374,9 @@ include/kpixmapcache.h
include/kpixmapprovider.h
include/kpixmapregionselectordialog.h
include/kpixmapregionselectorwidget.h
+include/kpixmapsequence.h
+include/kpixmapsequenceoverlaypainter.h
+include/kpixmapsequencewidget.h
include/kplotaxis.h
include/kplotobject.h
include/kplotpoint.h
@@ -1342,6 +1432,7 @@ include/ksambashare.h
include/ksavefile.h
include/kscan.h
include/kselectaction.h
+include/kselectionproxymodel.h
include/kselector.h
include/kseparator.h
include/kservice.h
@@ -1377,6 +1468,7 @@ include/kstartupinfo.h
include/kstatusbar.h
include/kstatusbarjobtracker.h
include/kstatusbarofflineindicator.h
+include/kstatusnotifieritem.h
include/kstdaccel.h
include/kstdaction.h
include/kstdguiitem.h
@@ -1412,6 +1504,7 @@ include/ktexteditor/document.h
include/ktexteditor/editor.h
include/ktexteditor/editorchooser.h
include/ktexteditor/factory.h
+include/ktexteditor/highlightinterface.h
include/ktexteditor/ktexteditor_export.h
include/ktexteditor/loadsavefiltercheckplugin.h
include/ktexteditor/markinterface.h
@@ -1422,8 +1515,12 @@ include/ktexteditor/rangefeedback.h
include/ktexteditor/searchinterface.h
include/ktexteditor/sessionconfiginterface.h
include/ktexteditor/smartcursor.h
+include/ktexteditor/smartcursornotifier.h
+include/ktexteditor/smartcursorwatcher.h
include/ktexteditor/smartinterface.h
include/ktexteditor/smartrange.h
+include/ktexteditor/smartrangenotifier.h
+include/ktexteditor/smartrangewatcher.h
include/ktexteditor/templateinterface.h
include/ktexteditor/texthintinterface.h
include/ktexteditor/variableinterface.h
@@ -1443,10 +1540,16 @@ include/ktoolinvocation.h
include/ktrader.h
include/ktreewidgetsearchline.h
include/ktypelist.h
+include/ktypelistutils.h
include/ktzfiletimezone.h
include/kuiserverjobtracker.h
include/kundostack.h
include/kuniqueapplication.h
+include/kunitconversion/converter.h
+include/kunitconversion/kunitconversion_export.h
+include/kunitconversion/unit.h
+include/kunitconversion/unitcategory.h
+include/kunitconversion/value.h
include/kunittest/kunittest_export.h
include/kunittest/module.h
include/kunittest/runner.h
@@ -1465,6 +1568,10 @@ include/kuser.h
include/kutils_export.h
include/kvbox.h
include/kwallet.h
+include/kwebpage.h
+include/kwebpluginfactory.h
+include/kwebview.h
+include/kwebwallet.h
include/kwidgetitemdelegate.h
include/kwidgetjobtracker.h
include/kwindowinfo.h
@@ -1479,11 +1586,15 @@ include/kxmlguiwindow.h
include/kxutils.h
include/kxyselector.h
include/kzip.h
+include/nepomuk/andterm.h
include/nepomuk/class.h
+include/nepomuk/comparisonterm.h
include/nepomuk/desktopontologyloader.h
include/nepomuk/entity.h
include/nepomuk/fileontologyloader.h
+include/nepomuk/filequery.h
include/nepomuk/global.h
+include/nepomuk/groupterm.h
include/nepomuk/kmetadatatagcloud.h
include/nepomuk/kmetadatatagwidget.h
include/nepomuk/kratingpainter.h
@@ -1491,16 +1602,28 @@ include/nepomuk/kratingwidget.h
include/nepomuk/ktagcloudwidget.h
include/nepomuk/ktagdisplaywidget.h
include/nepomuk/literal.h
+include/nepomuk/literalterm.h
+include/nepomuk/negationterm.h
include/nepomuk/nepomuk_export.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/orterm.h
include/nepomuk/property.h
+include/nepomuk/query.h
+include/nepomuk/queryparser.h
+include/nepomuk/queryserviceclient.h
include/nepomuk/resource.h
include/nepomuk/resourcemanager.h
+include/nepomuk/resourceterm.h
+include/nepomuk/resourcetypeterm.h
+include/nepomuk/result.h
+include/nepomuk/simpleterm.h
include/nepomuk/tag.h
+include/nepomuk/term.h
include/nepomuk/thing.h
include/nepomuk/tools.h
include/nepomuk/variant.h
@@ -1508,13 +1631,25 @@ include/netwm.h
include/netwm_def.h
include/passdlg.h
include/plasma/abstractrunner.h
+include/plasma/abstracttoolbox.h
+include/plasma/accessappletjob.h
+include/plasma/accessmanager.h
+include/plasma/animation.h
include/plasma/animationdriver.h
+include/plasma/animations/animation.h
include/plasma/animator.h
include/plasma/applet.h
+include/plasma/authorizationinterface.h
+include/plasma/authorizationmanager.h
+include/plasma/authorizationrule.h
+include/plasma/clientpinrequest.h
include/plasma/configloader.h
include/plasma/containment.h
+include/plasma/containmentactions.h
+include/plasma/containmentactionspluginsconfig.h
include/plasma/context.h
include/plasma/corona.h
+include/plasma/credentials.h
include/plasma/datacontainer.h
include/plasma/dataengine.h
include/plasma/dataenginemanager.h
@@ -1540,7 +1675,9 @@ include/plasma/scripting/appletscript.h
include/plasma/scripting/dataenginescript.h
include/plasma/scripting/runnerscript.h
include/plasma/scripting/scriptengine.h
+include/plasma/scripting/wallpaperscript.h
include/plasma/service.h
+include/plasma/serviceaccessjob.h
include/plasma/servicejob.h
include/plasma/svg.h
include/plasma/theme.h
@@ -1556,6 +1693,7 @@ include/plasma/widgets/flashinglabel.h
include/plasma/widgets/frame.h
include/plasma/widgets/groupbox.h
include/plasma/widgets/iconwidget.h
+include/plasma/widgets/itembackground.h
include/plasma/widgets/label.h
include/plasma/widgets/lineedit.h
include/plasma/widgets/meter.h
@@ -1563,6 +1701,7 @@ include/plasma/widgets/pushbutton.h
include/plasma/widgets/radiobutton.h
include/plasma/widgets/scrollbar.h
include/plasma/widgets/scrollwidget.h
+include/plasma/widgets/separator.h
include/plasma/widgets/signalplotter.h
include/plasma/widgets/slider.h
include/plasma/widgets/spinbox.h
@@ -1574,6 +1713,7 @@ include/plasma/widgets/toolbutton.h
include/plasma/widgets/treeview.h
include/plasma/widgets/videowidget.h
include/plasma/widgets/webview.h
+include/plasma/windoweffects.h
include/predicateproperties.h
include/qtest_kde.h
include/skipdlg.h
@@ -1634,6 +1774,7 @@ lib/kde4/kded_kcookiejar.so
lib/kde4/kded_kssld.so
lib/kde4/kded_proxyscout.so
lib/kde4/kfileaudiopreview.so
+lib/kde4/kfilemodule.so
lib/kde4/khtmladaptorpart.so
lib/kde4/khtmlimagepart.so
lib/kde4/kio_file.so
@@ -1650,12 +1791,16 @@ lib/kde4/krossqts.so
lib/kde4/kspell_aspell.so
lib/kde4/kspell_enchant.so
lib/kde4/kspell_hspell.so
+lib/kde4/ktexteditor_autobrace.so
+lib/kde4/ktexteditor_exporter.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
@@ -1667,7 +1812,8 @@ lib/kde4/libexec/kpac_dhcp_helper
lib/kde4/libexec/ksendbugmail
lib/kde4/libexec/ktelnetservice
lib/kde4/libexec/lnusertemp
-lib/kde4/libkfilemodule.so
+lib/kde4/libexec/start_kdeinit
+lib/kde4/libexec/start_kdeinit_wrapper
lib/kde4/libkhtmlpart.so
lib/kde4/libkmultipart.so
lib/kde4/notepadpart.so
@@ -1683,6 +1829,8 @@ lib/kde4/plugins/imageformats/kimg_rgb.so
lib/kde4/plugins/imageformats/kimg_tga.so
lib/kde4/plugins/imageformats/kimg_xcf.so
lib/kde4/plugins/imageformats/kimg_xview.so
+lib/kde4/plugins/kauth/backend/kauth_backend_plugin.so
+lib/kde4/plugins/kauth/helper/kauth_helper_plugin.so
lib/kde4/plugins/script/libkrossqtsplugin.so
lib/kde4/plugins/script/libkrossqtsplugin.so.5
lib/kde4/plugins/script/libkrossqtsplugin.so.5.0.1
@@ -1707,6 +1855,9 @@ lib/libkdesu.so.7.0.1
lib/libkdeui.so
lib/libkdeui.so.7
lib/libkdeui.so.7.0.1
+lib/libkdewebkit.so
+lib/libkdewebkit.so.7
+lib/libkdewebkit.so.7.0.1
lib/libkdnssd.so
lib/libkdnssd.so.5
lib/libkdnssd.so.5.0.1
@@ -1737,6 +1888,9 @@ lib/libkmediaplayer.so.5.0.1
lib/libknewstuff2.so
lib/libknewstuff2.so.5
lib/libknewstuff2.so.5.0.1
+lib/libknewstuff3.so
+lib/libknewstuff3.so.5
+lib/libknewstuff3.so.5.0.1
lib/libknotifyconfig.so
lib/libknotifyconfig.so.5
lib/libknotifyconfig.so.5.0.1
@@ -1758,6 +1912,9 @@ lib/libkrossui.so.5.0.1
lib/libktexteditor.so
lib/libktexteditor.so.5
lib/libktexteditor.so.5.0.1
+lib/libkunitconversion.so
+lib/libkunitconversion.so.5
+lib/libkunitconversion.so.5.0.1
lib/libkunittest.so
lib/libkunittest.so.5
lib/libkunittest.so.5.0.1
@@ -1767,6 +1924,9 @@ lib/libkutils.so.5.0.1
lib/libnepomuk.so
lib/libnepomuk.so.5
lib/libnepomuk.so.5.0.1
+lib/libnepomukquery.so
+lib/libnepomukquery.so.5
+lib/libnepomukquery.so.5.0.1
lib/libplasma.so
lib/libplasma.so.3
lib/libplasma.so.3.0.0
@@ -1776,6 +1936,7 @@ 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
@@ -1820,24 +1981,25 @@ share/apps/cmake/modules/FindGSSAPI.cmake
share/apps/cmake/modules/FindGStreamer.cmake
share/apps/cmake/modules/FindGettext.cmake
share/apps/cmake/modules/FindGphoto2.cmake
+share/apps/cmake/modules/FindHUNSPELL.cmake
share/apps/cmake/modules/FindIOKit.cmake
share/apps/cmake/modules/FindKDE4Internal.cmake
share/apps/cmake/modules/FindKDE4Workspace.cmake
share/apps/cmake/modules/FindKDEWIN32.cmake
share/apps/cmake/modules/FindKDEWIN_Packager.cmake
share/apps/cmake/modules/FindKDEWin.cmake
-share/apps/cmake/modules/FindKNepomuk.cmake
+share/apps/cmake/modules/FindKDevPlatform.cmake
share/apps/cmake/modules/FindKdcraw.cmake
share/apps/cmake/modules/FindKdeMultimedia.cmake
share/apps/cmake/modules/FindKdepim.cmake
share/apps/cmake/modules/FindKdepimLibs.cmake
share/apps/cmake/modules/FindKexiv2.cmake
share/apps/cmake/modules/FindKipi.cmake
-share/apps/cmake/modules/FindKonto.cmake
share/apps/cmake/modules/FindKopete.cmake
share/apps/cmake/modules/FindKorundum.cmake
share/apps/cmake/modules/FindLCMS.cmake
share/apps/cmake/modules/FindLibArt.cmake
+share/apps/cmake/modules/FindLibAttica.cmake
share/apps/cmake/modules/FindLibKonq.cmake
share/apps/cmake/modules/FindLibLZMA.cmake
share/apps/cmake/modules/FindLibPython.py
@@ -1858,6 +2020,8 @@ share/apps/cmake/modules/FindPCRE.cmake
share/apps/cmake/modules/FindPhonon.cmake
share/apps/cmake/modules/FindPkgConfig.cmake
share/apps/cmake/modules/FindPlasma.cmake
+share/apps/cmake/modules/FindPolkitQt-1.cmake
+share/apps/cmake/modules/FindPolkitQt.cmake
share/apps/cmake/modules/FindPopplerQt4.cmake
share/apps/cmake/modules/FindPostgreSQL.cmake
share/apps/cmake/modules/FindPulseAudio.cmake
@@ -1875,6 +2039,7 @@ share/apps/cmake/modules/FindSIP.py
share/apps/cmake/modules/FindSamba.cmake
share/apps/cmake/modules/FindSane.cmake
share/apps/cmake/modules/FindSasl2.cmake
+share/apps/cmake/modules/FindSharedDesktopOntologies.cmake
share/apps/cmake/modules/FindSharedMimeInfo.cmake
share/apps/cmake/modules/FindSoprano.cmake
share/apps/cmake/modules/FindSqlite.cmake
@@ -1894,13 +2059,13 @@ 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/MacroAddCompileFlags.cmake
-share/apps/cmake/modules/MacroAddFileDependencies.cmake
share/apps/cmake/modules/MacroAddLinkFlags.cmake
share/apps/cmake/modules/MacroAdditionalCleanFiles.cmake
share/apps/cmake/modules/MacroAppendIf.cmake
share/apps/cmake/modules/MacroBoolTo01.cmake
share/apps/cmake/modules/MacroEnsureOutOfSourceBuild.cmake
share/apps/cmake/modules/MacroEnsureVersion.cmake
+share/apps/cmake/modules/MacroKAuth.cmake
share/apps/cmake/modules/MacroLibrary.cmake
share/apps/cmake/modules/MacroLogFeature.cmake
share/apps/cmake/modules/MacroOptionalAddSubdirectory.cmake
@@ -1908,9 +2073,12 @@ share/apps/cmake/modules/MacroOptionalDependPackage.cmake
share/apps/cmake/modules/MacroOptionalFindPackage.cmake
share/apps/cmake/modules/MacroPushRequiredVars.cmake
share/apps/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake
+share/apps/cmake/modules/NepomukAddOntologyClasses.cmake
share/apps/cmake/modules/NepomukMacros.cmake
share/apps/cmake/modules/PythonCompile.py
share/apps/cmake/modules/PythonMacros.cmake
+share/apps/cmake/modules/Qt4ConfigDependentSettings.cmake
+share/apps/cmake/modules/Qt4Macros.cmake
share/apps/cmake/modules/SIPMacros.cmake
share/apps/cmake/modules/Win32Macros.cmake
share/apps/cmake/modules/check_installed_exports_file.cmake
@@ -1923,6 +2091,8 @@ share/apps/cmake/modules/kde4automoc.files.in
share/apps/cmake/modules/kde4init_dummy.cpp.in
share/apps/cmake/modules/kde4init_win32lib_dummy.cpp.in
share/apps/cmake/modules/kde4uic.cmake
+share/apps/katepart/api/05_cursor.js
+share/apps/katepart/api/10_range.js
share/apps/katepart/katepartsimpleui.rc
share/apps/katepart/katepartui.rc
share/apps/katepart/script/cstyle.js
@@ -1932,13 +2102,14 @@ share/apps/katepart/script/lilypond.js
share/apps/katepart/script/lisp.js
share/apps/katepart/script/python.js
share/apps/katepart/script/ruby.js
-share/apps/katepart/script/sort.js
+share/apps/katepart/script/utils.js
share/apps/katepart/syntax/abap.xml
share/apps/katepart/syntax/abc.xml
share/apps/katepart/syntax/actionscript.xml
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/ansic89.xml
share/apps/katepart/syntax/ansys.xml
share/apps/katepart/syntax/apache.xml
@@ -1992,6 +2163,7 @@ share/apps/katepart/syntax/gdl.xml
share/apps/katepart/syntax/gettext.xml
share/apps/katepart/syntax/glsl.xml
share/apps/katepart/syntax/gnuassembler.xml
+share/apps/katepart/syntax/grammar.xml
share/apps/katepart/syntax/haskell.xml
share/apps/katepart/syntax/haxe.xml
share/apps/katepart/syntax/html-php.xml
@@ -2096,6 +2268,8 @@ share/apps/katepart/syntax/yacas.xml
share/apps/katepart/syntax/yacc.xml
share/apps/katepart/syntax/yaml.xml
share/apps/katepart/syntax/zonnon.xml
+share/apps/kauth/dbus_policy.stub
+share/apps/kauth/dbus_service.stub
share/apps/kcharselect/kcharselect-data
share/apps/kcm_componentchooser/kcm_instantmessenger.desktop
share/apps/kcm_componentchooser/kcm_ktexteditor.desktop
@@ -2118,7 +2292,7 @@ share/apps/kdeui/about/bar-middle-right.png
share/apps/kdeui/about/bar-top-left.png
share/apps/kdeui/about/bar-top-middle.png
share/apps/kdeui/about/bar-top-right.png
-share/apps/kdeui/about/body-background.jpg
+share/apps/kdeui/about/body-background.png
share/apps/kdeui/about/box-bottom-left.png
share/apps/kdeui/about/box-bottom-middle.png
share/apps/kdeui/about/box-bottom-right.png
@@ -2152,7 +2326,6 @@ share/apps/kdewidgets/pics/kdatetimewidget.png
share/apps/kdewidgets/pics/kdatewidget.png
share/apps/kdewidgets/pics/kdialog.png
share/apps/kdewidgets/pics/kdoublenuminput.png
-share/apps/kdewidgets/pics/kdoublespinbox.png
share/apps/kdewidgets/pics/kdualcolorbutton.png
share/apps/kdewidgets/pics/keditlistbox.png
share/apps/kdewidgets/pics/kfontcombo.png
@@ -2833,6 +3006,42 @@ share/apps/ksgmltools2/customization/sr/entities/update-doc.docbook
share/apps/ksgmltools2/customization/sr/lang.entities
share/apps/ksgmltools2/customization/sr/strings.entities
share/apps/ksgmltools2/customization/sr/user.entities
+share/apps/ksgmltools2/customization/sr@ijekavian/catalog.xml
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/help-menu.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/install-compile.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/install-intro.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/underLGPL.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/sr@ijekavian/lang.entities
+share/apps/ksgmltools2/customization/sr@ijekavian/strings.entities
+share/apps/ksgmltools2/customization/sr@ijekavian/user.entities
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/catalog.xml
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/help-menu.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/install-compile.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/install-intro.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/underLGPL.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/lang.entities
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/strings.entities
+share/apps/ksgmltools2/customization/sr@ijekavianlatin/user.entities
share/apps/ksgmltools2/customization/sr@latin/catalog.xml
share/apps/ksgmltools2/customization/sr@latin/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/sr@latin/entities/gpl-notice.docbook
@@ -2985,6 +3194,8 @@ share/apps/ksgmltools2/customization/xsl/ru.xml
share/apps/ksgmltools2/customization/xsl/sk.xml
share/apps/ksgmltools2/customization/xsl/sl.xml
share/apps/ksgmltools2/customization/xsl/sr.xml
+share/apps/ksgmltools2/customization/xsl/sr@ijekavian.xml
+share/apps/ksgmltools2/customization/xsl/sr@ijekavianlatin.xml
share/apps/ksgmltools2/customization/xsl/sr@latin.xml
share/apps/ksgmltools2/customization/xsl/sv.xml
share/apps/ksgmltools2/customization/xsl/zh_tw.xml
@@ -3155,6 +3366,8 @@ share/apps/ksgmltools2/docbook/xsl/common/ru.xml
share/apps/ksgmltools2/docbook/xsl/common/sk.xml
share/apps/ksgmltools2/docbook/xsl/common/sl.xml
share/apps/ksgmltools2/docbook/xsl/common/sr.xml
+share/apps/ksgmltools2/docbook/xsl/common/sr_ijekavian.xml
+share/apps/ksgmltools2/docbook/xsl/common/sr_ijekavianlatin.xml
share/apps/ksgmltools2/docbook/xsl/common/sr_latin.xml
share/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl
share/apps/ksgmltools2/docbook/xsl/common/sv.xml
@@ -3695,9 +3908,12 @@ share/apps/ksgmltools2/docbook/xsl/params/xref.properties.xml
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_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
share/config/accept-languages.codes
share/config/colors/40.colors
@@ -3706,6 +3922,7 @@ share/config/colors/Rainbow.colors
share/config/colors/Royal.colors
share/config/colors/Web.colors
share/config/katemoderc
+share/config/katepartpluginsrc
share/config/kdebug.areas
share/config/kdebugrc
share/config/ksslcalist
@@ -3717,6 +3934,7 @@ share/dbus-1/interfaces/org.kde.JobView.xml
share/dbus-1/interfaces/org.kde.JobViewServer.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
share/dbus-1/interfaces/org.kde.KHTMLPart.xml
share/dbus-1/interfaces/org.kde.KIMIface.xml
share/dbus-1/interfaces/org.kde.KLauncher.xml
@@ -3725,8 +3943,12 @@ share/dbus-1/interfaces/org.kde.KPasswdServer.xml
share/dbus-1/interfaces/org.kde.KSpeech.xml
share/dbus-1/interfaces/org.kde.KWallet.xml
share/dbus-1/interfaces/org.kde.Solid.Networking.Client.xml
+share/dbus-1/interfaces/org.kde.StatusNotifierItem.xml
+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
@@ -3755,6 +3977,7 @@ share/doc/HTML/en/common/gpl-license
share/doc/HTML/en/common/gpl-license.html
share/doc/HTML/en/common/header.html
share/doc/HTML/en/common/kde-default.css
+share/doc/HTML/en/common/kde-docs.css
share/doc/HTML/en/common/kde_logo_bg.png
share/doc/HTML/en/common/lgpl-license
share/doc/HTML/en/common/lgpl-license.html
@@ -3812,6 +4035,7 @@ share/icons/hicolor/32x32/actions/presence_unknown.png
share/icons/hicolor/48x48/actions/presence_away.png
share/icons/hicolor/48x48/actions/presence_offline.png
share/icons/hicolor/48x48/actions/presence_online.png
+share/icons/hicolor/scalable/apps/ktexteditorautobrace.svgz
share/kde4/services/data.protocol
share/kde4/services/emoticonstheme_adium.desktop
share/kde4/services/emoticonstheme_kde.desktop
@@ -3828,6 +4052,7 @@ share/kde4/services/katepart.desktop
share/kde4/services/kded/kcookiejar.desktop
share/kde4/services/kded/kssld.desktop
share/kde4/services/kded/proxyscout.desktop
+share/kde4/services/kfilemodule.desktop
share/kde4/services/khtml.desktop
share/kde4/services/khtmladaptorpart.desktop
share/kde4/services/khtmlimage.desktop
@@ -3837,6 +4062,8 @@ share/kde4/services/kmultipart.desktop
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_exporter.desktop
share/kde4/services/ktexteditor_insertfile.desktop
share/kde4/services/ktexteditor_kdatatool.desktop
share/kde4/services/ktexteditor_python-encoding.desktop
@@ -3891,6 +4118,7 @@ share/kde4/servicetypes/kdedmodule.desktop
share/kde4/servicetypes/kemoticonsTheme.desktop
share/kde4/servicetypes/kfileplugin.desktop
share/kde4/servicetypes/kfilewrite.desktop
+share/kde4/servicetypes/kiofilemodule.desktop
share/kde4/servicetypes/kmediaplayer.desktop
share/kde4/servicetypes/kmediaplayerengine.desktop
share/kde4/servicetypes/kpart.desktop
@@ -3908,6 +4136,7 @@ share/kde4/servicetypes/plasma-animator.desktop
share/kde4/servicetypes/plasma-applet-popupapplet.desktop
share/kde4/servicetypes/plasma-applet.desktop
share/kde4/servicetypes/plasma-containment.desktop
+share/kde4/servicetypes/plasma-containmentactions.desktop
share/kde4/servicetypes/plasma-dataengine.desktop
share/kde4/servicetypes/plasma-packagestructure.desktop
share/kde4/servicetypes/plasma-runner.desktop
@@ -3919,89 +4148,15 @@ share/kde4/servicetypes/sonnetspeller.desktop
share/locale/all_languages
share/mime/all/all.xml
share/mime/all/allfiles.xml
-share/mime/application/metalink+xml.xml
-share/mime/application/rdf+xml.xml
-share/mime/application/relaxng.xml
-share/mime/application/vnd.kde.kphotoalbum-import.xml
-share/mime/application/vnd.kde.okular-archive.xml
-share/mime/application/vnd.ms-asf.xml
-share/mime/application/x-cabri.xml
-share/mime/application/x-cda.xml
-share/mime/application/x-drgeo.xml
-share/mime/application/x-fictionbook.xml
-share/mime/application/x-font-snf.xml
-share/mime/application/x-icq.xml
-share/mime/application/x-java-applet.xml
-share/mime/application/x-kcachegrind.xml
-share/mime/application/x-kcsrc.xml
-share/mime/application/x-kexi-connectiondata.xml
-share/mime/application/x-kexiproject-shortcut.xml
-share/mime/application/x-kexiproject-sqlite.xml
-share/mime/application/x-kexiproject-sqlite2.xml
-share/mime/application/x-kexiproject-sqlite3.xml
-share/mime/application/x-kgeo.xml
-share/mime/application/x-kgetlist.xml
-share/mime/application/x-khtml-adaptor.xml
-share/mime/application/x-kig.xml
-share/mime/application/x-kmplot.xml
-share/mime/application/x-kns.xml
-share/mime/application/x-kolf.xml
-share/mime/application/x-kommander.xml
-share/mime/application/x-konsole.xml
-share/mime/application/x-kopete-emoticons.xml
-share/mime/application/x-kourse.xml
-share/mime/application/x-kseg.xml
-share/mime/application/x-ksysguard.xml
-share/mime/application/x-ktheme.xml
-share/mime/application/x-kudesigner.xml
-share/mime/application/x-kvtml.xml
-share/mime/application/x-kwallet.xml
-share/mime/application/x-kwordquiz.xml
-share/mime/application/x-mimearchive.xml
-share/mime/application/x-nzb.xml
-share/mime/application/x-ogg.xml
-share/mime/application/x-plasma.xml
-share/mime/application/x-quanta.xml
-share/mime/application/x-smb-server.xml
-share/mime/application/x-smb-workgroup.xml
-share/mime/application/x-superkaramba.xml
-share/mime/application/x-trig.xml
-share/mime/application/x-tuberling.xml
-share/mime/application/x-turtle.xml
-share/mime/application/x-uml.xml
-share/mime/application/x-vnd.kde.kexi.xml
-share/mime/application/x-vnd.kde.kplato.work.xml
-share/mime/application/x-vnd.kde.kplato.xml
-share/mime/application/x-vnd.kde.kugar.mixed.xml
-share/mime/application/x-webarchive.xml
-share/mime/application/x-win-lnk.xml
-share/mime/application/xsd.xml
-share/mime/audio/aac.xml
-share/mime/audio/m3u.xml
-share/mime/audio/vorbis.xml
-share/mime/audio/x-mp2.xml
-share/mime/audio/x-oggflac.xml
-share/mime/audio/x-pn-realaudio-plugin.xml
share/mime/fonts/package.xml
-share/mime/image/x-hdr.xml
-share/mime/image/x-kde-raw.xml
share/mime/interface/x-winamp-skin.xml
share/mime/packages/kde.xml
-share/mime/text/mrml.xml
-share/mime/text/plain.xml
-share/mime/text/vnd.abc.xml
-share/mime/text/x-hex.xml
-share/mime/text/x-katefilelist.xml
-share/mime/text/x-objchdr.xml
share/mime/uri/mms.xml
share/mime/uri/mmst.xml
share/mime/uri/mmsu.xml
share/mime/uri/pnm.xml
share/mime/uri/rtspt.xml
share/mime/uri/rtspu.xml
-share/mime/video/x-ms-wmp.xml
-share/mime/video/x-ogm.xml
-share/mime/video/x-theora.xml
@dirrmtry share/mime/video
@dirrmtry share/mime/uri
@dirrmtry share/mime/interface
@@ -4019,12 +4174,14 @@ share/mime/video/x-theora.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_exporter
@dirrm share/apps/kssl
@dirrm share/apps/ksgmltools2/docbook/xsl/params
@dirrm share/apps/ksgmltools2/docbook/xsl/manpages
@@ -4060,6 +4217,10 @@ share/mime/video/x-theora.xml
@dirrm share/apps/ksgmltools2/customization/sv
@dirrm share/apps/ksgmltools2/customization/sr@latin/entities
@dirrm share/apps/ksgmltools2/customization/sr@latin
+@dirrm share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities
+@dirrm share/apps/ksgmltools2/customization/sr@ijekavianlatin
+@dirrm share/apps/ksgmltools2/customization/sr@ijekavian/entities
+@dirrm share/apps/ksgmltools2/customization/sr@ijekavian
@dirrm share/apps/ksgmltools2/customization/sr/entities
@dirrm share/apps/ksgmltools2/customization/sr
@dirrm share/apps/ksgmltools2/customization/sl/entities
@@ -4144,24 +4305,34 @@ share/mime/video/x-theora.xml
@dirrm share/apps/kdeui/pics
@dirrm share/apps/kdeui/about
@dirrm share/apps/kdeui
+@dirrm share/apps/kauth
@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
+@dirrm lib/kde4/plugins/kauth
@dirrm lib/kde4/plugins/imageformats
@dirrm include/threadweaver
@dirrm include/sonnet
@dirrmtry include/solid
@dirrm include/plasma/widgets
@dirrm include/plasma/scripting
+@dirrm include/plasma/animations
@dirrmtry include/plasma
@dirrmtry include/nepomuk
@dirrm include/kunittest
+@dirrm include/kunitconversion
@dirrm include/ktexteditor
@dirrm include/ksettings
@dirrm include/kross/ui
@dirrm include/kross/core
@dirrm include/kross
@dirrm include/kparts
+@dirrm include/knewstuff3
@dirrm include/knewstuff2/ui
@dirrm include/knewstuff2/core
@dirrm include/knewstuff2
@@ -4178,22 +4349,29 @@ share/mime/video/x-theora.xml
@dirrm include/KDE/Solid
@dirrmtry include/KDE/Plasma
@dirrm include/KDE/Nepomuk/Types
+@dirrm include/KDE/Nepomuk/Query
@dirrm include/KDE/Nepomuk
+@dirrm include/KDE/Kross
@dirrm include/KDE/KWallet
@dirrm include/KDE/KUnitTest
+@dirrm include/KDE/KUnitConversion
@dirrm include/KDE/KTextEditor
@dirrm include/KDE/KSettings
@dirrm include/KDE/KParts
@dirrm include/KDE/KNetwork
+@dirrm include/KDE/KNS3
@dirrm include/KDE/KNS
@dirrm include/KDE/KMediaPlayer
@dirrm include/KDE/KIO
@dirrm include/KDE/KHE
+@dirrm include/KDE/KAuth
@dirrm include/KDE/KAccelGen
@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
@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