[pkgsrc/trunk]: pkgsrc/x11 Update to KDE SC 4.14.3

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0dbf093db336
branches:  trunk
changeset: 641616:0dbf093db336
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Nov 13 10:53:49 2014 +0000

description:
Update to KDE SC 4.14.3

diffstat:

 x11/kactivities/Makefile                                                              |   7 +-
 x11/kactivities/PLIST                                                                 |  23 +----
 x11/kactivities/distinfo                                                              |   8 +-
 x11/kde-baseapps4/Makefile                                                            |   8 +-
 x11/kde-baseapps4/PLIST                                                               |  17 ++-
 x11/kde-baseapps4/distinfo                                                            |   9 +-
 x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp |  21 ----
 x11/kde-runtime4/Makefile                                                             |   6 +-
 x11/kde-runtime4/PLIST                                                                |  36 +++---
 x11/kde-runtime4/distinfo                                                             |   8 +-
 x11/kde-workspace4/Makefile                                                           |  10 +-
 x11/kde-workspace4/PLIST                                                              |  50 ++++-----
 x11/kde-workspace4/distinfo                                                           |   8 +-
 x11/konsole/Makefile                                                                  |   3 +-
 x11/konsole/PLIST                                                                     |   4 +-
 x11/konsole/distinfo                                                                  |  10 +-
 x11/konsole/patches/patch-src_ProcessInfo.cpp                                         |  16 +-
 x11/py-kde4/Makefile                                                                  |   5 +-
 x11/py-kde4/PLIST                                                                     |   5 +-
 x11/py-kde4/patches/patch-CMakeLists.txt                                              |  51 +--------
 x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip                          |  35 ------
 x11/py-kde4/patches/patch-sip_plasma_glapplet.sip                                     |  18 ---
 x11/py-kde4/patches/patch-sip_solid_networking.sip                                    |  33 ------
 x11/py-kde4/patches/patch-tools_pykdeuic4_pykdeuic4.py                                |  26 -----
 24 files changed, 116 insertions(+), 301 deletions(-)

diffs (truncated from 1003 to 300 lines):

diff -r 5aa9ca410b51 -r 0dbf093db336 x11/kactivities/Makefile
--- a/x11/kactivities/Makefile  Thu Nov 13 10:50:44 2014 +0000
+++ b/x11/kactivities/Makefile  Thu Nov 13 10:53:49 2014 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2014/11/07 19:39:26 adam Exp $
+# $NetBSD: Makefile,v 1.29 2014/11/13 10:53:49 markd Exp $
 
-DISTNAME=      kactivities-${_KDE_VERSION}
-PKGREVISION=   6
+DISTNAME=      kactivities-4.13.3
 CATEGORIES=    x11
 COMMENT=       KDE Activity Manager
+MASTER_SITES=  ${MASTER_SITE_KDE:=4.13.3/src/}
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
@@ -18,6 +18,5 @@
        ${INSTALL_DATA} ${FILESDIR}/activitymanagerrc ${DESTDIR}${PREFIX}/share/kde/config
 
 .include "../../meta-pkgs/kde4/kde4.mk"
-.include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5aa9ca410b51 -r 0dbf093db336 x11/kactivities/PLIST
--- a/x11/kactivities/PLIST     Thu Nov 13 10:50:44 2014 +0000
+++ b/x11/kactivities/PLIST     Thu Nov 13 10:53:49 2014 +0000
@@ -1,59 +1,38 @@
-@comment $NetBSD: PLIST,v 1.5 2013/11/07 13:35:56 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/11/13 10:53:49 markd Exp $
 bin/kactivitymanagerd
 include/KDE/KActivities/Consumer
 include/KDE/KActivities/Controller
 include/KDE/KActivities/Info
-include/KDE/KActivities/Models/ActivityModel
-include/KDE/KActivities/Models/ResourceModel
 include/KDE/KActivities/ResourceInstance
 include/KDE/KActivities/Version
-include/kactivities-models/activitymodel.h
-include/kactivities-models/kactivities_models_export.h
-include/kactivities-models/resourcemodel.h
 include/kactivities/consumer.h
 include/kactivities/controller.h
 include/kactivities/info.h
 include/kactivities/kactivities_export.h
 include/kactivities/resourceinstance.h
 include/kactivities/version.h
-lib/cmake/KActivities-Models/KActivities-ModelsConfig.cmake
-lib/cmake/KActivities-Models/KActivities-ModelsConfigVersion.cmake
-lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets-${TARGET}.cmake
-lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets.cmake
 lib/cmake/KActivities/KActivitiesConfig.cmake
 lib/cmake/KActivities/KActivitiesConfigVersion.cmake
 lib/cmake/KActivities/KActivitiesLibraryTargets-${TARGET}.cmake
 lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
 lib/kde4/activitymanager_plugin_activityranking.so
 lib/kde4/activitymanager_plugin_globalshortcuts.so
-lib/kde4/activitymanager_plugin_nepomuk.so
 lib/kde4/activitymanager_plugin_slc.so
 lib/kde4/activitymanager_plugin_sqlite.so
 lib/kde4/activitymanager_plugin_virtualdesktopswitch.so
-lib/kde4/imports/org/kde/activities/models/libkactivities-models-component-plugin.so
-lib/kde4/imports/org/kde/activities/models/qmldir
-lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so
 lib/kde4/kcm_activities.so
-lib/kde4/kio_activities.so
-lib/libkactivities-models.so
-lib/libkactivities-models.so.1
-lib/libkactivities-models.so.1.0.0
 lib/libkactivities.so
 lib/libkactivities.so.6
 lib/libkactivities.so.6.2.0
-lib/pkgconfig/libkactivities-models.pc
 lib/pkgconfig/libkactivities.pc
 share/kde/apps/activitymanager/workspace/settings/BlacklistApplicationView.qml
 share/kde/config/activitymanagerrc
-share/kde4/services/activities.protocol
 share/kde4/services/activitymanager-plugin-activityranking.desktop
 share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
-share/kde4/services/activitymanager-plugin-nepomuk.desktop
 share/kde4/services/activitymanager-plugin-slc.desktop
 share/kde4/services/activitymanager-plugin-sqlite.desktop
 share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop
 share/kde4/services/kactivitymanagerd.desktop
-share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop
 share/kde4/services/kcm_activities.desktop
 share/kde4/servicetypes/activitymanager-plugin.desktop
 share/ontology/kde/kao.ontology
diff -r 5aa9ca410b51 -r 0dbf093db336 x11/kactivities/distinfo
--- a/x11/kactivities/distinfo  Thu Nov 13 10:50:44 2014 +0000
+++ b/x11/kactivities/distinfo  Thu Nov 13 10:53:49 2014 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:53 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 10:53:49 markd Exp $
 
-SHA1 (kactivities-4.11.5.tar.xz) = 7d289e39d259ae53b70079d38f4eab430e3db514
-RMD160 (kactivities-4.11.5.tar.xz) = 6e091ef92cbf93f611c25552d487c305c13294c7
-Size (kactivities-4.11.5.tar.xz) = 87108 bytes
+SHA1 (kactivities-4.13.3.tar.xz) = 54813db8808da63dda7980711ba5d4e01e56d2b0
+RMD160 (kactivities-4.13.3.tar.xz) = e0c87daffd313b8146b3e110c4f183fb06020cd4
+Size (kactivities-4.13.3.tar.xz) = 87476 bytes
diff -r 5aa9ca410b51 -r 0dbf093db336 x11/kde-baseapps4/Makefile
--- a/x11/kde-baseapps4/Makefile        Thu Nov 13 10:50:44 2014 +0000
+++ b/x11/kde-baseapps4/Makefile        Thu Nov 13 10:53:49 2014 +0000
@@ -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 @@
 
 .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 -r 5aa9ca410b51 -r 0dbf093db336 x11/kde-baseapps4/PLIST
--- a/x11/kde-baseapps4/PLIST   Thu Nov 13 10:50:44 2014 +0000
+++ b/x11/kde-baseapps4/PLIST   Thu Nov 13 10:53:49 2014 +0000
@@ -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_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.${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/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/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/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/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 -r 5aa9ca410b51 -r 0dbf093db336 x11/kde-baseapps4/distinfo
--- a/x11/kde-baseapps4/distinfo        Thu Nov 13 10:50:44 2014 +0000
+++ b/x11/kde-baseapps4/distinfo        Thu Nov 13 10:53:49 2014 +0000
@@ -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 -r 5aa9ca410b51 -r 0dbf093db336 x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp
--- a/x11/kde-baseapps4/patches/patch-dolphin_src_kitemviews_kfileitemmodelrolesupdater.cpp     Thu Nov 13 10:50:44 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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;
-             }
diff -r 5aa9ca410b51 -r 0dbf093db336 x11/kde-runtime4/Makefile
--- a/x11/kde-runtime4/Makefile Thu Nov 13 10:50:44 2014 +0000
+++ b/x11/kde-runtime4/Makefile Thu Nov 13 10:53:49 2014 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2014/11/07 19:39:26 adam Exp $
+# $NetBSD: Makefile,v 1.52 2014/11/13 10:53:49 markd Exp $
 
 DISTNAME=      kde-runtime-${_KDE_VERSION}
 PKGNAME=       ${DISTNAME:S/-4/4-4/}
-PKGREVISION=   14
 CATEGORIES=    x11
 COMMENT=       Runtime requirements for the KDE integrated X11 desktop
 
@@ -65,7 +64,6 @@
 #.include "../../security/libssh/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
 .include "../../misc/kdepimlibs4/buildlink3.mk"
-.include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../multimedia/phonon/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
@@ -76,8 +74,6 @@
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../net/openslp/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-BUILDLINK_ABI_DEPENDS.soprano?=        soprano>=2.6.50
-.include "../../textproc/soprano/buildlink3.mk"
 .include "../../x11/kactivities/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 
diff -r 5aa9ca410b51 -r 0dbf093db336 x11/kde-runtime4/PLIST
--- a/x11/kde-runtime4/PLIST    Thu Nov 13 10:50:44 2014 +0000
+++ b/x11/kde-runtime4/PLIST    Thu Nov 13 10:53:49 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2013/11/07 13:35:56 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/11/13 10:53:49 markd Exp $
 bin/kcmshell4
 bin/kde-cp
 bin/kde-mv
@@ -130,7 +130,6 @@
 lib/kde4/kcm_kdnssd.so
 lib/kde4/kcm_knotify.so
 lib/kde4/kcm_locale.so
-lib/kde4/kcm_nepomuk.so
 lib/kde4/kcm_phonon.so
 lib/kde4/kcm_trash.so
 lib/kde4/kcmspellchecking.so
@@ -138,7 +137,6 @@
 lib/kde4/kded_device_automounter.so
 lib/kde4/kded_kpasswdserver.so
 lib/kde4/kded_ktimezoned.so
-lib/kde4/kded_nepomuksearchmodule.so
 lib/kde4/kded_networkstatus.so
 lib/kde4/kded_networkwatcher.so
 lib/kde4/kded_phononserver.so
@@ -158,17 +156,13 @@
 lib/kde4/kio_floppy.so
 lib/kde4/kio_info.so
 lib/kde4/kio_man.so
-lib/kde4/kio_nepomuk.so
-lib/kde4/kio_nepomuksearch.so
 lib/kde4/kio_network.so