Update to KDE SC 4.14.3

4 files changed, 23 insertions, 32 deletions

diff --git a/x11/kde-baseapps4/Makefile b/x11/kde-baseapps4/Makefile
index 44fb46ded87..6d8d587fcee 100644
--- a/x11/kde-baseapps4/Makefile
+++ b/x11/kde-baseapps4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2014/11/07 19:39:42 adam Exp $
+# $NetBSD: Makefile,v 1.29 2014/11/13 10:53:49 markd Exp $
 
 DISTNAME=	kde-baseapps-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	5
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 4 integrated X11 desktop
 
@@ -28,9 +27,10 @@ CHECK_INTERPRETER_SKIP=	share/kde/templates/.source/Program.desktop
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/qimageblitz/buildlink3.mk"
-.include "../../misc/nepomuk-core/buildlink3.mk"
-.include "../../misc/nepomuk-widgets/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/baloo/buildlink3.mk"
+.include "../../sysutils/baloo-widgets/buildlink3.mk"
+.include "../../sysutils/kfilemetadata/buildlink3.mk"
 .include "../../x11/kactivities/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../x11/kde-runtime4/buildlink3.mk"
diff --git a/x11/kde-baseapps4/PLIST b/x11/kde-baseapps4/PLIST
index 6d92be4825e..62806dca5a0 100644
--- a/x11/kde-baseapps4/PLIST
+++ b/x11/kde-baseapps4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/02/01 02:20:53 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/11/13 10:53:49 markd Exp $
 bin/dolphin
 bin/fsview
 bin/kbookmarkmerger
@@ -85,7 +85,7 @@ lib/libkdeinit4_kfmclient.so
 lib/libkdeinit4_konqueror.so
 lib/libkonq.so
 lib/libkonq.so.5
-lib/libkonq.so.5.11.5
+lib/libkonq.so.5.14.3
 lib/libkonqsidebarplugin.so
 lib/libkonqsidebarplugin.so.4
 lib/libkonqsidebarplugin.so.${PKGVERSION}
@@ -93,6 +93,7 @@ lib/libkonquerorprivate.so.4
 lib/libkonquerorprivate.so.${PKGVERSION}
 man/man1/kbookmarkmerger.1
 man/man1/kfind.1
+share/appdata/dolphin.appdata.xml
 share/applications/kde4/Home.desktop
 share/applications/kde4/dolphin.desktop
 share/applications/kde4/kdepasswd.desktop
@@ -121,6 +122,7 @@ share/doc/kde/HTML/en/dolphin/index.docbook
 share/doc/kde/HTML/en/dolphin/locationbar-breadcrumb.png
 share/doc/kde/HTML/en/dolphin/locationbar-context-menu.png
 share/doc/kde/HTML/en/dolphin/locationbar-editable.png
+share/doc/kde/HTML/en/dolphin/locationbar-kioslaves-menu.png
 share/doc/kde/HTML/en/dolphin/locationbar-places-icon.png
 share/doc/kde/HTML/en/dolphin/nepomuk-search-more-options.png
 share/doc/kde/HTML/en/dolphin/nepomuk-search.png
@@ -392,7 +394,12 @@ share/kde4/services/smb.desktop
 share/kde4/services/useragent.desktop
 share/kde4/services/useragentstrings/android10.desktop
 share/kde4/services/useragentstrings/chrome10onwinnt51.desktop
+share/kde4/services/useragentstrings/chrome22oncurrent.desktop
+share/kde4/services/useragentstrings/chrome23oncurrent.desktop
+share/kde4/services/useragentstrings/chrome24oncurrent.desktop
 share/kde4/services/useragentstrings/chrome50oncurrent.desktop
+share/kde4/services/useragentstrings/firefox15oncurrent.desktop
+share/kde4/services/useragentstrings/firefox16oncurrent.desktop
 share/kde4/services/useragentstrings/firefox20oncurrent.desktop
 share/kde4/services/useragentstrings/firefox30oncurrent.desktop
 share/kde4/services/useragentstrings/firefox36oncurrent.desktop
@@ -403,12 +410,16 @@ share/kde4/services/useragentstrings/ie55onwinnt5.desktop
 share/kde4/services/useragentstrings/ie60oncurrent.desktop
 share/kde4/services/useragentstrings/ie60onwinnt51.desktop
 share/kde4/services/useragentstrings/ie70onwinnt51.desktop
+share/kde4/services/useragentstrings/ie80onwinnt60.desktop
+share/kde4/services/useragentstrings/ie90onwinnt71.desktop
 share/kde4/services/useragentstrings/lynxoncurrent.desktop
 share/kde4/services/useragentstrings/nn301oncurrent.desktop
 share/kde4/services/useragentstrings/nn475oncurrent.desktop
 share/kde4/services/useragentstrings/nn475onwin95.desktop
 share/kde4/services/useragentstrings/ns71oncurrent.desktop
 share/kde4/services/useragentstrings/ns71onwinnt51.desktop
+share/kde4/services/useragentstrings/op1162oncurrent.desktop
+share/kde4/services/useragentstrings/op1202oncurrent.desktop
 share/kde4/services/useragentstrings/op403onwinnt4.desktop
 share/kde4/services/useragentstrings/op85oncurrent.desktop
 share/kde4/services/useragentstrings/op90oncurrent.desktop
@@ -417,6 +428,8 @@ share/kde4/services/useragentstrings/safari20.desktop
 share/kde4/services/useragentstrings/safari30oniphone.desktop
 share/kde4/services/useragentstrings/safari32.desktop
 share/kde4/services/useragentstrings/safari40.desktop
+share/kde4/services/useragentstrings/safari517.desktop
+share/kde4/services/useragentstrings/safari60.desktop
 share/kde4/services/useragentstrings/w3moncurrent.desktop
 share/kde4/services/useragentstrings/wgetoncurrent.desktop
 share/kde4/services/webarchivethumbnail.desktop
diff --git a/x11/kde-baseapps4/distinfo b/x11/kde-baseapps4/distinfo
index f74398bc4a5..4c00afe7cc0 100644
--- a/x11/kde-baseapps4/distinfo
+++ b/x11/kde-baseapps4/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2014/02/01 02:20:53 markd Exp $
+$NetBSD: distinfo,v 1.9 2014/11/13 10:53:49 markd Exp $
 
-SHA1 (kde-baseapps-4.11.5.tar.xz) = 3271747be25f70dbed8ddc61ea3b803473b1e46e
-RMD160 (kde-baseapps-4.11.5.tar.xz) = 6afae75f5dca1d7a77563d83cf3fcce967abee33
-Size (kde-baseapps-4.11.5.tar.xz) = 2520984 bytes
-SHA1 (patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp) = ee7482a2dee09ea68907c899aac08be014136b88
+SHA1 (kde-baseapps-4.14.3.tar.xz) = c4e28755454e1925b96eaf5374ca5c2f6c8bd9c8
+RMD160 (kde-baseapps-4.14.3.tar.xz) = 318ac5cae826538ae6e4fcb805ece512f537378a
+Size (kde-baseapps-4.14.3.tar.xz) = 2548152 bytes
diff --git a/x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp b/x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp
deleted file mode 100644
index 4169a7e95a6..00000000000
--- a/x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp,v 1.1 2013/06/22 20:18:26 jperkin Exp $
-
-Avoid non-portable dirent d_type on SunOS.
-
---- dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp.orig	2013-05-03 04:36:32.006246684 +0000
-+++ dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp
-@@ -1186,10 +1186,14 @@ int KFileItemModelRolesUpdater::subItems
-             // If only directories are counted, consider an unknown file type and links also
-             // as directory instead of trying to do an expensive stat()
-             // (see bugs 292642 and 299997).
-+#ifdef __sun
-+            const bool countEntry = !showFoldersOnly;
-+#else
-             const bool countEntry = !showFoldersOnly ||
-                                     dirEntry->d_type == DT_DIR ||
-                                     dirEntry->d_type == DT_LNK ||
-                                     dirEntry->d_type == DT_UNKNOWN;
-+#endif
-             if (countEntry) {
-                 ++count;
-             }