[kde-plasma-daisy] kde-plasma-daisy FTBFS against kde-4.8.x (#802406)
Rex Dieter
rdieter at fedoraproject.org
Mon Mar 12 14:17:46 UTC 2012
commit b9646bb0104584b5bee3da524030be29f25dbef7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon Mar 12 09:17:31 2012 -0500
kde-plasma-daisy FTBFS against kde-4.8.x (#802406)
- Requires: kde-workspace (for libtaskmanager dep)
kde-plasma-daisy.spec | 16 ++++-
plasma-applet-daisy-0.0.4.25-kde48.patch | 109 ++++++++++++++++++++++++++++++
2 files changed, 123 insertions(+), 2 deletions(-)
---
diff --git a/kde-plasma-daisy.spec b/kde-plasma-daisy.spec
index 3c59a20..d4919ba 100644
--- a/kde-plasma-daisy.spec
+++ b/kde-plasma-daisy.spec
@@ -1,6 +1,6 @@
Name: kde-plasma-daisy
Version: 0.0.4.25
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A versatile application launcher
Group: User Interface/Desktops
@@ -8,8 +8,14 @@ License: GPLv3+
URL: http://www.cdlszm.org/
Source0: http://cdlszm.org/downloads/plasma-applet-daisy-%{version}.tar.gz
-BuildRequires: kdebase-workspace-devel gettext
+## upstreamable patches
+# fix FTBFS against kde-4.8+
+Patch50: plasma-applet-daisy-0.0.4.25-kde48.patch
+BuildRequires: gettext
+BuildRequires: kde-workspace-devel >= 4.8
+
+Requires: kde-workspace%{?_kde4_version: >= %{_kde4_version}}
%description
Daisy is a versatile yet simple plasma application launcher applet.
@@ -24,6 +30,8 @@ chmod 0644 applet/src/*.cpp
chmod 0644 applet/src/*.h
chmod 0644 AUTHORS CHANGELOG COPYING README TODO
+%patch50 -p1 -b .kde48
+
%build
mkdir -p %{_target_platform}
@@ -54,6 +62,10 @@ rm -rf %{buildroot}
%changelog
+* Mon Mar 12 2012 Rex Dieter <rdieter at fedoraproject.org> 0.0.4.25-4
+- kde-plasma-daisy FTBFS against kde-4.8.x (#802406)
+- Requires: kde-workspace (for libtaskmanager dep)
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.4.25-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/plasma-applet-daisy-0.0.4.25-kde48.patch b/plasma-applet-daisy-0.0.4.25-kde48.patch
new file mode 100644
index 0000000..942d6af
--- /dev/null
+++ b/plasma-applet-daisy-0.0.4.25-kde48.patch
@@ -0,0 +1,109 @@
+diff -ur plasma-applet-daisy-0.0.4.25/applet/src/daisy.h daisy/applet/src/daisy.h
+--- plasma-applet-daisy-0.0.4.25/applet/src/daisy.h 2010-06-29 08:11:50.000000000 -0500
++++ daisy/applet/src/daisy.h 2012-02-15 15:21:57.000000000 -0600
+@@ -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 -ur plasma-applet-daisy-0.0.4.25/applet/src/daisyTasks.cpp daisy/applet/src/daisyTasks.cpp
+--- plasma-applet-daisy-0.0.4.25/applet/src/daisyTasks.cpp 2010-11-09 18:29:47.000000000 -0600
++++ daisy/applet/src/daisyTasks.cpp 2012-02-15 15:21:57.000000000 -0600
+@@ -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;
More information about the scm-commits
mailing list