diff options
Diffstat (limited to 'x11/kdebase4')
| -rw-r--r-- | x11/kdebase4/Makefile | 23 | ||||
| -rw-r--r-- | x11/kdebase4/distinfo | 6 | ||||
| -rw-r--r-- | x11/kdebase4/files/extra-patch-libusb20 | 193 | ||||
| -rw-r--r-- | x11/kdebase4/files/patch-apps-konsole-src-ProcessInfo.cpp | 147 | ||||
| -rw-r--r-- | x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h | 15 | ||||
| -rw-r--r-- | x11/kdebase4/pkg-plist | 71 |
6 files changed, 54 insertions, 401 deletions
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 |