3 files changed, 111 insertions, 6 deletions

diff --git a/deskutils/plasma-applet-daisy/Makefile b/deskutils/plasma-applet-daisy/Makefile
index e977c09fe6d6..f7cbeb5e2eec 100644
--- a/deskutils/plasma-applet-daisy/Makefile
+++ b/deskutils/plasma-applet-daisy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	daisy
 PORTVERSION=	0.0.4.25
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://cdlszm.org/downloads/
 PKGNAMEPREFIX=	plasma-applet-
@@ -16,14 +16,12 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	Simple launcher plasma applet for KDE4
 
+LICENSE=	GPLv3
+
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs workspace
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
+USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 .include <bsd.port.mk>
diff --git a/deskutils/plasma-applet-daisy/files/patch-applet__src__daisy.h b/deskutils/plasma-applet-daisy/files/patch-applet__src__daisy.h
new file mode 100644
index 000000000000..13076e060659
--- /dev/null
+++ b/deskutils/plasma-applet-daisy/files/patch-applet__src__daisy.h
@@ -0,0 +1,42 @@
+--- ./applet/src/daisy.h.orig	2010-06-29 09:11:50.000000000 -0400
++++ ./applet/src/daisy.h	2012-05-24 02:54:47.000000000 -0400
+@@ -102,8 +102,8 @@
+ #include <taskmanager/taskitem.h>
+ #include <taskmanager/groupmanager.h>
+ #include <taskmanager/startup.h>
+-using TaskManager::TaskPtr;
+-using TaskManager::StartupPtr;
++using TaskManager::Task;
++using TaskManager::Startup;
+ using TaskManager::GroupManager;
+ 
+ 
+@@ -337,7 +337,7 @@
+     bool checkLock();
+     
+     void checkAttention( KWindowInfo taskInfo, QString widclass_tmp );
+-    void createTaskThumbnail( TaskPtr task_tmp, int j );
++    void createTaskThumbnail( Task* task_tmp, int j );
+     void scrollTasks(int delta);
+     
+     
+@@ -418,7 +418,7 @@
+     QSizeF m_hoversz;
+     
+     
+-    TaskPtr m_task;
++    Task* m_task;
+     GroupManager *m_groupManager;
+     
+     
+@@ -512,8 +512,8 @@
+   private slots:
+     
+     
+-    void startupAdded(StartupPtr startupItem);
+-    void startupRemoved(StartupPtr startupItem);
++    void startupAdded(Startup* startupItem);
++    void startupRemoved(Startup* startupItem);
+     
+     
+     void windowAdded(WId id);
diff --git a/deskutils/plasma-applet-daisy/files/patch-applet__src__daisyTasks.cpp b/deskutils/plasma-applet-daisy/files/patch-applet__src__daisyTasks.cpp
new file mode 100644
index 000000000000..ecedc7c7c803
--- /dev/null
+++ b/deskutils/plasma-applet-daisy/files/patch-applet__src__daisyTasks.cpp
@@ -0,0 +1,65 @@
+--- ./applet/src/daisyTasks.cpp.orig	2010-11-09 19:29:47.000000000 -0500
++++ ./applet/src/daisyTasks.cpp	2012-05-24 02:56:20.000000000 -0400
+@@ -159,7 +159,7 @@
+ //-----------------------------------------------------------------------------
+ // Startup added
+ //FIXME
+-void daisy::startupAdded(StartupPtr startupItem)
++void daisy::startupAdded(Startup* startupItem)
+ {
+   
+   m_startingwindow = -1;
+@@ -195,7 +195,7 @@
+ //-----------------------------------------------------------------------------
+ // Startup removed
+ //FIXME
+-void daisy::startupRemoved(StartupPtr startupItem)
++void daisy::startupRemoved(Startup* startupItem)
+ {
+   
+   Q_UNUSED(startupItem);
+@@ -218,7 +218,7 @@
+   
+   KWindowInfo taskInfo = KWindowSystem::windowInfo( id, NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMState | NET::XAWMState | NET::WMDesktop, NET::WM2WindowClass );
+   
+-  TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( id );
++  Task* task_tmp = TaskManager::TaskManager::self()->findTask( id );
+   
+   
+   if (  m_alias.indexOf( taskInfo.windowClassName() ) != -1 || m_alias.indexOf( QString(taskInfo.windowClassClass().toLower()) ) != -1 )
+@@ -372,7 +372,7 @@
+     KWindowInfo taskInfo = KWindowSystem::windowInfo( *it, NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMState | NET::XAWMState | NET::WMDesktop | NET::WMWindowType, NET::WM2WindowClass );
+     
+     
+-    TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( *it );
++    Task* task_tmp = TaskManager::TaskManager::self()->findTask( *it );
+     if ( task_tmp && *it == KWindowSystem::activeWindow() )
+     {m_focusedWindow = *it;}
+     
+@@ -478,7 +478,7 @@
+ //-----------------------------------------------------------------------------
+ // Create task thumbnail
+ //FIXME
+-void daisy::createTaskThumbnail( TaskPtr task_tmp, int j )
++void daisy::createTaskThumbnail( Task* task_tmp, int j )
+ {
+   QIcon thumbnail;
+   //thumbnail = QIcon( QPixmap::grabWindow ( task_tmp->win(), 0, 0, -1, -1 ) );//This would suck
+@@ -714,7 +714,7 @@
+   KWindowInfo taskInfo = KWindowSystem::windowInfo( m_focusedWindow, NET::WMState, NET::WM2WindowClass );
+   for (it = taskDict.begin(); it != taskDict.end(); ++it )
+   {
+-    TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( *it );
++    Task* task_tmp = TaskManager::TaskManager::self()->findTask( *it );
+     if ( task_tmp ){real_taskDict << *it;}
+   }
+   if (real_taskDict.size() > 0)
+@@ -768,7 +768,7 @@
+ void daisy::delayTaskIcoChange(void)
+ {
+   m_uti_tmr->stop();
+-  TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( m_toupwid );
++  Task* task_tmp = TaskManager::TaskManager::self()->findTask( m_toupwid );
+   if ( task_tmp )
+   {
+ //     QIcon thumbnail;