The KDE/FreeBSD team is pleased to announce KDE Software Compilation

4.7.2. The official release notes can be found at:
http://kde.org/announcements/announce-4.7.2.php
This release ships with many improvements. Read more about them here:
http://FreeBSD.kde.org/news.php#itemKDESC472availableinports

We'd like to say thanks to all testers and contributors, especially to
lwhsu@ for his effort on hosting our test packages.

PR:		156293 [1]
		159219 [2]
		160164 [3]
Submitted by:	Oleg Sidorkin <osidorkin@gmail.com> [1]
		Alvaro Castillo <gobledb@gmail.com> [2]
		dkeav04@gmail.com [3]
Tested by:	exp-run via pav

5 files changed, 104 insertions, 29 deletions

diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 2b8c01729691..1839a3699807 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	kdebase-runtime
+PORTNAME=	kde-runtime
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -17,26 +17,37 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
 LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
+		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		xine.1:${PORTSDIR}/multimedia/libxine \
 		slp.1:${PORTSDIR}/net/openslp \
 		smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
 		ssh.4:${PORTSDIR}/security/libssh \
-		attica.0:${PORTSDIR}/x11-toolkits/attica
-#explicitly depend on libssh to avoid interference with ssh.4 from compat7x
-BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
-RUN_DEPENDS=	cagibid:${PORTSDIR}/net/cagibi
+		attica.0:${PORTSDIR}/x11-toolkits/attica \
+		searchclient.0:${PORTSDIR}/deskutils/strigi \
+		soprano.4:${PORTSDIR}/textproc/soprano \
+		qzeitgeist.0:${PORTSDIR}/sysutils/qzeitgeist
 
-CONFLICTS=	kdebase-workspace-4.5.[0-5]
+# Explicitly depend on libssh to avoid interference with ssh.4 from
+# compat7x.
+BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh \
+		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies
+
+RUN_DEPENDS=	cagibid:${PORTSDIR}/net/cagibi \
+		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies
+
+CONFLICTS=	kdebase-runtime-4.[0-6].* kdebase-workspace-4.5.[0-5] nepomukcontroller-0.2
 
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-KDE4_BUILDENV=	yes
-USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib opengl dbus phonon \
-		qmake_build moc_build rcc_build uic_build
 USE_GETTEXT=	yes
+USE_KDE4=	automoc4 kdehier kdelibs kdeprefix sharedmime
+KDE4_BUILDENV=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus declarative designer gui phonon qt3support \
+		script svg webkit xml \
+		moc_build qmake_build rcc_build uic_build
+USE_XORG=	x11 xcursor
+USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		kdesu.1
@@ -44,29 +55,37 @@ MAN8=		nepomukserver.8 nepomukservicestub.8
 
 SUB_FILES=	nepomuk-env.sh
 
-OPTIONS=	SPEAKER "Speaker setup GUI" off \
-		VIRTUOSO "Install Virtuoso server (required for Nepomuk)" off
+OPTIONS=	NEPOMUK "Nepomuk semantic desktop (installs Virtuoso)" off \
+		SPEAKER "Speaker setup GUI (requires PulseAudio)" off \
+		ZEITGEIST "Event logging via Zeitgeist" off
 
-# Explicitly disable alsa, see for details:
+# Explicitly disable ALSA, see for details:
 # http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html
 CMAKE_ARGS+=	-DWITH_ALSA:BOOL=OFF
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+=	lzma.5:${PORTSDIR}/archivers/xz
+.if defined(WITH_NEPOMUK)
+RUN_DEPENDS+=	virtuoso-t:${PORTSDIR}/databases/virtuoso
 .endif
 
 .if defined(WITH_SPEAKER)
 CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=ON
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio \
 		canberra.0:${PORTSDIR}/audio/libcanberra
+USE_GNOME=	glib20
 .else
 CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=OFF
 .endif
 
-.if defined(WITH_VIRTUOSO)
-RUN_DEPENDS+=	${LOCALBASE}/bin/virtuoso-t:${PORTSDIR}/databases/virtuoso
+.if defined(WITH_ZEITGEIST)
+RUN_DEPENDS+=	zeitgeist-daemon:${PORTSDIR}/sysutils/zeitgeist
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
+LIB_DEPENDS+=	lzma.5:${PORTSDIR}/archivers/xz
 .endif
 
 post-patch:
@@ -81,4 +100,4 @@ post-install:
 	${MKDIR} ${PREFIX}/env
 	${INSTALL_SCRIPT} ${WRKDIR}/nepomuk-env.sh ${PREFIX}/env
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 08e9029f8428..16c0eca69149 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdebase-runtime-4.6.5.tar.bz2) = 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
-SIZE (KDE/kdebase-runtime-4.6.5.tar.bz2) = 5828482
+SHA256 (KDE/kde-runtime-4.7.2.tar.bz2) = 46167e9e20c951be5f5f4bb081258dba893d4756dfe5cf6304b082d84fc21a2d
+SIZE (KDE/kde-runtime-4.7.2.tar.bz2) = 6026223
diff --git a/x11/kde4-runtime/files/patch-nepomuk__services__storage__datamanagementmodel.h b/x11/kde4-runtime/files/patch-nepomuk__services__storage__datamanagementmodel.h
new file mode 100644
index 000000000000..a67a3dca926f
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-nepomuk__services__storage__datamanagementmodel.h
@@ -0,0 +1,29 @@
+--- ./nepomuk/services/storage/datamanagementmodel.h.orig	2011-09-10 03:15:36.003035686 +0200
++++ ./nepomuk/services/storage/datamanagementmodel.h	2011-09-10 03:17:46.033066393 +0200
+@@ -156,7 +156,7 @@
+                         const QString& app,
+                         Nepomuk::StoreIdentificationMode identificationMode = Nepomuk::IdentifyNew,
+                         Nepomuk::StoreResourcesFlags flags = Nepomuk::NoStoreResourcesFlags,
+-                        const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>() );
++                        const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>()) );
+ 
+     /**
+      * Merges two resources into one. Properties from \p resource1
+@@ -188,7 +188,7 @@
+                          const QString& userSerialization = QString(),
+                          Nepomuk::StoreIdentificationMode identificationMode = Nepomuk::IdentifyNew,
+                          Nepomuk::StoreResourcesFlags flags = Nepomuk::NoStoreResourcesFlags,
+-                         const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>());
++                         const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>()));
+ 
+     /**
+      * Describe a set of resources, i.e. retrieve all their properties.
+@@ -200,7 +200,7 @@
+     //@}
+ 
+ private:
+-    QUrl createGraph(const QString& app = QString(), const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>());
++    QUrl createGraph(const QString& app = QString(), const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>()));
+     QUrl createGraph(const QString& app, const QMultiHash<QUrl, Soprano::Node>& additionalMetadata);
+ 
+     /**
diff --git a/x11/kde4-runtime/pkg-descr b/x11/kde4-runtime/pkg-descr
index d2a70cd666b3..a618af7d124b 100644
--- a/x11/kde4-runtime/pkg-descr
+++ b/x11/kde4-runtime/pkg-descr
@@ -2,4 +2,4 @@ This package provides the basic applications for the KDE system. Installing
 this package (and its dependencies) will provide you with everything required
 for a minimal, functional KDE desktop.
 
-WWW: http://www.kde.org/
+WWW: http://www.kde.org
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index bd8a47a2ee49..f71701f1b6ab 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -26,8 +26,11 @@ bin/kuiserver
 bin/kwalletd
 bin/kwriteconfig
 bin/nepomukbackup
+bin/nepomukcontroller
+bin/nepomukindexer
 bin/nepomukserver
 bin/nepomukservicestub
+bin/plasma-remote-helper
 bin/plasmapkg
 bin/solid-hardware
 env/nepomuk-env.sh
@@ -36,6 +39,13 @@ etc/xdg/menus/kde-information.menu
 include/knotify_export.h
 include/knotifyconfig.h
 include/knotifyplugin.h
+include/nepomuk/createresourcejob.h
+include/nepomuk/datamanagement.h
+include/nepomuk/describeresourcesjob.h
+include/nepomuk/nepomukdatamanagement_export.h
+include/nepomuk/resourcewatcher.h
+include/nepomuk/simpleresource.h
+include/nepomuk/simpleresourcegraph.h
 lib/attica_kde.so
 lib/kconf_update_bin/phonon_devicepreference_update
 lib/kconf_update_bin/phonon_deviceuids_update
@@ -52,7 +62,8 @@ lib/kde4/imports/org/kde/plasma/graphicslayouts/libgraphicslayoutsbindingsplugin
 lib/kde4/imports/org/kde/plasma/graphicslayouts/qmldir
 lib/kde4/imports/org/kde/plasma/graphicswidgets/libgraphicswidgetsbindingsplugin.so
 lib/kde4/imports/org/kde/plasma/graphicswidgets/qmldir
-lib/kde4/jpegrotatedthumbnail.so
+lib/kde4/imports/org/kde/qtextracomponents/libqtextracomponentsplugin.so
+lib/kde4/imports/org/kde/qtextracomponents/qmldir
 lib/kde4/jpegthumbnail.so
 lib/kde4/kcm_attica.so
 lib/kde4/kcm_cgi.so
@@ -127,7 +138,6 @@ lib/kde4/localdomainurifilter.so
 lib/kde4/nepomukbackupsync.so
 lib/kde4/nepomukfilewatch.so
 lib/kde4/nepomukqueryservice.so
-lib/kde4/nepomukremovablestorageservice.so
 lib/kde4/nepomukstorage.so
 lib/kde4/nepomukstrigiservice.so
 lib/kde4/plasma-kpart.so
@@ -156,14 +166,19 @@ lib/libmolletnetwork.so
 lib/libmolletnetwork.so.5
 lib/libmolletnetwork.so.5.0.1
 lib/libnepomukcommon.so
+lib/libnepomukdatamanagement.so
 lib/libnepomuksync.so
 lib/libnepomuksync.so.5
 lib/libnepomuksync.so.5.0.1
 share/applications/kde4/Help.desktop
 share/applications/kde4/knetattach.desktop
 share/applications/kde4/nepomukbackup.desktop
+share/applications/kde4/nepomukcontroller.desktop
 share/apps/cmake/modules/FindCLucene.cmake
 share/apps/cmake/modules/FindSLP.cmake
+share/apps/desktoptheme/appdashboard/metadata.desktop
+share/apps/desktoptheme/appdashboard/widgets/background.svgz
+share/apps/desktoptheme/appdashboard/widgets/newspaper-background.svgz
 share/apps/desktoptheme/default/colors
 share/apps/desktoptheme/default/dialogs/background.svgz
 share/apps/desktoptheme/default/dialogs/kickoff.svgz
@@ -192,6 +207,7 @@ share/apps/desktoptheme/default/translucent/widgets/extender-background.svgz
 share/apps/desktoptheme/default/translucent/widgets/panel-background.svgz
 share/apps/desktoptheme/default/translucent/widgets/tooltip.svgz
 share/apps/desktoptheme/default/widgets/action-overlays.svgz
+share/apps/desktoptheme/default/widgets/actionbutton.svgz
 share/apps/desktoptheme/default/widgets/analog_meter.svgz
 share/apps/desktoptheme/default/widgets/arrows.svgz
 share/apps/desktoptheme/default/widgets/background.svgz
@@ -211,8 +227,10 @@ share/apps/desktoptheme/default/widgets/frame.svgz
 share/apps/desktoptheme/default/widgets/glowbar.svgz
 share/apps/desktoptheme/default/widgets/identiconshapes.svgz
 share/apps/desktoptheme/default/widgets/identicontheme.svgz
+share/apps/desktoptheme/default/widgets/labeltexture.svgz
 share/apps/desktoptheme/default/widgets/line.svgz
 share/apps/desktoptheme/default/widgets/lineedit.svgz
+share/apps/desktoptheme/default/widgets/media-delegate.svgz
 share/apps/desktoptheme/default/widgets/monitor.svgz
 share/apps/desktoptheme/default/widgets/pager.svgz
 share/apps/desktoptheme/default/widgets/panel-background.svgz
@@ -240,6 +258,7 @@ share/apps/desktoptheme/oxygen/opaque/widgets/extender-background.svgz
 share/apps/desktoptheme/oxygen/opaque/widgets/panel-background.svgz
 share/apps/desktoptheme/oxygen/opaque/widgets/tooltip.svgz
 share/apps/desktoptheme/oxygen/widgets/action-overlays.svgz
+share/apps/desktoptheme/oxygen/widgets/actionbutton.svgz
 share/apps/desktoptheme/oxygen/widgets/analog_meter.svgz
 share/apps/desktoptheme/oxygen/widgets/arrows.svgz
 share/apps/desktoptheme/oxygen/widgets/background.svgz
@@ -336,12 +355,15 @@ share/apps/ksmserver/windowmanagers/metacity.desktop
 share/apps/ksmserver/windowmanagers/openbox.desktop
 share/apps/kwalletd/kwalletd.notifyrc
 share/apps/libphonon/hardwaredatabase
+share/apps/nepomukfilewatch/nepomukfilewatch.notifyrc
 share/apps/nepomukstorage/nepomukstorage.notifyrc
 share/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
 share/apps/phonon/phonon.notifyrc
 share/apps/remoteview/network.desktop
 share/apps/remoteview/smb-network.desktop
+share/autostart/nepomukcontroller.desktop
 share/autostart/nepomukserver.desktop
+share/config.kcfg/jpegcreatorsettings.kcfg
 share/config.kcfg/khelpcenter.kcfg
 share/config/emoticons.knsrc
 share/config/icons.knsrc
@@ -352,17 +374,17 @@ share/dbus-1/interfaces/org.kde.KTimeZoned.xml
 share/dbus-1/interfaces/org.kde.NepomukServer.xml
 share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
 share/dbus-1/interfaces/org.kde.nepomuk.BackupSync.xml
+share/dbus-1/interfaces/org.kde.nepomuk.DataManagement.xml
 share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.Query.xml
 share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml
-share/dbus-1/interfaces/org.kde.nepomuk.RemovableStorage.xml
+share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcher.xml
+share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml
 share/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml
 share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
 share/dbus-1/interfaces/org.kde.nepomuk.Strigi.xml
 share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
-share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.identifier.xml
-share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.merger.xml
 share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml
 share/dbus-1/interfaces/org.kde.network.kioslavenotifier.xml
 share/dbus-1/services/org.kde.knotify.service
@@ -676,7 +698,6 @@ share/kde4/services/htmlthumbnail.desktop
 share/kde4/services/icons.desktop
 share/kde4/services/imagethumbnail.desktop
 share/kde4/services/info.protocol
-share/kde4/services/jpegrotatedthumbnail.desktop
 share/kde4/services/jpegthumbnail.desktop
 share/kde4/services/kactivitymanagerd.desktop
 share/kde4/services/kcm_attica.desktop
@@ -1681,6 +1702,8 @@ share/mime/inode/vnd.kde.service.webdavs.xml
 share/mime/inode/vnd.kde.service.workstation.xml
 share/mime/inode/vnd.kde.service.xmpp-server.xml
 share/mime/packages/network.xml
+share/ontology/kde/kext.ontology
+share/ontology/kde/kext.trig
 share/ontology/kde/kuvo.ontology
 share/ontology/kde/kuvo.trig
 share/ontology/kde/nrio.ontology
@@ -2041,6 +2064,7 @@ share/sounds/KDE-Window-Shade-Up.ogg
 @dirrm share/apps/phonon
 @dirrm share/apps/nepomukstrigiservice
 @dirrm share/apps/nepomukstorage
+@dirrm share/apps/nepomukfilewatch
 @dirrm share/apps/libphonon
 @dirrm share/apps/kwalletd
 @dirrm share/apps/ksmserver/windowmanagers
@@ -2084,7 +2108,10 @@ share/sounds/KDE-Window-Shade-Up.ogg
 @dirrm share/apps/desktoptheme/default/opaque
 @dirrm share/apps/desktoptheme/default/icons
 @dirrm share/apps/desktoptheme/default/dialogs
+@dirrm share/apps/desktoptheme/appdashboard/widgets
+@dirrm share/apps/desktoptheme/appdashboard
 @dirrm lib/kde4/plugins/phonon_platform
+@dirrm lib/kde4/imports/org/kde/qtextracomponents
 @dirrm lib/kde4/imports/org/kde/plasma/graphicswidgets
 @dirrm lib/kde4/imports/org/kde/plasma/graphicslayouts
 @dirrm lib/kde4/imports/org/kde/plasma/core