aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/kde4-baseapps/Makefile6
-rw-r--r--x11/kde4-baseapps/distinfo6
-rw-r--r--x11/kde4-baseapps/pkg-plist4
-rw-r--r--x11/kde4-runtime/Makefile5
-rw-r--r--x11/kde4-runtime/distinfo6
-rw-r--r--x11/kde4-runtime/pkg-plist58
-rw-r--r--x11/kde4-workspace/Makefile6
-rw-r--r--x11/kde4-workspace/distinfo6
-rw-r--r--x11/kde4-workspace/pkg-plist21
-rw-r--r--x11/kdebase4-runtime/Makefile5
-rw-r--r--x11/kdebase4-runtime/distinfo6
-rw-r--r--x11/kdebase4-runtime/pkg-plist58
-rw-r--r--x11/kdebase4-workspace/Makefile6
-rw-r--r--x11/kdebase4-workspace/distinfo6
-rw-r--r--x11/kdebase4-workspace/pkg-plist21
-rw-r--r--x11/kdebase4/Makefile6
-rw-r--r--x11/kdebase4/distinfo6
-rw-r--r--x11/kdebase4/pkg-plist4
-rw-r--r--x11/kdelibs4/Makefile19
-rw-r--r--x11/kdelibs4/distinfo6
-rw-r--r--x11/kdelibs4/files/extrapatch-nepomuk-core-resourcefiltermodel.cpp19
-rw-r--r--x11/kdelibs4/files/extrapatch-nepomuk-core-resourcefiltermodel.h13
-rw-r--r--x11/kdelibs4/files/patch-kfile-kfileplacesmodel.cpp106
-rw-r--r--x11/kdelibs4/files/patch-kfile-kfileplacesmodel.h12
-rw-r--r--x11/kdelibs4/files/patch-kfile-kfileplacesview.cpp65
-rw-r--r--x11/qimageblitz/Makefile3
26 files changed, 366 insertions, 113 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 39e806112943..ba14aa4a884e 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -24,10 +24,10 @@ LATEST_LINK= ${PORTNAME}4
USE_BZIP2= yes
USE_QT_VER= 4
-QT_COMPONENTS= corelib opengl moc rcc uic dbus qt3support \
- designer network svg qtestlib
+QT_COMPONENTS= corelib opengl dbus qt3support \
+ designer network svg qtestlib \
+ qmake_build moc_build rcc_build uic_build
-USE_FAM= yes
USE_GETTEXT= yes
USE_KDE4= kdelibs workspace kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 1d9901e4c4de..6043ff083d16 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-4.1.1.tar.bz2) = 33ab20f61aa33ed473fec710ad250ac7
-SHA256 (KDE/kdebase-4.1.1.tar.bz2) = 0bc05e9b58b252d6d8f1281a2471969bbd5325945af27ff9630e58af729deb7b
-SIZE (KDE/kdebase-4.1.1.tar.bz2) = 4412289
+MD5 (KDE/kdebase-4.1.4.tar.bz2) = 9a76438f5453a3ba4f773db6847825f7
+SHA256 (KDE/kdebase-4.1.4.tar.bz2) = 1c8c0390eb231a84819bfa9f6015a5c99fbf44b622e22ea39bfdc7caf3715a8f
+SIZE (KDE/kdebase-4.1.4.tar.bz2) = 4403306
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index b327b456960f..a27496373688 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -398,8 +398,6 @@ share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png
share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png
share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png
share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png
-share/apps/konqueror/konq-filemanagement.rc
-share/apps/konqueror/konq-webbrowsing.rc
share/apps/konqueror/konqueror.rc
share/apps/konqueror/pics/arrow_bottomleft.png
share/apps/konqueror/pics/arrow_bottomright.png
@@ -560,8 +558,6 @@ share/doc/HTML/en/konqueror/sidebar.docbook
share/doc/HTML/en/konsole/common
share/doc/HTML/en/konsole/index.cache.bz2
share/doc/HTML/en/konsole/index.docbook
-share/doc/HTML/en/konsole/konsole.png
-share/doc/HTML/en/konsole/tabbar.png
share/doc/HTML/en/kwrite/common
share/doc/HTML/en/kwrite/index.cache.bz2
share/doc/HTML/en/kwrite/index.docbook
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 0ae3bbb9d40a..37e9ce10b601 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -27,8 +26,8 @@ USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
-QT_COMPONENTS= corelib opengl moc rcc uic dbus
-USE_FAM= yes
+QT_COMPONENTS= corelib opengl dbus \
+ qmake_build moc_build rcc_build uic_build
USE_GETTEXT= yes
MAN1= kdesu.1
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 618bf383b3ae..09007714a0a4 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.1.1.tar.bz2) = f03488d19c3bd95634b797229ac55127
-SHA256 (KDE/kdebase-runtime-4.1.1.tar.bz2) = d67b7d33a24c00e9996c65d086e681a28ad3c267a8e62cf530dea06052d0ebb6
-SIZE (KDE/kdebase-runtime-4.1.1.tar.bz2) = 52174221
+MD5 (KDE/kdebase-runtime-4.1.4.tar.bz2) = fad82875745bacbb52001eabf9c71202
+SHA256 (KDE/kdebase-runtime-4.1.4.tar.bz2) = 0b96c34785edcd9a0d308ca8a5623bd2de15939bcaee3bbda6de4ac3d832b513
+SIZE (KDE/kdebase-runtime-4.1.4.tar.bz2) = 52272004
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index 16489589082a..76962631e938 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -145,10 +145,10 @@ share/apps/khelpcenter/plugins/contact.desktop
share/apps/khelpcenter/plugins/faq.desktop
share/apps/khelpcenter/plugins/info.desktop
share/apps/khelpcenter/plugins/kcontrolmodules.desktop
-share/apps/khelpcenter/plugins/plasma.desktop
share/apps/khelpcenter/plugins/kicmodules.desktop
share/apps/khelpcenter/plugins/kioslaves.desktop
share/apps/khelpcenter/plugins/links.desktop
+share/apps/khelpcenter/plugins/plasma.desktop
share/apps/khelpcenter/plugins/support.desktop
share/apps/khelpcenter/plugins/userguide.desktop
share/apps/khelpcenter/plugins/welcome.desktop
@@ -282,9 +282,6 @@ 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/kcmsmserver/common
-share/doc/HTML/en/kcontrol/kcmsmserver/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmsmserver/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
@@ -298,9 +295,6 @@ share/doc/HTML/en/kcontrol/khtml/nsplugin.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/mouse/common
-share/doc/HTML/en/kcontrol/mouse/index.cache.bz2
-share/doc/HTML/en/kcontrol/mouse/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
@@ -334,9 +328,6 @@ share/doc/HTML/en/kcontrol/spellchecking/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
-share/doc/HTML/en/kcontrol/windowmanagement/common
-share/doc/HTML/en/kcontrol/windowmanagement/index.cache.bz2
-share/doc/HTML/en/kcontrol/windowmanagement/index.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
@@ -837,6 +828,7 @@ share/icons/oxygen/128x128/emotes/face-smile.png
share/icons/oxygen/128x128/emotes/face-surprise.png
share/icons/oxygen/128x128/emotes/face-uncertain.png
share/icons/oxygen/128x128/mimetypes/application-illustrator.png
+share/icons/oxygen/128x128/mimetypes/application-msword.png
share/icons/oxygen/128x128/mimetypes/application-octet-stream.png
share/icons/oxygen/128x128/mimetypes/application-pdf.png
share/icons/oxygen/128x128/mimetypes/application-pgp-encrypted.png
@@ -848,7 +840,6 @@ share/icons/oxygen/128x128/mimetypes/application-rss+xml.png
share/icons/oxygen/128x128/mimetypes/application-rtf.png
share/icons/oxygen/128x128/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/128x128/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/128x128/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/128x128/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/128x128/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/128x128/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -909,6 +900,7 @@ share/icons/oxygen/128x128/mimetypes/application-x-kcsrc.png
share/icons/oxygen/128x128/mimetypes/application-x-kgetlist.png
share/icons/oxygen/128x128/mimetypes/application-x-kontour.png
share/icons/oxygen/128x128/mimetypes/application-x-krita.png
+share/icons/oxygen/128x128/mimetypes/application-x-kvtml.png
share/icons/oxygen/128x128/mimetypes/application-x-lha.png
share/icons/oxygen/128x128/mimetypes/application-x-lzop.png
share/icons/oxygen/128x128/mimetypes/application-x-marble.png
@@ -976,8 +968,8 @@ share/icons/oxygen/128x128/mimetypes/image-bmp.png
share/icons/oxygen/128x128/mimetypes/image-cgm.png
share/icons/oxygen/128x128/mimetypes/image-fax-g3.png
share/icons/oxygen/128x128/mimetypes/image-gif.png
+share/icons/oxygen/128x128/mimetypes/image-jp2.png
share/icons/oxygen/128x128/mimetypes/image-jpeg.png
-share/icons/oxygen/128x128/mimetypes/image-jpeg2000.png
share/icons/oxygen/128x128/mimetypes/image-png.png
share/icons/oxygen/128x128/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/128x128/mimetypes/image-svg+xml.png
@@ -1605,6 +1597,7 @@ share/icons/oxygen/16x16/emotes/face-smile.png
share/icons/oxygen/16x16/emotes/face-surprise.png
share/icons/oxygen/16x16/emotes/face-uncertain.png
share/icons/oxygen/16x16/mimetypes/application-illustrator.png
+share/icons/oxygen/16x16/mimetypes/application-msword.png
share/icons/oxygen/16x16/mimetypes/application-octet-stream.png
share/icons/oxygen/16x16/mimetypes/application-pdf.png
share/icons/oxygen/16x16/mimetypes/application-pgp-encrypted.png
@@ -1617,7 +1610,6 @@ share/icons/oxygen/16x16/mimetypes/application-rss+xml.png
share/icons/oxygen/16x16/mimetypes/application-rtf.png
share/icons/oxygen/16x16/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/16x16/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/16x16/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/16x16/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/16x16/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/16x16/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -1677,6 +1669,7 @@ share/icons/oxygen/16x16/mimetypes/application-x-kcsrc.png
share/icons/oxygen/16x16/mimetypes/application-x-kgetlist.png
share/icons/oxygen/16x16/mimetypes/application-x-kontour.png
share/icons/oxygen/16x16/mimetypes/application-x-krita.png
+share/icons/oxygen/16x16/mimetypes/application-x-kvtml.png
share/icons/oxygen/16x16/mimetypes/application-x-lha.png
share/icons/oxygen/16x16/mimetypes/application-x-lzop.png
share/icons/oxygen/16x16/mimetypes/application-x-marble.png
@@ -1744,8 +1737,8 @@ share/icons/oxygen/16x16/mimetypes/image-bmp.png
share/icons/oxygen/16x16/mimetypes/image-cgm.png
share/icons/oxygen/16x16/mimetypes/image-fax-g3.png
share/icons/oxygen/16x16/mimetypes/image-gif.png
+share/icons/oxygen/16x16/mimetypes/image-jp2.png
share/icons/oxygen/16x16/mimetypes/image-jpeg.png
-share/icons/oxygen/16x16/mimetypes/image-jpeg2000.png
share/icons/oxygen/16x16/mimetypes/image-png.png
share/icons/oxygen/16x16/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/16x16/mimetypes/image-svg+xml.png
@@ -2422,6 +2415,7 @@ share/icons/oxygen/22x22/emotes/face-surprise.png
share/icons/oxygen/22x22/emotes/face-uncertain.png
share/icons/oxygen/22x22/emotes/face-wink.png
share/icons/oxygen/22x22/mimetypes/application-illustrator.png
+share/icons/oxygen/22x22/mimetypes/application-msword.png
share/icons/oxygen/22x22/mimetypes/application-octet-stream.png
share/icons/oxygen/22x22/mimetypes/application-pdf.png
share/icons/oxygen/22x22/mimetypes/application-pgp-encrypted.png
@@ -2435,7 +2429,6 @@ share/icons/oxygen/22x22/mimetypes/application-rss+xml.png
share/icons/oxygen/22x22/mimetypes/application-rtf.png
share/icons/oxygen/22x22/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/22x22/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/22x22/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/22x22/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/22x22/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/22x22/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -2496,6 +2489,7 @@ share/icons/oxygen/22x22/mimetypes/application-x-kcsrc.png
share/icons/oxygen/22x22/mimetypes/application-x-kgetlist.png
share/icons/oxygen/22x22/mimetypes/application-x-kontour.png
share/icons/oxygen/22x22/mimetypes/application-x-krita.png
+share/icons/oxygen/22x22/mimetypes/application-x-kvtml.png
share/icons/oxygen/22x22/mimetypes/application-x-lha.png
share/icons/oxygen/22x22/mimetypes/application-x-lzop.png
share/icons/oxygen/22x22/mimetypes/application-x-marble.png
@@ -2563,8 +2557,8 @@ share/icons/oxygen/22x22/mimetypes/image-bmp.png
share/icons/oxygen/22x22/mimetypes/image-cgm.png
share/icons/oxygen/22x22/mimetypes/image-fax-g3.png
share/icons/oxygen/22x22/mimetypes/image-gif.png
+share/icons/oxygen/22x22/mimetypes/image-jp2.png
share/icons/oxygen/22x22/mimetypes/image-jpeg.png
-share/icons/oxygen/22x22/mimetypes/image-jpeg2000.png
share/icons/oxygen/22x22/mimetypes/image-png.png
share/icons/oxygen/22x22/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/22x22/mimetypes/image-svg+xml.png
@@ -3237,6 +3231,7 @@ share/icons/oxygen/32x32/emotes/face-smile.png
share/icons/oxygen/32x32/emotes/face-surprise.png
share/icons/oxygen/32x32/emotes/face-uncertain.png
share/icons/oxygen/32x32/mimetypes/application-illustrator.png
+share/icons/oxygen/32x32/mimetypes/application-msword.png
share/icons/oxygen/32x32/mimetypes/application-octet-stream.png
share/icons/oxygen/32x32/mimetypes/application-pdf.png
share/icons/oxygen/32x32/mimetypes/application-pgp-encrypted.png
@@ -3250,7 +3245,6 @@ share/icons/oxygen/32x32/mimetypes/application-rss+xml.png
share/icons/oxygen/32x32/mimetypes/application-rtf.png
share/icons/oxygen/32x32/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/32x32/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/32x32/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/32x32/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/32x32/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/32x32/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -3311,6 +3305,7 @@ share/icons/oxygen/32x32/mimetypes/application-x-kcsrc.png
share/icons/oxygen/32x32/mimetypes/application-x-kgetlist.png
share/icons/oxygen/32x32/mimetypes/application-x-kontour.png
share/icons/oxygen/32x32/mimetypes/application-x-krita.png
+share/icons/oxygen/32x32/mimetypes/application-x-kvtml.png
share/icons/oxygen/32x32/mimetypes/application-x-lha.png
share/icons/oxygen/32x32/mimetypes/application-x-lzop.png
share/icons/oxygen/32x32/mimetypes/application-x-marble.png
@@ -3378,8 +3373,8 @@ share/icons/oxygen/32x32/mimetypes/image-bmp.png
share/icons/oxygen/32x32/mimetypes/image-cgm.png
share/icons/oxygen/32x32/mimetypes/image-fax-g3.png
share/icons/oxygen/32x32/mimetypes/image-gif.png
+share/icons/oxygen/32x32/mimetypes/image-jp2.png
share/icons/oxygen/32x32/mimetypes/image-jpeg.png
-share/icons/oxygen/32x32/mimetypes/image-jpeg2000.png
share/icons/oxygen/32x32/mimetypes/image-png.png
share/icons/oxygen/32x32/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/32x32/mimetypes/image-svg+xml.png
@@ -4043,6 +4038,7 @@ share/icons/oxygen/48x48/emotes/face-smile.png
share/icons/oxygen/48x48/emotes/face-surprise.png
share/icons/oxygen/48x48/emotes/face-uncertain.png
share/icons/oxygen/48x48/mimetypes/application-illustrator.png
+share/icons/oxygen/48x48/mimetypes/application-msword.png
share/icons/oxygen/48x48/mimetypes/application-octet-stream.png
share/icons/oxygen/48x48/mimetypes/application-pdf.png
share/icons/oxygen/48x48/mimetypes/application-pgp-encrypted.png
@@ -4056,7 +4052,6 @@ share/icons/oxygen/48x48/mimetypes/application-rss+xml.png
share/icons/oxygen/48x48/mimetypes/application-rtf.png
share/icons/oxygen/48x48/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/48x48/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/48x48/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/48x48/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/48x48/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/48x48/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -4117,6 +4112,7 @@ share/icons/oxygen/48x48/mimetypes/application-x-kcsrc.png
share/icons/oxygen/48x48/mimetypes/application-x-kgetlist.png
share/icons/oxygen/48x48/mimetypes/application-x-kontour.png
share/icons/oxygen/48x48/mimetypes/application-x-krita.png
+share/icons/oxygen/48x48/mimetypes/application-x-kvtml.png
share/icons/oxygen/48x48/mimetypes/application-x-lha.png
share/icons/oxygen/48x48/mimetypes/application-x-lzop.png
share/icons/oxygen/48x48/mimetypes/application-x-marble.png
@@ -4184,8 +4180,8 @@ share/icons/oxygen/48x48/mimetypes/image-bmp.png
share/icons/oxygen/48x48/mimetypes/image-cgm.png
share/icons/oxygen/48x48/mimetypes/image-fax-g3.png
share/icons/oxygen/48x48/mimetypes/image-gif.png
+share/icons/oxygen/48x48/mimetypes/image-jp2.png
share/icons/oxygen/48x48/mimetypes/image-jpeg.png
-share/icons/oxygen/48x48/mimetypes/image-jpeg2000.png
share/icons/oxygen/48x48/mimetypes/image-png.png
share/icons/oxygen/48x48/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/48x48/mimetypes/image-svg+xml.png
@@ -4611,6 +4607,7 @@ share/icons/oxygen/64x64/emotes/face-smile.png
share/icons/oxygen/64x64/emotes/face-surprise.png
share/icons/oxygen/64x64/emotes/face-uncertain.png
share/icons/oxygen/64x64/mimetypes/application-illustrator.png
+share/icons/oxygen/64x64/mimetypes/application-msword.png
share/icons/oxygen/64x64/mimetypes/application-octet-stream.png
share/icons/oxygen/64x64/mimetypes/application-pdf.png
share/icons/oxygen/64x64/mimetypes/application-pgp-encrypted.png
@@ -4622,7 +4619,6 @@ share/icons/oxygen/64x64/mimetypes/application-rss+xml.png
share/icons/oxygen/64x64/mimetypes/application-rtf.png
share/icons/oxygen/64x64/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/64x64/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/64x64/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/64x64/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/64x64/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/64x64/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -4683,6 +4679,7 @@ share/icons/oxygen/64x64/mimetypes/application-x-kcsrc.png
share/icons/oxygen/64x64/mimetypes/application-x-kgetlist.png
share/icons/oxygen/64x64/mimetypes/application-x-kontour.png
share/icons/oxygen/64x64/mimetypes/application-x-krita.png
+share/icons/oxygen/64x64/mimetypes/application-x-kvtml.png
share/icons/oxygen/64x64/mimetypes/application-x-lha.png
share/icons/oxygen/64x64/mimetypes/application-x-lzop.png
share/icons/oxygen/64x64/mimetypes/application-x-marble.png
@@ -4750,8 +4747,8 @@ share/icons/oxygen/64x64/mimetypes/image-bmp.png
share/icons/oxygen/64x64/mimetypes/image-cgm.png
share/icons/oxygen/64x64/mimetypes/image-fax-g3.png
share/icons/oxygen/64x64/mimetypes/image-gif.png
+share/icons/oxygen/64x64/mimetypes/image-jp2.png
share/icons/oxygen/64x64/mimetypes/image-jpeg.png
-share/icons/oxygen/64x64/mimetypes/image-jpeg2000.png
share/icons/oxygen/64x64/mimetypes/image-png.png
share/icons/oxygen/64x64/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/64x64/mimetypes/image-svg+xml.png
@@ -5999,6 +5996,7 @@ share/icons/oxygen/scalable/emotes/small/22x22/face-surprise.svgz
share/icons/oxygen/scalable/emotes/small/22x22/face-uncertain.svgz
share/icons/oxygen/scalable/emotes/small/22x22/face-wink.svgz
share/icons/oxygen/scalable/mimetypes/application-illustrator.svgz
+share/icons/oxygen/scalable/mimetypes/application-msword.svgz
share/icons/oxygen/scalable/mimetypes/application-octet-stream.svgz
share/icons/oxygen/scalable/mimetypes/application-pdf.svgz
share/icons/oxygen/scalable/mimetypes/application-pgp-encrypted.svgz
@@ -6012,7 +6010,6 @@ share/icons/oxygen/scalable/mimetypes/application-rss+xml.svgz
share/icons/oxygen/scalable/mimetypes/application-rtf.svgz
share/icons/oxygen/scalable/mimetypes/application-vnd.ms-excel.svgz
share/icons/oxygen/scalable/mimetypes/application-vnd.ms-powerpoint.svgz
-share/icons/oxygen/scalable/mimetypes/application-vnd.ms-word.svgz
share/icons/oxygen/scalable/mimetypes/application-vnd.oasis.opendocument.chart.svgz
share/icons/oxygen/scalable/mimetypes/application-vnd.oasis.opendocument.database.svgz
share/icons/oxygen/scalable/mimetypes/application-vnd.oasis.opendocument.formula.svgz
@@ -6073,6 +6070,7 @@ share/icons/oxygen/scalable/mimetypes/application-x-kcsrc.svgz
share/icons/oxygen/scalable/mimetypes/application-x-kgetlist.svgz
share/icons/oxygen/scalable/mimetypes/application-x-kontour.svgz
share/icons/oxygen/scalable/mimetypes/application-x-krita.svgz
+share/icons/oxygen/scalable/mimetypes/application-x-kvtml.svgz
share/icons/oxygen/scalable/mimetypes/application-x-lha.svgz
share/icons/oxygen/scalable/mimetypes/application-x-lzop.svgz
share/icons/oxygen/scalable/mimetypes/application-x-marble.svgz
@@ -6140,12 +6138,13 @@ share/icons/oxygen/scalable/mimetypes/image-bmp.svgz
share/icons/oxygen/scalable/mimetypes/image-cgm.svgz
share/icons/oxygen/scalable/mimetypes/image-fax-g3.svgz
share/icons/oxygen/scalable/mimetypes/image-gif.svgz
+share/icons/oxygen/scalable/mimetypes/image-jp2.svgz
share/icons/oxygen/scalable/mimetypes/image-jpeg.svgz
-share/icons/oxygen/scalable/mimetypes/image-jpeg2000.svgz
share/icons/oxygen/scalable/mimetypes/image-png.svgz
share/icons/oxygen/scalable/mimetypes/image-svg+xml-compressed.svgz
share/icons/oxygen/scalable/mimetypes/image-svg+xml.svgz
share/icons/oxygen/scalable/mimetypes/image-tiff.svgz
+share/icons/oxygen/scalable/mimetypes/image-x-adobe-dng.svgz
share/icons/oxygen/scalable/mimetypes/image-x-applix-graphics.svgz
share/icons/oxygen/scalable/mimetypes/image-x-dcraw.svgz
share/icons/oxygen/scalable/mimetypes/image-x-dds.svgz
@@ -6176,6 +6175,7 @@ share/icons/oxygen/scalable/mimetypes/message-rfc822.svgz
share/icons/oxygen/scalable/mimetypes/message.svgz
share/icons/oxygen/scalable/mimetypes/odf.svgz
share/icons/oxygen/scalable/mimetypes/package-x-generic.svgz
+share/icons/oxygen/scalable/mimetypes/small/16x16/application-msword.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-pdf.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-pgp-encrypted.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-pgp-keys.svgz
@@ -6184,7 +6184,6 @@ share/icons/oxygen/scalable/mimetypes/small/16x16/application-rss+xml.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-rtf.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.ms-excel.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.ms-powerpoint.svgz
-share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.ms-word.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.oasis.opendocument.database.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.oasis.opendocument.formula.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.oasis.opendocument.graphics.svgz
@@ -6281,8 +6280,8 @@ share/icons/oxygen/scalable/mimetypes/small/16x16/image-bmp.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-cgm.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-fax-g3.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-gif.svgz
+share/icons/oxygen/scalable/mimetypes/small/16x16/image-jp2.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-jpeg.svgz
-share/icons/oxygen/scalable/mimetypes/small/16x16/image-jpeg2000.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-png.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-svg+xml-compressed.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-svg+xml.svgz
@@ -6366,6 +6365,7 @@ share/icons/oxygen/scalable/mimetypes/small/16x16/x-office-calendar.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/x-office-contact.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/x-office-document.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/x-office-spreadsheet.svgz
+share/icons/oxygen/scalable/mimetypes/small/22x22/application-msword.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-pdf.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-pgp-encrypted.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-pgp-keys.svgz
@@ -6374,7 +6374,6 @@ share/icons/oxygen/scalable/mimetypes/small/22x22/application-rss+xml.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-rtf.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.ms-excel.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.ms-powerpoint.svgz
-share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.ms-word.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.oasis.opendocument.database.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.oasis.opendocument.presentation.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.oasis.opendocument.spreadsheet.svgz
@@ -6451,8 +6450,8 @@ share/icons/oxygen/scalable/mimetypes/small/22x22/image-bmp.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-cgm.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-fax-g3.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-gif.svgz
+share/icons/oxygen/scalable/mimetypes/small/22x22/image-jp2.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-jpeg.svgz
-share/icons/oxygen/scalable/mimetypes/small/22x22/image-jpeg2000.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-png.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-svg+xml-compressed.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-svg+xml.svgz
@@ -7867,7 +7866,6 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrmtry share/doc/HTML/en/khelpcenter
@dirrmtry share/doc/HTML/en/kdesu
@dirrmtry share/doc/HTML/en/kdebugdialog
-@dirrmtry share/doc/HTML/en/kcontrol/windowmanagement
@dirrmtry share/doc/HTML/en/kcontrol/useragent
@dirrmtry share/doc/HTML/en/kcontrol/spellchecking
@dirrmtry share/doc/HTML/en/kcontrol/smb
@@ -7878,12 +7876,10 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrmtry share/doc/HTML/en/kcontrol/panelappearance
@dirrmtry share/doc/HTML/en/kcontrol/panel
@dirrmtry share/doc/HTML/en/kcontrol/netpref
-@dirrmtry share/doc/HTML/en/kcontrol/mouse
@dirrmtry share/doc/HTML/en/kcontrol/language
@dirrmtry share/doc/HTML/en/kcontrol/khtml
@dirrmtry share/doc/HTML/en/kcontrol/kdm
@dirrmtry share/doc/HTML/en/kcontrol/kcmtaskbar
-@dirrmtry share/doc/HTML/en/kcontrol/kcmsmserver
@dirrmtry share/doc/HTML/en/kcontrol/kcmnotify
@dirrmtry share/doc/HTML/en/kcontrol/kcmlaunch
@dirrmtry share/doc/HTML/en/kcontrol/kcmkonsole
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 6f47c99b96ee..cfa17907a81f 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -35,8 +35,10 @@ USE_KDE4= kdelibs kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
-QT_COMPONENTS= assistant corelib dbus designer gui_build moc network opengl rcc \
- script svg sql qt3support qtestlib uic3 xml porting webkit
+QT_COMPONENTS= assistant corelib dbus designer gui network opengl \
+ script svg sql qt3support qtestlib xml webkit \
+ qmake_build moc_build rcc_build uic_build \
+ porting_build uic3_build
USE_GETTEXT= yes
USE_ICONV= yes
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index f1ce5655325e..9e9c3bdeaf2b 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.1.1.tar.bz2) = 53805b96727db2fe30773a3fa9f78b73
-SHA256 (KDE/kdebase-workspace-4.1.1.tar.bz2) = 47637b68405e75f13281bc88c94b7502c3d7b0097bf0a057625c76cc6e7233dd
-SIZE (KDE/kdebase-workspace-4.1.1.tar.bz2) = 47473442
+MD5 (KDE/kdebase-workspace-4.1.4.tar.bz2) = bdac9ac8055b976845587fe544d568be
+SHA256 (KDE/kdebase-workspace-4.1.4.tar.bz2) = 5f0a63ab3d97c9240ff78c4219572fa82ebe803a1f7ce5786ba44cca50c28e08
+SIZE (KDE/kdebase-workspace-4.1.4.tar.bz2) = 47504097
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 52a6f71e74f6..f66f119cafb4 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -207,6 +207,7 @@ include/taskmanager/task.h
include/taskmanager/taskmanager.h
include/ui_calendar.h
lib/kconf_update_bin/khotkeys_update
+lib/kconf_update_bin/krdb_clearlibrarypath
lib/kconf_update_bin/kwin_update_default_rules
lib/kconf_update_bin/kwin_update_window_settings
lib/kconf_update_bin/plasma-add-shortcut-to-menu
@@ -451,7 +452,9 @@ share/apps/kconf_update/kaccel.upd
share/apps/kconf_update/kcmdisplayrc.upd
share/apps/kconf_update/khotkeys_32b1_update.upd
share/apps/kconf_update/khotkeys_printscreen.upd
+share/apps/kconf_update/khotkeys_remove_shortcuts.upd
share/apps/kconf_update/konqueror_gestures_kde321_update.upd
+share/apps/kconf_update/krdb.upd
share/apps/kconf_update/ksmserver.upd
share/apps/kconf_update/kwin.upd
share/apps/kconf_update/kwin3_plugin.pl
@@ -462,6 +465,8 @@ 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_window_shortcuts.sh
+share/apps/kconf_update/kwin_window_shortcuts.upd
share/apps/kconf_update/kwiniconify.upd
share/apps/kconf_update/kwinsticky.upd
share/apps/kconf_update/kwinupdatewindowsettings.upd
@@ -759,6 +764,9 @@ share/doc/HTML/en/kcontrol/kcmaccess/index.docbook
share/doc/HTML/en/kcontrol/kcmdisplay/common
share/doc/HTML/en/kcontrol/kcmdisplay/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmdisplay/index.docbook
+share/doc/HTML/en/kcontrol/kcmsmserver/common
+share/doc/HTML/en/kcontrol/kcmsmserver/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcmsmserver/index.docbook
share/doc/HTML/en/kcontrol/kcmstyle/common
share/doc/HTML/en/kcontrol/kcmstyle/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmstyle/index.docbook
@@ -773,6 +781,9 @@ 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/mouse/common
+share/doc/HTML/en/kcontrol/mouse/index.cache.bz2
+share/doc/HTML/en/kcontrol/mouse/index.docbook
share/doc/HTML/en/kcontrol/screensaver/common
share/doc/HTML/en/kcontrol/screensaver/index.cache.bz2
share/doc/HTML/en/kcontrol/screensaver/index.docbook
@@ -781,6 +792,12 @@ share/doc/HTML/en/kcontrol/splashscreen/get-new-theme.png
share/doc/HTML/en/kcontrol/splashscreen/index.cache.bz2
share/doc/HTML/en/kcontrol/splashscreen/index.docbook
share/doc/HTML/en/kcontrol/splashscreen/splash-main.png
+share/doc/HTML/en/kcontrol/windowbehaviour/common
+share/doc/HTML/en/kcontrol/windowbehaviour/index.cache.bz2
+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/kdm/common
share/doc/HTML/en/kdm/index.cache.bz2
share/doc/HTML/en/kdm/index.docbook
@@ -2028,12 +2045,16 @@ share/wallpapers/default_blue.jpg.desktop
@dirrmtry share/doc/HTML/en/kmenuedit
@dirrmtry share/doc/HTML/en/klipper
@dirrmtry share/doc/HTML/en/kdm
+@dirrmtry share/doc/HTML/en/kcontrol/windowspecific
+@dirrmtry share/doc/HTML/en/kcontrol/windowbehaviour
@dirrmtry share/doc/HTML/en/kcontrol/splashscreen
@dirrmtry share/doc/HTML/en/kcontrol/screensaver
+@dirrmtry share/doc/HTML/en/kcontrol/mouse
@dirrmtry share/doc/HTML/en/kcontrol/kwindecoration
@dirrmtry share/doc/HTML/en/kcontrol/keys
@dirrmtry share/doc/HTML/en/kcontrol/keyboard
@dirrmtry share/doc/HTML/en/kcontrol/kcmstyle
+@dirrmtry share/doc/HTML/en/kcontrol/kcmsmserver
@dirrmtry share/doc/HTML/en/kcontrol/kcmdisplay
@dirrmtry share/doc/HTML/en/kcontrol/kcmaccess
@dirrmtry share/doc/HTML/en/kcontrol/joystick
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 0ae3bbb9d40a..37e9ce10b601 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -27,8 +26,8 @@ USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
-QT_COMPONENTS= corelib opengl moc rcc uic dbus
-USE_FAM= yes
+QT_COMPONENTS= corelib opengl dbus \
+ qmake_build moc_build rcc_build uic_build
USE_GETTEXT= yes
MAN1= kdesu.1
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 618bf383b3ae..09007714a0a4 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.1.1.tar.bz2) = f03488d19c3bd95634b797229ac55127
-SHA256 (KDE/kdebase-runtime-4.1.1.tar.bz2) = d67b7d33a24c00e9996c65d086e681a28ad3c267a8e62cf530dea06052d0ebb6
-SIZE (KDE/kdebase-runtime-4.1.1.tar.bz2) = 52174221
+MD5 (KDE/kdebase-runtime-4.1.4.tar.bz2) = fad82875745bacbb52001eabf9c71202
+SHA256 (KDE/kdebase-runtime-4.1.4.tar.bz2) = 0b96c34785edcd9a0d308ca8a5623bd2de15939bcaee3bbda6de4ac3d832b513
+SIZE (KDE/kdebase-runtime-4.1.4.tar.bz2) = 52272004
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index 16489589082a..76962631e938 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -145,10 +145,10 @@ share/apps/khelpcenter/plugins/contact.desktop
share/apps/khelpcenter/plugins/faq.desktop
share/apps/khelpcenter/plugins/info.desktop
share/apps/khelpcenter/plugins/kcontrolmodules.desktop
-share/apps/khelpcenter/plugins/plasma.desktop
share/apps/khelpcenter/plugins/kicmodules.desktop
share/apps/khelpcenter/plugins/kioslaves.desktop
share/apps/khelpcenter/plugins/links.desktop
+share/apps/khelpcenter/plugins/plasma.desktop
share/apps/khelpcenter/plugins/support.desktop
share/apps/khelpcenter/plugins/userguide.desktop
share/apps/khelpcenter/plugins/welcome.desktop
@@ -282,9 +282,6 @@ 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/kcmsmserver/common
-share/doc/HTML/en/kcontrol/kcmsmserver/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmsmserver/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
@@ -298,9 +295,6 @@ share/doc/HTML/en/kcontrol/khtml/nsplugin.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/mouse/common
-share/doc/HTML/en/kcontrol/mouse/index.cache.bz2
-share/doc/HTML/en/kcontrol/mouse/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
@@ -334,9 +328,6 @@ share/doc/HTML/en/kcontrol/spellchecking/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
-share/doc/HTML/en/kcontrol/windowmanagement/common
-share/doc/HTML/en/kcontrol/windowmanagement/index.cache.bz2
-share/doc/HTML/en/kcontrol/windowmanagement/index.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
@@ -837,6 +828,7 @@ share/icons/oxygen/128x128/emotes/face-smile.png
share/icons/oxygen/128x128/emotes/face-surprise.png
share/icons/oxygen/128x128/emotes/face-uncertain.png
share/icons/oxygen/128x128/mimetypes/application-illustrator.png
+share/icons/oxygen/128x128/mimetypes/application-msword.png
share/icons/oxygen/128x128/mimetypes/application-octet-stream.png
share/icons/oxygen/128x128/mimetypes/application-pdf.png
share/icons/oxygen/128x128/mimetypes/application-pgp-encrypted.png
@@ -848,7 +840,6 @@ share/icons/oxygen/128x128/mimetypes/application-rss+xml.png
share/icons/oxygen/128x128/mimetypes/application-rtf.png
share/icons/oxygen/128x128/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/128x128/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/128x128/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/128x128/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/128x128/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/128x128/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -909,6 +900,7 @@ share/icons/oxygen/128x128/mimetypes/application-x-kcsrc.png
share/icons/oxygen/128x128/mimetypes/application-x-kgetlist.png
share/icons/oxygen/128x128/mimetypes/application-x-kontour.png
share/icons/oxygen/128x128/mimetypes/application-x-krita.png
+share/icons/oxygen/128x128/mimetypes/application-x-kvtml.png
share/icons/oxygen/128x128/mimetypes/application-x-lha.png
share/icons/oxygen/128x128/mimetypes/application-x-lzop.png
share/icons/oxygen/128x128/mimetypes/application-x-marble.png
@@ -976,8 +968,8 @@ share/icons/oxygen/128x128/mimetypes/image-bmp.png
share/icons/oxygen/128x128/mimetypes/image-cgm.png
share/icons/oxygen/128x128/mimetypes/image-fax-g3.png
share/icons/oxygen/128x128/mimetypes/image-gif.png
+share/icons/oxygen/128x128/mimetypes/image-jp2.png
share/icons/oxygen/128x128/mimetypes/image-jpeg.png
-share/icons/oxygen/128x128/mimetypes/image-jpeg2000.png
share/icons/oxygen/128x128/mimetypes/image-png.png
share/icons/oxygen/128x128/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/128x128/mimetypes/image-svg+xml.png
@@ -1605,6 +1597,7 @@ share/icons/oxygen/16x16/emotes/face-smile.png
share/icons/oxygen/16x16/emotes/face-surprise.png
share/icons/oxygen/16x16/emotes/face-uncertain.png
share/icons/oxygen/16x16/mimetypes/application-illustrator.png
+share/icons/oxygen/16x16/mimetypes/application-msword.png
share/icons/oxygen/16x16/mimetypes/application-octet-stream.png
share/icons/oxygen/16x16/mimetypes/application-pdf.png
share/icons/oxygen/16x16/mimetypes/application-pgp-encrypted.png
@@ -1617,7 +1610,6 @@ share/icons/oxygen/16x16/mimetypes/application-rss+xml.png
share/icons/oxygen/16x16/mimetypes/application-rtf.png
share/icons/oxygen/16x16/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/16x16/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/16x16/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/16x16/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/16x16/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/16x16/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -1677,6 +1669,7 @@ share/icons/oxygen/16x16/mimetypes/application-x-kcsrc.png
share/icons/oxygen/16x16/mimetypes/application-x-kgetlist.png
share/icons/oxygen/16x16/mimetypes/application-x-kontour.png
share/icons/oxygen/16x16/mimetypes/application-x-krita.png
+share/icons/oxygen/16x16/mimetypes/application-x-kvtml.png
share/icons/oxygen/16x16/mimetypes/application-x-lha.png
share/icons/oxygen/16x16/mimetypes/application-x-lzop.png
share/icons/oxygen/16x16/mimetypes/application-x-marble.png
@@ -1744,8 +1737,8 @@ share/icons/oxygen/16x16/mimetypes/image-bmp.png
share/icons/oxygen/16x16/mimetypes/image-cgm.png
share/icons/oxygen/16x16/mimetypes/image-fax-g3.png
share/icons/oxygen/16x16/mimetypes/image-gif.png
+share/icons/oxygen/16x16/mimetypes/image-jp2.png
share/icons/oxygen/16x16/mimetypes/image-jpeg.png
-share/icons/oxygen/16x16/mimetypes/image-jpeg2000.png
share/icons/oxygen/16x16/mimetypes/image-png.png
share/icons/oxygen/16x16/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/16x16/mimetypes/image-svg+xml.png
@@ -2422,6 +2415,7 @@ share/icons/oxygen/22x22/emotes/face-surprise.png
share/icons/oxygen/22x22/emotes/face-uncertain.png
share/icons/oxygen/22x22/emotes/face-wink.png
share/icons/oxygen/22x22/mimetypes/application-illustrator.png
+share/icons/oxygen/22x22/mimetypes/application-msword.png
share/icons/oxygen/22x22/mimetypes/application-octet-stream.png
share/icons/oxygen/22x22/mimetypes/application-pdf.png
share/icons/oxygen/22x22/mimetypes/application-pgp-encrypted.png
@@ -2435,7 +2429,6 @@ share/icons/oxygen/22x22/mimetypes/application-rss+xml.png
share/icons/oxygen/22x22/mimetypes/application-rtf.png
share/icons/oxygen/22x22/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/22x22/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/22x22/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/22x22/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/22x22/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/22x22/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -2496,6 +2489,7 @@ share/icons/oxygen/22x22/mimetypes/application-x-kcsrc.png
share/icons/oxygen/22x22/mimetypes/application-x-kgetlist.png
share/icons/oxygen/22x22/mimetypes/application-x-kontour.png
share/icons/oxygen/22x22/mimetypes/application-x-krita.png
+share/icons/oxygen/22x22/mimetypes/application-x-kvtml.png
share/icons/oxygen/22x22/mimetypes/application-x-lha.png
share/icons/oxygen/22x22/mimetypes/application-x-lzop.png
share/icons/oxygen/22x22/mimetypes/application-x-marble.png
@@ -2563,8 +2557,8 @@ share/icons/oxygen/22x22/mimetypes/image-bmp.png
share/icons/oxygen/22x22/mimetypes/image-cgm.png
share/icons/oxygen/22x22/mimetypes/image-fax-g3.png
share/icons/oxygen/22x22/mimetypes/image-gif.png
+share/icons/oxygen/22x22/mimetypes/image-jp2.png
share/icons/oxygen/22x22/mimetypes/image-jpeg.png
-share/icons/oxygen/22x22/mimetypes/image-jpeg2000.png
share/icons/oxygen/22x22/mimetypes/image-png.png
share/icons/oxygen/22x22/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/22x22/mimetypes/image-svg+xml.png
@@ -3237,6 +3231,7 @@ share/icons/oxygen/32x32/emotes/face-smile.png
share/icons/oxygen/32x32/emotes/face-surprise.png
share/icons/oxygen/32x32/emotes/face-uncertain.png
share/icons/oxygen/32x32/mimetypes/application-illustrator.png
+share/icons/oxygen/32x32/mimetypes/application-msword.png
share/icons/oxygen/32x32/mimetypes/application-octet-stream.png
share/icons/oxygen/32x32/mimetypes/application-pdf.png
share/icons/oxygen/32x32/mimetypes/application-pgp-encrypted.png
@@ -3250,7 +3245,6 @@ share/icons/oxygen/32x32/mimetypes/application-rss+xml.png
share/icons/oxygen/32x32/mimetypes/application-rtf.png
share/icons/oxygen/32x32/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/32x32/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/32x32/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/32x32/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/32x32/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/32x32/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -3311,6 +3305,7 @@ share/icons/oxygen/32x32/mimetypes/application-x-kcsrc.png
share/icons/oxygen/32x32/mimetypes/application-x-kgetlist.png
share/icons/oxygen/32x32/mimetypes/application-x-kontour.png
share/icons/oxygen/32x32/mimetypes/application-x-krita.png
+share/icons/oxygen/32x32/mimetypes/application-x-kvtml.png
share/icons/oxygen/32x32/mimetypes/application-x-lha.png
share/icons/oxygen/32x32/mimetypes/application-x-lzop.png
share/icons/oxygen/32x32/mimetypes/application-x-marble.png
@@ -3378,8 +3373,8 @@ share/icons/oxygen/32x32/mimetypes/image-bmp.png
share/icons/oxygen/32x32/mimetypes/image-cgm.png
share/icons/oxygen/32x32/mimetypes/image-fax-g3.png
share/icons/oxygen/32x32/mimetypes/image-gif.png
+share/icons/oxygen/32x32/mimetypes/image-jp2.png
share/icons/oxygen/32x32/mimetypes/image-jpeg.png
-share/icons/oxygen/32x32/mimetypes/image-jpeg2000.png
share/icons/oxygen/32x32/mimetypes/image-png.png
share/icons/oxygen/32x32/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/32x32/mimetypes/image-svg+xml.png
@@ -4043,6 +4038,7 @@ share/icons/oxygen/48x48/emotes/face-smile.png
share/icons/oxygen/48x48/emotes/face-surprise.png
share/icons/oxygen/48x48/emotes/face-uncertain.png
share/icons/oxygen/48x48/mimetypes/application-illustrator.png
+share/icons/oxygen/48x48/mimetypes/application-msword.png
share/icons/oxygen/48x48/mimetypes/application-octet-stream.png
share/icons/oxygen/48x48/mimetypes/application-pdf.png
share/icons/oxygen/48x48/mimetypes/application-pgp-encrypted.png
@@ -4056,7 +4052,6 @@ share/icons/oxygen/48x48/mimetypes/application-rss+xml.png
share/icons/oxygen/48x48/mimetypes/application-rtf.png
share/icons/oxygen/48x48/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/48x48/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/48x48/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/48x48/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/48x48/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/48x48/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -4117,6 +4112,7 @@ share/icons/oxygen/48x48/mimetypes/application-x-kcsrc.png
share/icons/oxygen/48x48/mimetypes/application-x-kgetlist.png
share/icons/oxygen/48x48/mimetypes/application-x-kontour.png
share/icons/oxygen/48x48/mimetypes/application-x-krita.png
+share/icons/oxygen/48x48/mimetypes/application-x-kvtml.png
share/icons/oxygen/48x48/mimetypes/application-x-lha.png
share/icons/oxygen/48x48/mimetypes/application-x-lzop.png
share/icons/oxygen/48x48/mimetypes/application-x-marble.png
@@ -4184,8 +4180,8 @@ share/icons/oxygen/48x48/mimetypes/image-bmp.png
share/icons/oxygen/48x48/mimetypes/image-cgm.png
share/icons/oxygen/48x48/mimetypes/image-fax-g3.png
share/icons/oxygen/48x48/mimetypes/image-gif.png
+share/icons/oxygen/48x48/mimetypes/image-jp2.png
share/icons/oxygen/48x48/mimetypes/image-jpeg.png
-share/icons/oxygen/48x48/mimetypes/image-jpeg2000.png
share/icons/oxygen/48x48/mimetypes/image-png.png
share/icons/oxygen/48x48/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/48x48/mimetypes/image-svg+xml.png
@@ -4611,6 +4607,7 @@ share/icons/oxygen/64x64/emotes/face-smile.png
share/icons/oxygen/64x64/emotes/face-surprise.png
share/icons/oxygen/64x64/emotes/face-uncertain.png
share/icons/oxygen/64x64/mimetypes/application-illustrator.png
+share/icons/oxygen/64x64/mimetypes/application-msword.png
share/icons/oxygen/64x64/mimetypes/application-octet-stream.png
share/icons/oxygen/64x64/mimetypes/application-pdf.png
share/icons/oxygen/64x64/mimetypes/application-pgp-encrypted.png
@@ -4622,7 +4619,6 @@ share/icons/oxygen/64x64/mimetypes/application-rss+xml.png
share/icons/oxygen/64x64/mimetypes/application-rtf.png
share/icons/oxygen/64x64/mimetypes/application-vnd.ms-excel.png
share/icons/oxygen/64x64/mimetypes/application-vnd.ms-powerpoint.png
-share/icons/oxygen/64x64/mimetypes/application-vnd.ms-word.png
share/icons/oxygen/64x64/mimetypes/application-vnd.oasis.opendocument.chart.png
share/icons/oxygen/64x64/mimetypes/application-vnd.oasis.opendocument.database.png
share/icons/oxygen/64x64/mimetypes/application-vnd.oasis.opendocument.formula.png
@@ -4683,6 +4679,7 @@ share/icons/oxygen/64x64/mimetypes/application-x-kcsrc.png
share/icons/oxygen/64x64/mimetypes/application-x-kgetlist.png
share/icons/oxygen/64x64/mimetypes/application-x-kontour.png
share/icons/oxygen/64x64/mimetypes/application-x-krita.png
+share/icons/oxygen/64x64/mimetypes/application-x-kvtml.png
share/icons/oxygen/64x64/mimetypes/application-x-lha.png
share/icons/oxygen/64x64/mimetypes/application-x-lzop.png
share/icons/oxygen/64x64/mimetypes/application-x-marble.png
@@ -4750,8 +4747,8 @@ share/icons/oxygen/64x64/mimetypes/image-bmp.png
share/icons/oxygen/64x64/mimetypes/image-cgm.png
share/icons/oxygen/64x64/mimetypes/image-fax-g3.png
share/icons/oxygen/64x64/mimetypes/image-gif.png
+share/icons/oxygen/64x64/mimetypes/image-jp2.png
share/icons/oxygen/64x64/mimetypes/image-jpeg.png
-share/icons/oxygen/64x64/mimetypes/image-jpeg2000.png
share/icons/oxygen/64x64/mimetypes/image-png.png
share/icons/oxygen/64x64/mimetypes/image-svg+xml-compressed.png
share/icons/oxygen/64x64/mimetypes/image-svg+xml.png
@@ -5999,6 +5996,7 @@ share/icons/oxygen/scalable/emotes/small/22x22/face-surprise.svgz
share/icons/oxygen/scalable/emotes/small/22x22/face-uncertain.svgz
share/icons/oxygen/scalable/emotes/small/22x22/face-wink.svgz
share/icons/oxygen/scalable/mimetypes/application-illustrator.svgz
+share/icons/oxygen/scalable/mimetypes/application-msword.svgz
share/icons/oxygen/scalable/mimetypes/application-octet-stream.svgz
share/icons/oxygen/scalable/mimetypes/application-pdf.svgz
share/icons/oxygen/scalable/mimetypes/application-pgp-encrypted.svgz
@@ -6012,7 +6010,6 @@ share/icons/oxygen/scalable/mimetypes/application-rss+xml.svgz
share/icons/oxygen/scalable/mimetypes/application-rtf.svgz
share/icons/oxygen/scalable/mimetypes/application-vnd.ms-excel.svgz
share/icons/oxygen/scalable/mimetypes/application-vnd.ms-powerpoint.svgz
-share/icons/oxygen/scalable/mimetypes/application-vnd.ms-word.svgz
share/icons/oxygen/scalable/mimetypes/application-vnd.oasis.opendocument.chart.svgz
share/icons/oxygen/scalable/mimetypes/application-vnd.oasis.opendocument.database.svgz
share/icons/oxygen/scalable/mimetypes/application-vnd.oasis.opendocument.formula.svgz
@@ -6073,6 +6070,7 @@ share/icons/oxygen/scalable/mimetypes/application-x-kcsrc.svgz
share/icons/oxygen/scalable/mimetypes/application-x-kgetlist.svgz
share/icons/oxygen/scalable/mimetypes/application-x-kontour.svgz
share/icons/oxygen/scalable/mimetypes/application-x-krita.svgz
+share/icons/oxygen/scalable/mimetypes/application-x-kvtml.svgz
share/icons/oxygen/scalable/mimetypes/application-x-lha.svgz
share/icons/oxygen/scalable/mimetypes/application-x-lzop.svgz
share/icons/oxygen/scalable/mimetypes/application-x-marble.svgz
@@ -6140,12 +6138,13 @@ share/icons/oxygen/scalable/mimetypes/image-bmp.svgz
share/icons/oxygen/scalable/mimetypes/image-cgm.svgz
share/icons/oxygen/scalable/mimetypes/image-fax-g3.svgz
share/icons/oxygen/scalable/mimetypes/image-gif.svgz
+share/icons/oxygen/scalable/mimetypes/image-jp2.svgz
share/icons/oxygen/scalable/mimetypes/image-jpeg.svgz
-share/icons/oxygen/scalable/mimetypes/image-jpeg2000.svgz
share/icons/oxygen/scalable/mimetypes/image-png.svgz
share/icons/oxygen/scalable/mimetypes/image-svg+xml-compressed.svgz
share/icons/oxygen/scalable/mimetypes/image-svg+xml.svgz
share/icons/oxygen/scalable/mimetypes/image-tiff.svgz
+share/icons/oxygen/scalable/mimetypes/image-x-adobe-dng.svgz
share/icons/oxygen/scalable/mimetypes/image-x-applix-graphics.svgz
share/icons/oxygen/scalable/mimetypes/image-x-dcraw.svgz
share/icons/oxygen/scalable/mimetypes/image-x-dds.svgz
@@ -6176,6 +6175,7 @@ share/icons/oxygen/scalable/mimetypes/message-rfc822.svgz
share/icons/oxygen/scalable/mimetypes/message.svgz
share/icons/oxygen/scalable/mimetypes/odf.svgz
share/icons/oxygen/scalable/mimetypes/package-x-generic.svgz
+share/icons/oxygen/scalable/mimetypes/small/16x16/application-msword.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-pdf.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-pgp-encrypted.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-pgp-keys.svgz
@@ -6184,7 +6184,6 @@ share/icons/oxygen/scalable/mimetypes/small/16x16/application-rss+xml.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-rtf.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.ms-excel.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.ms-powerpoint.svgz
-share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.ms-word.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.oasis.opendocument.database.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.oasis.opendocument.formula.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/application-vnd.oasis.opendocument.graphics.svgz
@@ -6281,8 +6280,8 @@ share/icons/oxygen/scalable/mimetypes/small/16x16/image-bmp.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-cgm.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-fax-g3.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-gif.svgz
+share/icons/oxygen/scalable/mimetypes/small/16x16/image-jp2.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-jpeg.svgz
-share/icons/oxygen/scalable/mimetypes/small/16x16/image-jpeg2000.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-png.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-svg+xml-compressed.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/image-svg+xml.svgz
@@ -6366,6 +6365,7 @@ share/icons/oxygen/scalable/mimetypes/small/16x16/x-office-calendar.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/x-office-contact.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/x-office-document.svgz
share/icons/oxygen/scalable/mimetypes/small/16x16/x-office-spreadsheet.svgz
+share/icons/oxygen/scalable/mimetypes/small/22x22/application-msword.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-pdf.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-pgp-encrypted.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-pgp-keys.svgz
@@ -6374,7 +6374,6 @@ share/icons/oxygen/scalable/mimetypes/small/22x22/application-rss+xml.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-rtf.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.ms-excel.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.ms-powerpoint.svgz
-share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.ms-word.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.oasis.opendocument.database.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.oasis.opendocument.presentation.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/application-vnd.oasis.opendocument.spreadsheet.svgz
@@ -6451,8 +6450,8 @@ share/icons/oxygen/scalable/mimetypes/small/22x22/image-bmp.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-cgm.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-fax-g3.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-gif.svgz
+share/icons/oxygen/scalable/mimetypes/small/22x22/image-jp2.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-jpeg.svgz
-share/icons/oxygen/scalable/mimetypes/small/22x22/image-jpeg2000.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-png.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-svg+xml-compressed.svgz
share/icons/oxygen/scalable/mimetypes/small/22x22/image-svg+xml.svgz
@@ -7867,7 +7866,6 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrmtry share/doc/HTML/en/khelpcenter
@dirrmtry share/doc/HTML/en/kdesu
@dirrmtry share/doc/HTML/en/kdebugdialog
-@dirrmtry share/doc/HTML/en/kcontrol/windowmanagement
@dirrmtry share/doc/HTML/en/kcontrol/useragent
@dirrmtry share/doc/HTML/en/kcontrol/spellchecking
@dirrmtry share/doc/HTML/en/kcontrol/smb
@@ -7878,12 +7876,10 @@ share/sounds/KDE-Window-Shade-Up.ogg
@dirrmtry share/doc/HTML/en/kcontrol/panelappearance
@dirrmtry share/doc/HTML/en/kcontrol/panel
@dirrmtry share/doc/HTML/en/kcontrol/netpref
-@dirrmtry share/doc/HTML/en/kcontrol/mouse
@dirrmtry share/doc/HTML/en/kcontrol/language
@dirrmtry share/doc/HTML/en/kcontrol/khtml
@dirrmtry share/doc/HTML/en/kcontrol/kdm
@dirrmtry share/doc/HTML/en/kcontrol/kcmtaskbar
-@dirrmtry share/doc/HTML/en/kcontrol/kcmsmserver
@dirrmtry share/doc/HTML/en/kcontrol/kcmnotify
@dirrmtry share/doc/HTML/en/kcontrol/kcmlaunch
@dirrmtry share/doc/HTML/en/kcontrol/kcmkonsole
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 6f47c99b96ee..cfa17907a81f 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -35,8 +35,10 @@ USE_KDE4= kdelibs kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
USE_BZIP2= yes
USE_QT_VER= 4
-QT_COMPONENTS= assistant corelib dbus designer gui_build moc network opengl rcc \
- script svg sql qt3support qtestlib uic3 xml porting webkit
+QT_COMPONENTS= assistant corelib dbus designer gui network opengl \
+ script svg sql qt3support qtestlib xml webkit \
+ qmake_build moc_build rcc_build uic_build \
+ porting_build uic3_build
USE_GETTEXT= yes
USE_ICONV= yes
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index f1ce5655325e..9e9c3bdeaf2b 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.1.1.tar.bz2) = 53805b96727db2fe30773a3fa9f78b73
-SHA256 (KDE/kdebase-workspace-4.1.1.tar.bz2) = 47637b68405e75f13281bc88c94b7502c3d7b0097bf0a057625c76cc6e7233dd
-SIZE (KDE/kdebase-workspace-4.1.1.tar.bz2) = 47473442
+MD5 (KDE/kdebase-workspace-4.1.4.tar.bz2) = bdac9ac8055b976845587fe544d568be
+SHA256 (KDE/kdebase-workspace-4.1.4.tar.bz2) = 5f0a63ab3d97c9240ff78c4219572fa82ebe803a1f7ce5786ba44cca50c28e08
+SIZE (KDE/kdebase-workspace-4.1.4.tar.bz2) = 47504097
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 52a6f71e74f6..f66f119cafb4 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -207,6 +207,7 @@ include/taskmanager/task.h
include/taskmanager/taskmanager.h
include/ui_calendar.h
lib/kconf_update_bin/khotkeys_update
+lib/kconf_update_bin/krdb_clearlibrarypath
lib/kconf_update_bin/kwin_update_default_rules
lib/kconf_update_bin/kwin_update_window_settings
lib/kconf_update_bin/plasma-add-shortcut-to-menu
@@ -451,7 +452,9 @@ share/apps/kconf_update/kaccel.upd
share/apps/kconf_update/kcmdisplayrc.upd
share/apps/kconf_update/khotkeys_32b1_update.upd
share/apps/kconf_update/khotkeys_printscreen.upd
+share/apps/kconf_update/khotkeys_remove_shortcuts.upd
share/apps/kconf_update/konqueror_gestures_kde321_update.upd
+share/apps/kconf_update/krdb.upd
share/apps/kconf_update/ksmserver.upd
share/apps/kconf_update/kwin.upd
share/apps/kconf_update/kwin3_plugin.pl
@@ -462,6 +465,8 @@ 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_window_shortcuts.sh
+share/apps/kconf_update/kwin_window_shortcuts.upd
share/apps/kconf_update/kwiniconify.upd
share/apps/kconf_update/kwinsticky.upd
share/apps/kconf_update/kwinupdatewindowsettings.upd
@@ -759,6 +764,9 @@ share/doc/HTML/en/kcontrol/kcmaccess/index.docbook
share/doc/HTML/en/kcontrol/kcmdisplay/common
share/doc/HTML/en/kcontrol/kcmdisplay/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmdisplay/index.docbook
+share/doc/HTML/en/kcontrol/kcmsmserver/common
+share/doc/HTML/en/kcontrol/kcmsmserver/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcmsmserver/index.docbook
share/doc/HTML/en/kcontrol/kcmstyle/common
share/doc/HTML/en/kcontrol/kcmstyle/index.cache.bz2
share/doc/HTML/en/kcontrol/kcmstyle/index.docbook
@@ -773,6 +781,9 @@ 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/mouse/common
+share/doc/HTML/en/kcontrol/mouse/index.cache.bz2
+share/doc/HTML/en/kcontrol/mouse/index.docbook
share/doc/HTML/en/kcontrol/screensaver/common
share/doc/HTML/en/kcontrol/screensaver/index.cache.bz2
share/doc/HTML/en/kcontrol/screensaver/index.docbook
@@ -781,6 +792,12 @@ share/doc/HTML/en/kcontrol/splashscreen/get-new-theme.png
share/doc/HTML/en/kcontrol/splashscreen/index.cache.bz2
share/doc/HTML/en/kcontrol/splashscreen/index.docbook
share/doc/HTML/en/kcontrol/splashscreen/splash-main.png
+share/doc/HTML/en/kcontrol/windowbehaviour/common
+share/doc/HTML/en/kcontrol/windowbehaviour/index.cache.bz2
+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/kdm/common
share/doc/HTML/en/kdm/index.cache.bz2
share/doc/HTML/en/kdm/index.docbook
@@ -2028,12 +2045,16 @@ share/wallpapers/default_blue.jpg.desktop
@dirrmtry share/doc/HTML/en/kmenuedit
@dirrmtry share/doc/HTML/en/klipper
@dirrmtry share/doc/HTML/en/kdm
+@dirrmtry share/doc/HTML/en/kcontrol/windowspecific
+@dirrmtry share/doc/HTML/en/kcontrol/windowbehaviour
@dirrmtry share/doc/HTML/en/kcontrol/splashscreen
@dirrmtry share/doc/HTML/en/kcontrol/screensaver
+@dirrmtry share/doc/HTML/en/kcontrol/mouse
@dirrmtry share/doc/HTML/en/kcontrol/kwindecoration
@dirrmtry share/doc/HTML/en/kcontrol/keys
@dirrmtry share/doc/HTML/en/kcontrol/keyboard
@dirrmtry share/doc/HTML/en/kcontrol/kcmstyle
+@dirrmtry share/doc/HTML/en/kcontrol/kcmsmserver
@dirrmtry share/doc/HTML/en/kcontrol/kcmdisplay
@dirrmtry share/doc/HTML/en/kcontrol/kcmaccess
@dirrmtry share/doc/HTML/en/kcontrol/joystick
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 39e806112943..ba14aa4a884e 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -24,10 +24,10 @@ LATEST_LINK= ${PORTNAME}4
USE_BZIP2= yes
USE_QT_VER= 4
-QT_COMPONENTS= corelib opengl moc rcc uic dbus qt3support \
- designer network svg qtestlib
+QT_COMPONENTS= corelib opengl dbus qt3support \
+ designer network svg qtestlib \
+ qmake_build moc_build rcc_build uic_build
-USE_FAM= yes
USE_GETTEXT= yes
USE_KDE4= kdelibs workspace kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 1d9901e4c4de..6043ff083d16 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-4.1.1.tar.bz2) = 33ab20f61aa33ed473fec710ad250ac7
-SHA256 (KDE/kdebase-4.1.1.tar.bz2) = 0bc05e9b58b252d6d8f1281a2471969bbd5325945af27ff9630e58af729deb7b
-SIZE (KDE/kdebase-4.1.1.tar.bz2) = 4412289
+MD5 (KDE/kdebase-4.1.4.tar.bz2) = 9a76438f5453a3ba4f773db6847825f7
+SHA256 (KDE/kdebase-4.1.4.tar.bz2) = 1c8c0390eb231a84819bfa9f6015a5c99fbf44b622e22ea39bfdc7caf3715a8f
+SIZE (KDE/kdebase-4.1.4.tar.bz2) = 4403306
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index b327b456960f..a27496373688 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -398,8 +398,6 @@ share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png
share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png
share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png
share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png
-share/apps/konqueror/konq-filemanagement.rc
-share/apps/konqueror/konq-webbrowsing.rc
share/apps/konqueror/konqueror.rc
share/apps/konqueror/pics/arrow_bottomleft.png
share/apps/konqueror/pics/arrow_bottomright.png
@@ -560,8 +558,6 @@ share/doc/HTML/en/konqueror/sidebar.docbook
share/doc/HTML/en/konsole/common
share/doc/HTML/en/konsole/index.cache.bz2
share/doc/HTML/en/konsole/index.docbook
-share/doc/HTML/en/konsole/konsole.png
-share/doc/HTML/en/konsole/tabbar.png
share/doc/HTML/en/kwrite/common
share/doc/HTML/en/kwrite/index.cache.bz2
share/doc/HTML/en/kwrite/index.docbook
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index ea2987d6ebf0..ac45b8dc4cb0 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -49,22 +49,31 @@ LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
CONFLICTS= qt4-phonon-4*
LATEST_LINK= ${PORTNAME}4
+CMAKE_ARGS+= -DWITH_FAM:BOOL=Off
+
USE_KDE4= kdeprefix kdehier automoc4 sharedmime
KDE4_BUILDENV= yes
USE_BZIP2= yes
-USE_FAM= yes
USE_GETTEXT= yes
USE_OPENSSL= yes
USE_QT_VER= 4
-QT_COMPONENTS= corelib dbus gui moc network opengl qmake qt3support \
- qtestlib rcc script sql svg uic3 xml designer \
- assistant svg qdbusviewer makeqpf imageformats
+QT_COMPONENTS= corelib dbus gui network opengl qt3support \
+ qtestlib script sql svg xml designer \
+ assistant svg qdbusviewer makeqpf imageformats \
+ qmake_build moc_build rcc_build uic_build uic3_build
USE_GNOME= libxml2 libxslt
MAN1= checkXML.1 kde4-config.1 makekdewidgets.1 kdecmake.1
MAN7= kdeoptions.7 qtoptions.7
MAN8= kbuildsycoca4.8
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700042
+EXTRA_PATCHES= ${FILESDIR}/extrapatch-nepomuk-core-resourcefiltermodel.cpp \
+ ${FILESDIR}/extrapatch-nepomuk-core-resourcefiltermodel.h
+.endif
+
post-extract:
${MKDIR} ${WRKSRC}
@@ -85,4 +94,4 @@ pre-configure:
post-install:
@-update-mime-database ${KDE4_PREFIX}/share/mime
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 657ab6a9563a..5eee0f4125be 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-4.1.1.tar.bz2) = d75ec557cd864e3f9150059c3e58ed61
-SHA256 (KDE/kdelibs-4.1.1.tar.bz2) = b830e3eba8d65ad257b16c920e1bf18fcc7c0db84ec244d450a0db1cc0626a8f
-SIZE (KDE/kdelibs-4.1.1.tar.bz2) = 9110725
+MD5 (KDE/kdelibs-4.1.4.tar.bz2) = ffdb0340a72aaf06a0b98f354c0c59ef
+SHA256 (KDE/kdelibs-4.1.4.tar.bz2) = e98891cfaec6d60e361ed8630c0ecaf019bb4d497f984574ee76963236f43360
+SIZE (KDE/kdelibs-4.1.4.tar.bz2) = 9118858
diff --git a/x11/kdelibs4/files/extrapatch-nepomuk-core-resourcefiltermodel.cpp b/x11/kdelibs4/files/extrapatch-nepomuk-core-resourcefiltermodel.cpp
new file mode 100644
index 000000000000..9ac26cd42ad8
--- /dev/null
+++ b/x11/kdelibs4/files/extrapatch-nepomuk-core-resourcefiltermodel.cpp
@@ -0,0 +1,19 @@
+--- ../nepomuk/core/resourcefiltermodel.cpp.orig 2009-01-06 23:35:20.000000000 +0000
++++ ../nepomuk/core/resourcefiltermodel.cpp 2009-01-09 10:03:30.000000000 +0000
+@@ -42,15 +42,9 @@
+ using namespace Soprano;
+
+
+-uint Soprano::qHash( const Soprano::Node& node )
+-{
+- return qHash( node.toString() );
+-}
+-
+-// @deprecated: just for keeping binary compatibility
+ uint qHash( const Soprano::Node& node )
+ {
+- return Soprano::qHash( node );
++ return qHash( node.toString() );
+ }
+
+ class Nepomuk::ResourceFilterModel::Private
diff --git a/x11/kdelibs4/files/extrapatch-nepomuk-core-resourcefiltermodel.h b/x11/kdelibs4/files/extrapatch-nepomuk-core-resourcefiltermodel.h
new file mode 100644
index 000000000000..e3ebee61dca4
--- /dev/null
+++ b/x11/kdelibs4/files/extrapatch-nepomuk-core-resourcefiltermodel.h
@@ -0,0 +1,13 @@
+--- ../nepomuk/core/resourcefiltermodel.h.orig 2009-01-06 23:35:20.000000000 +0000
++++ ../nepomuk/core/resourcefiltermodel.h 2009-01-09 10:15:12.000000000 +0000
+@@ -113,9 +113,7 @@
+ };
+ }
+
+-namespace Soprano {
+- uint qHash( const Node& node );
+-}
++uint qHash( const Soprano::Node& node );
+
+
+ #endif
diff --git a/x11/kdelibs4/files/patch-kfile-kfileplacesmodel.cpp b/x11/kdelibs4/files/patch-kfile-kfileplacesmodel.cpp
new file mode 100644
index 000000000000..a6090fc7c2df
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kfile-kfileplacesmodel.cpp
@@ -0,0 +1,106 @@
+--- ../kfile/kfileplacesmodel.cpp 2008/08/15 10:29:57 847375
++++ ../kfile/kfileplacesmodel.cpp 2008/08/15 10:30:45 847376
+@@ -54,7 +54,7 @@
+ public:
+ Private(KFilePlacesModel *self) : q(self), bookmarkManager(0), sharedBookmarks(0) {}
+ ~Private()
+- {
++ {
+ delete sharedBookmarks;
+ qDeleteAll(items);
+ }
+@@ -68,7 +68,7 @@
+ Solid::Predicate predicate;
+ KBookmarkManager *bookmarkManager;
+ KFilePlacesSharedBookmarks * sharedBookmarks;
+-
++
+ void reloadAndSignal();
+ QList<KFilePlacesItem *> loadBookmarkList();
+
+@@ -663,8 +663,7 @@
+ {
+ Solid::Device device = deviceForIndex(index);
+
+- if ( (device.is<Solid::StorageAccess>() && device.as<Solid::StorageAccess>()->isAccessible())
+- || device.is<Solid::OpticalDisc>()) {
++ if (device.is<Solid::StorageAccess>() && device.as<Solid::StorageAccess>()->isAccessible()) {
+
+ Solid::StorageDrive *drive = device.as<Solid::StorageDrive>();
+
+@@ -680,17 +679,39 @@
+ removable = drive->isRemovable();
+ }
+
++ QString iconName;
+ QString text;
+ QString label = data(index, Qt::DisplayRole).toString().replace('&',"&&");
+
+ if (device.is<Solid::OpticalDisc>()) {
+- text = i18n("&Eject '%1'", label);
++ text = i18n("&Release '%1'", label);
+ } else if (removable || hotpluggable) {
+ text = i18n("&Safely Remove '%1'", label);
++ iconName = "media-eject";
+ } else {
+ text = i18n("&Unmount '%1'", label);
++ iconName = "media-eject";
+ }
+
++ if (!iconName.isEmpty()) {
++ return new QAction(KIcon(iconName), text, 0);
++ } else {
++ return new QAction(text, 0);
++ }
++ }
++
++ return 0;
++}
++
++QAction *KFilePlacesModel::ejectActionForIndex(const QModelIndex &index) const
++{
++ Solid::Device device = deviceForIndex(index);
++
++ if (device.is<Solid::OpticalDisc>()) {
++
++ QString label = data(index, Qt::DisplayRole).toString().replace('&',"&&");
++ QString text = i18n("&Eject '%1'", label);
++
+ return new QAction(KIcon("media-eject"), text, 0);
+ }
+
+@@ -701,6 +722,18 @@
+ {
+ Solid::Device device = deviceForIndex(index);
+
++ Solid::StorageAccess *access = device.as<Solid::StorageAccess>();
++
++ connect(access, SIGNAL(teardownDone(Solid::ErrorType, QVariant, const QString &)),
++ this, SLOT(_k_storageTeardownDone(Solid::ErrorType, QVariant)));
++
++ device.as<Solid::StorageAccess>()->teardown();
++}
++
++void KFilePlacesModel::requestEject(const QModelIndex &index)
++{
++ Solid::Device device = deviceForIndex(index);
++
+ Solid::OpticalDrive *drive = device.parent().as<Solid::OpticalDrive>();
+
+ if (drive!=0) {
+@@ -709,12 +742,9 @@
+
+ drive->eject();
+ } else {
+- Solid::StorageAccess *access = device.as<Solid::StorageAccess>();
+-
+- connect(access, SIGNAL(teardownDone(Solid::ErrorType, QVariant, const QString &)),
+- this, SLOT(_k_storageTeardownDone(Solid::ErrorType, QVariant)));
+-
+- device.as<Solid::StorageAccess>()->teardown();
++ QString label = data(index, Qt::DisplayRole).toString().replace('&',"&&");
++ QString message = i18n("The device '%1' is not a disc and can't be ejected.", label);
++ emit errorMessage(message);
+ }
+ }
+
diff --git a/x11/kdelibs4/files/patch-kfile-kfileplacesmodel.h b/x11/kdelibs4/files/patch-kfile-kfileplacesmodel.h
new file mode 100644
index 000000000000..ba6853976ab3
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kfile-kfileplacesmodel.h
@@ -0,0 +1,12 @@
+--- ../kfile/kfileplacesmodel.h 2008/08/15 10:29:57 847375
++++ ../kfile/kfileplacesmodel.h 2008/08/15 10:30:45 847376
+@@ -60,7 +60,9 @@
+ KBookmark bookmarkForIndex(const QModelIndex &index) const;
+
+ QAction *teardownActionForIndex(const QModelIndex &index) const;
++ QAction *ejectActionForIndex(const QModelIndex &index) const;
+ void requestTeardown(const QModelIndex &index);
++ void requestEject(const QModelIndex &index);
+ void requestSetup(const QModelIndex &index);
+
+ void addPlace(const QString &text, const KUrl &url, const QString &iconName = QString(), const QString &appName = QString());
diff --git a/x11/kdelibs4/files/patch-kfile-kfileplacesview.cpp b/x11/kdelibs4/files/patch-kfile-kfileplacesview.cpp
new file mode 100644
index 000000000000..ffb64af99a56
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kfile-kfileplacesview.cpp
@@ -0,0 +1,65 @@
+--- ../kfile/kfileplacesview.cpp 2008/08/06 22:07:11 843298
++++ ../kfile/kfileplacesview.cpp 2008/08/15 10:30:45 847376
+@@ -551,6 +551,9 @@
+ QAction *edit = 0;
+ QAction *hide = 0;
+ QAction *emptyTrash = 0;
++ QAction* eject = 0;
++ QAction* teardown = 0;
++
+ if (index.isValid()) {
+ if (!placesModel->isDevice(index)) {
+ if (placesModel->url(index) == KUrl("trash:/")) {
+@@ -561,6 +564,22 @@
+ }
+
+ edit = menu.addAction(KIcon("document-properties"), i18n("&Edit '%1'...", label));
++ } else {
++ eject = placesModel->ejectActionForIndex(index);
++ if (eject!=0) {
++ eject->setParent(&menu);
++ menu.addAction(eject);
++ }
++
++ teardown = placesModel->teardownActionForIndex(index);
++ if (teardown!=0) {
++ teardown->setParent(&menu);
++ menu.addAction(teardown);
++ }
++
++ if (teardown!=0 || eject!=0) {
++ menu.addSeparator();
++ }
+ }
+
+ hide = menu.addAction(i18n("&Hide '%1'", label));
+@@ -575,19 +594,11 @@
+ showAll->setChecked(d->showAll);
+ }
+
+- QAction* remove = 0L;
+- QAction* teardown = 0L;
++ QAction* remove = 0;
+ if (index.isValid()) {
+ if (!placesModel->isDevice(index)) {
+ menu.addSeparator();
+ remove = menu.addAction( KIcon("edit-delete"), i18n("&Remove '%1'", label));
+- } else {
+- teardown = placesModel->teardownActionForIndex(index);
+- if (teardown!=0) {
+- teardown->setParent(&menu);
+- menu.addSeparator();
+- menu.addAction(teardown);
+- }
+ }
+ }
+
+@@ -646,6 +657,8 @@
+ setShowAll(showAll->isChecked());
+ } else if (teardown != 0 && result == teardown) {
+ placesModel->requestTeardown(index);
++ } else if (eject != 0 && result == eject) {
++ placesModel->requestEject(index);
+ }
+
+ index = placesModel->closestItem(d->currentUrl);
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index f3b8ca59ee6f..8efe0d60cf2a 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qimageblitz
PORTVERSION= 0.0.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF
@@ -17,7 +18,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_QT_VER= 4
-QT_COMPONENTS= qmake moc uic gui rcc
+QT_COMPONENTS= gui qmake_build moc_build uic_build rcc_build
USE_CMAKE= yes
CMAKE_DEBUG= yes
CMAKE_VERBOSE= yes