Attached is a patch to fix the build errors of deskutils/plasma-applet-daisy with KDE 4.8. Move LICENSE while here.
-Jason
diff -ruN plasma-applet-daisy.orig/Makefile plasma-applet-daisy/Makefile --- plasma-applet-daisy.orig/Makefile 2012-05-23 14:37:49.000000000 -0400 +++ plasma-applet-daisy/Makefile 2012-05-23 17:24:12.000000000 -0400 @@ -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,6 +16,8 @@ MAINTAINER= bsdkaf...@gmail.com COMMENT= Simple launcher plasma applet for KDE4 +LICENSE= GPLv3 + USE_CMAKE= yes USE_KDE4= automoc4 kdeprefix kdelibs workspace USE_QT_VER= 4 @@ -23,7 +25,4 @@ USE_GETTEXT= yes MAKE_JOBS_SAFE= yes -LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/COPYING - .include <bsd.port.mk> diff -ruN plasma-applet-daisy.orig/files/patch-applet__src__daisy.h plasma-applet-daisy/files/patch-applet__src__daisy.h --- plasma-applet-daisy.orig/files/patch-applet__src__daisy.h 1969-12-31 19:00:00.000000000 -0500 +++ plasma-applet-daisy/files/patch-applet__src__daisy.h 2012-05-23 15:48:01.000000000 -0400 @@ -0,0 +1,54 @@ +--- ./applet/src/daisy.h.orig 2010-06-29 09:11:50.000000000 -0400 ++++ ./applet/src/daisy.h 2012-05-23 15:43:34.000000000 -0400 +@@ -102,8 +102,13 @@ + #include <taskmanager/taskitem.h> + #include <taskmanager/groupmanager.h> + #include <taskmanager/startup.h> ++#if KDE_IS_VERSION(4,7,80) ++using TaskManager::Task*; ++using TaskManager::Startup*; ++#else + using TaskManager::TaskPtr; + using TaskManager::StartupPtr; ++#endif + using TaskManager::GroupManager; + + +@@ -337,7 +342,11 @@ + bool checkLock(); + + void checkAttention( KWindowInfo taskInfo, QString widclass_tmp ); ++#if KDE_IS_VERSION(4,7,80) ++ void createTaskThumbnail( Task* task_tmp, int j ); ++#else + void createTaskThumbnail( TaskPtr task_tmp, int j ); ++#endif + void scrollTasks(int delta); + + +@@ -418,7 +427,11 @@ + QSizeF m_hoversz; + + ++#if KDE_IS_VERSION(4,7,80) ++ Task* m_task; ++#else + TaskPtr m_task; ++#endif + GroupManager *m_groupManager; + + +@@ -512,8 +525,13 @@ + private slots: + + ++#if KDE_IS_VERSION(4,7,80) ++ void startupAdded(Startup* startupItem); ++ void startupRemoved(Startup* startupItem); ++#else + void startupAdded(StartupPtr startupItem); + void startupRemoved(StartupPtr startupItem); ++#endif + + + void windowAdded(WId id); diff -ruN plasma-applet-daisy.orig/files/patch-applet__src__daisyTasks.cpp plasma-applet-daisy/files/patch-applet__src__daisyTasks.cpp --- plasma-applet-daisy.orig/files/patch-applet__src__daisyTasks.cpp 1969-12-31 19:00:00.000000000 -0500 +++ plasma-applet-daisy/files/patch-applet__src__daisyTasks.cpp 2012-05-23 15:48:01.000000000 -0400 @@ -0,0 +1,86 @@ +--- ./applet/src/daisyTasks.cpp.orig 2010-11-09 19:29:47.000000000 -0500 ++++ ./applet/src/daisyTasks.cpp 2012-05-23 15:46:56.000000000 -0400 +@@ -159,7 +159,11 @@ + //----------------------------------------------------------------------------- + // Startup added + //FIXME ++#if KDE_IS_VERSION(4,7,80) ++void daisy::startupAdded(Startup* startupItem) ++#else + void daisy::startupAdded(StartupPtr startupItem) ++#endif + { + + m_startingwindow = -1; +@@ -195,7 +199,11 @@ + //----------------------------------------------------------------------------- + // Startup removed + //FIXME ++#if KDE_IS_VERSION(4,7,80) ++void daisy::startupRemoved(Startup* startupItem) ++#else + void daisy::startupRemoved(StartupPtr startupItem) ++#endif + { + + Q_UNUSED(startupItem); +@@ -218,7 +226,11 @@ + + KWindowInfo taskInfo = KWindowSystem::windowInfo( id, NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMState | NET::XAWMState | NET::WMDesktop, NET::WM2WindowClass ); + ++#if KDE_IS_VERSION(4,7,80) ++ Task* task_tmp = TaskManager::TaskManager::self()->findTask( id ); ++#else + TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( id ); ++#endif + + + if ( m_alias.indexOf( taskInfo.windowClassName() ) != -1 || m_alias.indexOf( QString(taskInfo.windowClassClass().toLower()) ) != -1 ) +@@ -372,7 +384,11 @@ + KWindowInfo taskInfo = KWindowSystem::windowInfo( *it, NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMState | NET::XAWMState | NET::WMDesktop | NET::WMWindowType, NET::WM2WindowClass ); + + ++#if KDE_IS_VERSION(4,7,80) ++ Task* task_tmp = TaskManager::TaskManager::self()->findTask( *it ); ++#else + TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( *it ); ++#endif + if ( task_tmp && *it == KWindowSystem::activeWindow() ) + {m_focusedWindow = *it;} + +@@ -478,7 +494,11 @@ + //----------------------------------------------------------------------------- + // Create task thumbnail + //FIXME ++#if KDE_IS_VERSION(4,7,80) ++void daisy::createTaskThumbnail( Task* task_tmp, int j ) ++#else + void daisy::createTaskThumbnail( TaskPtr task_tmp, int j ) ++#endif + { + QIcon thumbnail; + //thumbnail = QIcon( QPixmap::grabWindow ( task_tmp->win(), 0, 0, -1, -1 ) );//This would suck +@@ -714,7 +734,11 @@ + KWindowInfo taskInfo = KWindowSystem::windowInfo( m_focusedWindow, NET::WMState, NET::WM2WindowClass ); + for (it = taskDict.begin(); it != taskDict.end(); ++it ) + { ++#if KDE_IS_VERSION(4,7,80) ++ Task* task_tmp = TaskManager::TaskManager::self()->findTask( *it ); ++#else + TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( *it ); ++#endif + if ( task_tmp ){real_taskDict << *it;} + } + if (real_taskDict.size() > 0) +@@ -768,7 +792,11 @@ + void daisy::delayTaskIcoChange(void) + { + m_uti_tmr->stop(); ++#if KDE_IS_VERSION(4,7,80) ++ Task* task_tmp = TaskManager::TaskManager::self()->findTask( m_toupwid ); ++#else + TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( m_toupwid ); ++#endif + if ( task_tmp ) + { + // QIcon thumbnail;
_______________________________________________ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
