Gentoo Archives: gentoo-commits

From: Tomas Chvatal <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-misc/stasks/, kde-misc/stasks/files/
Date: Thu, 28 Apr 2011 21:20:44
Message-Id: f6e0964ae7f3a0d8515145a162ef2638202a50f2.scarabeus@gentoo
1 commit: f6e0964ae7f3a0d8515145a162ef2638202a50f2
2 Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 28 21:19:32 2011 +0000
4 Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 28 21:19:32 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f6e0964a
7
8 [kde-misc/stasks] remove, if you use this then move to smooth-tasks.
9
10 ---
11 kde-misc/stasks/files/stasks_kde-4.3.patch | 186 ----------------------------
12 kde-misc/stasks/metadata.xml | 6 -
13 kde-misc/stasks/stasks-0.5.1.ebuild | 25 ----
14 3 files changed, 0 insertions(+), 217 deletions(-)
15
16 diff --git a/kde-misc/stasks/files/stasks_kde-4.3.patch b/kde-misc/stasks/files/stasks_kde-4.3.patch
17 deleted file mode 100644
18 index 7fc17b7..0000000
19 --- a/kde-misc/stasks/files/stasks_kde-4.3.patch
20 +++ /dev/null
21 @@ -1,186 +0,0 @@
22 -diff -ur stasks-0.5.1-old/applet/stasks_applet.cpp stasks-0.5.1/applet/stasks_applet.cpp
23 ---- stasks-0.5.1-old/applet/stasks_applet.cpp 2009-07-25 16:42:42.748546150 +0300
24 -+++ stasks-0.5.1/applet/stasks_applet.cpp 2009-07-25 16:43:10.785262339 +0300
25 -@@ -73,9 +73,9 @@
26 - if (appletContainment) m_groupManager->setScreen(appletContainment->screen());
27 -
28 - connect(this, SIGNAL(settingsChanged()), m_groupManager, SLOT(reconnect()));
29 -- connect(m_groupManager->rootGroup(), SIGNAL(itemAdded(AbstractItemPtr)), this, SLOT(itemAdded(AbstractItemPtr)));
30 -- connect(m_groupManager->rootGroup(), SIGNAL(itemRemoved(AbstractItemPtr)), this, SLOT(itemRemoved(AbstractItemPtr)));
31 -- connect(m_groupManager->rootGroup(), SIGNAL(itemPositionChanged(AbstractItemPtr)), SLOT(itemPositionChanged(AbstractItemPtr)));
32 -+ connect(m_groupManager->rootGroup(), SIGNAL(itemAdded(AbstractGroupableItem *)), this, SLOT(itemAdded(AbstractGroupableItem *)));
33 -+ connect(m_groupManager->rootGroup(), SIGNAL(itemRemoved(AbstractGroupableItem *)), this, SLOT(itemRemoved(AbstractGroupableItem *)));
34 -+ connect(m_groupManager->rootGroup(), SIGNAL(itemPositionChanged(AbstractGroupableItem *)), SLOT(itemPositionChanged(AbstractGroupableItem *)));
35 - connect(this, SIGNAL(settingsChanged()), this, SLOT(configuration()));
36 -
37 - m_layout = new QGraphicsLinearLayout(this);
38 -@@ -87,7 +87,7 @@
39 - setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
40 - setMaximumSize(INT_MAX,INT_MAX);
41 - }
42 --void STasksApplet::itemAdded(TaskManager::AbstractItemPtr groupableItem)
43 -+void STasksApplet::itemAdded(TaskManager::AbstractGroupableItem * groupableItem)
44 - {
45 - STasksItem *item = new STasksItem(groupableItem, this);
46 - if (m_items.contains(item))
47 -@@ -106,7 +106,7 @@
48 - m_tasksHash[groupableItem] = item;
49 -
50 - }
51 --void STasksApplet::itemRemoved(TaskManager::AbstractItemPtr groupableItem)
52 -+void STasksApplet::itemRemoved(TaskManager::AbstractGroupableItem * groupableItem)
53 - {
54 - STasksItem* item = m_tasksHash[groupableItem];
55 - if(item == 0)
56 -@@ -120,7 +120,7 @@
57 - m_layout->activate();
58 - delete item;
59 - }
60 --void STasksApplet::itemPositionChanged(AbstractItemPtr groupableItem)
61 -+void STasksApplet::itemPositionChanged(TaskManager::AbstractGroupableItem * groupableItem)
62 - {
63 - STasksItem* item = m_tasksHash[groupableItem];
64 - if (!m_items.contains(item))
65 -@@ -138,7 +138,7 @@
66 - m_items.clear();
67 - m_tasksHash.clear();
68 -
69 -- foreach(TaskManager::AbstractItemPtr item,m_groupManager->rootGroup()->members() )
70 -+ foreach(AbstractGroupableItem *item, m_groupManager->rootGroup()->members() )
71 - {
72 - itemAdded(item);
73 - }
74 -@@ -153,6 +153,8 @@
75 - {
76 - m_layout->setOrientation((formFactor() == Plasma::Vertical)?Qt::Vertical:Qt::Horizontal);
77 - }
78 -+
79 -+ setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
80 - }
81 - void STasksApplet::updateSize()
82 - {
83 -@@ -271,7 +273,7 @@
84 - }
85 - return count;
86 - }
87 --AbstractItemPtr STasksApplet::selectSubTask(int index)
88 -+AbstractGroupableItem * STasksApplet::selectSubTask(int index)
89 - {
90 -
91 - foreach(STasksItem *item, m_items)
92 -@@ -345,14 +347,11 @@
93 - }
94 -
95 - //kDebug() << "Wheel event m_activeTaskIndex: " << m_activeTaskIndex << " of " << subTasks;
96 -- AbstractItemPtr taskItem = selectSubTask( m_activeIconIndex);
97 -- if (taskItem)
98 -- {
99 -- if (!taskItem->isGroupItem())
100 -- {
101 -+ AbstractGroupableItem *taskItem = selectSubTask( m_activeIconIndex);
102 -+ if (taskItem) {
103 -+ if (!taskItem->isGroupItem()){
104 - TaskManager::TaskItem* task = static_cast<TaskManager::TaskItem*>(taskItem);
105 -- if (task->task())
106 -- task->task()->activate();
107 -+ if (task->task()) task->task()->activateRaiseOrIconify();
108 - }
109 - }
110 - }
111 -diff -ur stasks-0.5.1-old/applet/stasks_applet.h stasks-0.5.1/applet/stasks_applet.h
112 ---- stasks-0.5.1-old/applet/stasks_applet.h 2009-07-25 16:42:42.748546150 +0300
113 -+++ stasks-0.5.1/applet/stasks_applet.h 2009-07-25 16:43:10.786261209 +0300
114 -@@ -51,7 +51,6 @@
115 - using TaskManager::TaskPtr;
116 - using TaskManager::StartupPtr;
117 - using TaskManager::GroupPtr;
118 --using TaskManager::AbstractItemPtr;
119 - using TaskManager::AbstractGroupableItem;
120 - using TaskManager::GroupManager;
121 - using TaskManager::TaskItem;
122 -@@ -88,14 +87,14 @@
123 - int fps() {return 35;}
124 - private:
125 - QGraphicsLinearLayout *m_layout;
126 -- QHash<AbstractItemPtr, STasksItem*> m_tasksHash;
127 -+ QHash<AbstractGroupableItem *, STasksItem*> m_tasksHash;
128 - qreal m_iconSize;
129 - Ui::stasksConfigG m_configG;
130 - Ui::stasksConfigA m_configA;
131 - void reload();
132 - void constraintsEvent(Plasma::Constraints constraints);
133 - int totalSubTasks();
134 -- AbstractItemPtr selectSubTask(int index);
135 -+ AbstractGroupableItem * selectSubTask(int index);
136 - int activeIndex();
137 - //task
138 - TaskManager::GroupManager::TaskGroupingStrategy m_groupingStrategy;
139 -@@ -119,13 +118,13 @@
140 - public slots:
141 - void updateSize();
142 - void updateActiveIconIndex(STasksItem *item);
143 -- void itemPositionChanged(AbstractItemPtr groupableItem);
144 -+ void itemPositionChanged(AbstractGroupableItem *);
145 - void expandTasksChanged(int state);
146 - void lightColorChanged(int state);
147 - private slots:
148 - void configuration();
149 -- void itemAdded(AbstractItemPtr groupableItem);
150 -- void itemRemoved(AbstractItemPtr groupableItem);
151 -+ void itemAdded(AbstractGroupableItem *);
152 -+ void itemRemoved(AbstractGroupableItem *);
153 - protected slots:
154 - void configAccepted();
155 - signals:
156 -diff -ur stasks-0.5.1-old/applet/stasks_task.cpp stasks-0.5.1/applet/stasks_task.cpp
157 ---- stasks-0.5.1-old/applet/stasks_task.cpp 2009-07-25 16:42:42.749545718 +0300
158 -+++ stasks-0.5.1/applet/stasks_task.cpp 2009-07-25 16:43:10.787262174 +0300
159 -@@ -155,7 +155,7 @@
160 - {
161 - return m_task->task();
162 - }
163 --TaskManager::AbstractItemPtr STasksTask::abstractItem()
164 -+TaskManager::AbstractGroupableItem* STasksTask::abstractItem()
165 - {
166 - return m_abstractItem;
167 - }
168 -diff -ur stasks-0.5.1-old/applet/stasks_task.h stasks-0.5.1/applet/stasks_task.h
169 ---- stasks-0.5.1-old/applet/stasks_task.h 2009-07-25 16:42:42.748546150 +0300
170 -+++ stasks-0.5.1/applet/stasks_task.h 2009-07-25 16:43:10.787262174 +0300
171 -@@ -43,7 +43,6 @@
172 - using TaskManager::TaskPtr;
173 - using TaskManager::StartupPtr;
174 - using TaskManager::GroupPtr;
175 --using TaskManager::AbstractItemPtr;
176 - using TaskManager::AbstractGroupableItem;
177 - using TaskManager::GroupManager;
178 - using TaskManager::TaskItem;
179 -@@ -78,7 +77,7 @@
180 - QString description();
181 - int desktop();
182 - TaskPtr task();
183 -- TaskManager::AbstractItemPtr abstractItem();
184 -+ TaskManager::AbstractGroupableItem * abstractItem();
185 - GroupPtr group();
186 - TaskManager::TaskItem* taskItem();
187 - StartupPtr startup();
188 -@@ -92,7 +91,7 @@
189 - TaskManager::TaskGroup* m_group;
190 - STasksApplet *m_applet;
191 -
192 -- TaskManager::AbstractItemPtr m_abstractItem;
193 -+ TaskManager::AbstractGroupableItem * m_abstractItem;
194 - TaskFlags m_flags;
195 - ItemType m_type;
196 - private slots:
197 -diff -ur stasks-0.5.1-old/applet/stasks_tooltip.cpp stasks-0.5.1/applet/stasks_tooltip.cpp
198 ---- stasks-0.5.1-old/applet/stasks_tooltip.cpp 2009-07-25 16:42:42.748546150 +0300
199 -+++ stasks-0.5.1/applet/stasks_tooltip.cpp 2009-07-25 16:43:10.788261743 +0300
200 -@@ -75,6 +75,7 @@
201 -
202 - STasksToolTip::STasksToolTip(int size, QWidget *parent) : QWidget(parent)
203 - {
204 -+ setAttribute(Qt::WA_TranslucentBackground);
205 - setWindowFlags(Qt::ToolTip);
206 -
207 - m_size = size;
208
209 diff --git a/kde-misc/stasks/metadata.xml b/kde-misc/stasks/metadata.xml
210 deleted file mode 100644
211 index 721dd1c..0000000
212 --- a/kde-misc/stasks/metadata.xml
213 +++ /dev/null
214 @@ -1,6 +0,0 @@
215 -<?xml version="1.0" encoding="UTF-8"?>
216 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
217 -<pkgmetadata>
218 - <herd>kde</herd>
219 -</pkgmetadata>
220 -
221
222 diff --git a/kde-misc/stasks/stasks-0.5.1.ebuild b/kde-misc/stasks/stasks-0.5.1.ebuild
223 deleted file mode 100644
224 index 5fe4631..0000000
225 --- a/kde-misc/stasks/stasks-0.5.1.ebuild
226 +++ /dev/null
227 @@ -1,25 +0,0 @@
228 -# Copyright 1999-2011 Gentoo Foundation
229 -# Distributed under the terms of the GNU General Public License v2
230 -# $Header: $
231 -
232 -EAPI=4
233 -
234 -inherit kde4-base
235 -
236 -DESCRIPTION="KDE plasmoid. Shows an icon-only taskbar"
237 -HOMEPAGE="http://www.kde-look.org/content/show.php/STasks?content=99739"
238 -SRC_URI="http://www.kde-look.org/CONTENT/content-files/99739-${P}.tar.gz"
239 -
240 -LICENSE="GPL-2"
241 -KEYWORDS="~amd64 ~x86"
242 -SLOT="0"
243 -IUSE="debug"
244 -
245 -RDEPEND="
246 - !kde-plasmoids/stasks
247 - $(add_kdebase_dep plasma-workspace)
248 -"
249 -
250 -PATCHES=(
251 - "${FILESDIR}"/${PN}_kde-4.3.patch
252 -)