4 files changed, 39 insertions, 6 deletions

diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 424a7032afc9..b731f23109df 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kde-workspace
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -72,14 +71,15 @@ USE_RC_SUBR=	kdm4
 USERS=		kdm
 GROUPS=		kdm
 
-OPTIONS_DEFINE=	GPS UPOWER WALLPAPERS
+OPTIONS_DEFINE=	GPS KACTIVITY UPOWER WALLPAPERS
 OPTIONS_GROUP=	PHONON PLASMA
 OPTIONS_GROUP_PHONON=	GSTREAMER VLC
 OPTIONS_GROUP_PLASMA=	PYTHON RUBY
-OPTIONS_DEFAULT=GPS GSTREAMER UPOWER WALLPAPERS
+OPTIONS_DEFAULT=GPS GSTREAMER KACTIVITY UPOWER WALLPAPERS
 
 GPS_DESC=	GPS geolocation via gpsd
 GSTREAMER_DESC=	Multimedia via Phonon-GStreamer
+KACTIVITY_DESC=	Activity Manager daemon
 PYTHON_DESC=	Python plasmoids support
 RUBY_DESC=	Ruby plasmoids support
 UPOWER_DESC=	Power management via UPower
@@ -102,6 +102,10 @@ USE_GSTREAMER+=	core
 USE_QT4+=	phonon-gst_run
 .endif
 
+.if ${PORT_OPTIONS:MKACTIVITY}
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kactivitymanagerd:${PORTSDIR}/x11/kactivitymanagerd
+.endif
+
 .if ${PORT_OPTIONS:MPYTHON}
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:${PORTSDIR}/x11/plasma-scriptengine-python
 .endif
@@ -125,6 +129,10 @@ RUN_DEPENDS+=	${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:${PORTSDIR}
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 800069
+LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
+.endif
+
 .if ${OSVERSION} < 900004
 LIB_DEPENDS+=	utempter:${PORTSDIR}/sysutils/libutempter
 .endif
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 7cb662ef30a8..1e0594c671b3 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.1/kde-workspace-4.10.1.tar.xz) = 19ca159dc6cec2b8cb6a09d7a87ec5f541e35ed0f03c185c7ea5cfe959b212b7
-SIZE (KDE/4.10.1/kde-workspace-4.10.1.tar.xz) = 13560944
+SHA256 (KDE/4.10.3/kde-workspace-4.10.3.tar.xz) = d870db2f39dcec6d4c11ccaef53d24978c1249a9426814414a90456d9cfce49d
+SIZE (KDE/4.10.3/kde-workspace-4.10.3.tar.xz) = 13569364
diff --git a/x11/kde4-workspace/files/patch-plasma__desktop__applets__kickoff__CMakeLists.txt b/x11/kde4-workspace/files/patch-plasma__desktop__applets__kickoff__CMakeLists.txt
new file mode 100644
index 000000000000..b05fd4c8d947
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-plasma__desktop__applets__kickoff__CMakeLists.txt
@@ -0,0 +1,25 @@
+--- ./plasma/desktop/applets/kickoff/CMakeLists.txt.orig	2013-03-01 06:32:24.588852000 +0000
++++ ./plasma/desktop/applets/kickoff/CMakeLists.txt	2013-04-05 14:57:51.006558311 +0000
+@@ -1,10 +1,6 @@
+ #######################################################################################
+ # Kickoff Library
+ 
+-if(STRIGI_STRIGIQTDBUSCLIENT_LIBRARY)
+-    set(HAVE_STRIGIDBUS 1)
+-endif(STRIGI_STRIGIQTDBUSCLIENT_LIBRARY)
+-
+ configure_file(core/config-kickoff-applets.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kickoff-applets.h)
+ 
+ set(libkickoff_SRCS
+@@ -34,11 +30,6 @@
+ QT4_ADD_DBUS_INTERFACE(libkickoff_SRCS ${ksmserver_xml} ksmserver_interface)
+ 
+ set(Kickoff_LIBS ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS} kworkspace)
+-if(HAVE_STRIGIDBUS)
+-     set ( Kickoff_LIBS ${Kickoff_LIBS} ${STRIGI_STRIGIQTDBUSCLIENT_LIBRARY} )
+-endif(HAVE_STRIGIDBUS)
+-
+-include_directories( ${STRIGI_INCLUDE_DIR} )
+ 
+ kde4_add_library(kickoff SHARED ${libkickoff_SRCS})
+ target_link_libraries(kickoff ${KDE4_PLASMA_LIBS} ${Kickoff_LIBS})
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 4707ef39956f..58e9bc2e37c6 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -902,6 +902,7 @@ share/apps/kwrited/kwrited.notifyrc
 share/apps/plasma-desktop/init/00-defaultLayout.js
 share/apps/plasma-desktop/plasma-desktop.notifyrc
 share/apps/plasma-desktop/updates/addShowActivitiesManagerPlasmoid.js
+share/apps/plasma-desktop/updates/set-hidden-single-vd-pager.js
 share/apps/plasma-desktop/updates/systray-to-notifications-widget.js
 share/apps/plasma-netbook/init/00-defaultLayout.js
 share/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
@@ -927,7 +928,6 @@ share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents/
 share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/metadata.desktop
 share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents/layout.js
 share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/metadata.desktop
-share/apps/plasma/packages/org.kde.desktop.activitymanager/Messages.sh
 share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/.directory
 share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/ActivityDelegate.qml
 share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/main.qml