diff options
author | Johannes Huber <johu@gentoo.org> | 2012-02-21 15:42:32 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2012-02-21 15:42:32 +0000 |
commit | 9825965e63b4ceae656abc685f471d8ebb6b375b (patch) | |
tree | aaa14ffcb6d9461d27743aff137691440d997b0e | |
parent | remove dev-php/PEAR-PHP_Archive (bug #399317) (diff) | |
download | gentoo-2-9825965e63b4ceae656abc685f471d8ebb6b375b.tar.gz gentoo-2-9825965e63b4ceae656abc685f471d8ebb6b375b.tar.bz2 gentoo-2-9825965e63b4ceae656abc685f471d8ebb6b375b.zip |
Remove old.
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
9 files changed, 12 insertions, 642 deletions
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog index ce366a626e6b..59664590daae 100644 --- a/kde-base/plasma-workspace/ChangeLog +++ b/kde-base/plasma-workspace/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for kde-base/plasma-workspace # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.149 2012/02/21 12:52:24 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.150 2012/02/21 15:42:32 johu Exp $ + + 21 Feb 2012; Johannes Huber <johu@gentoo.org> + -files/plasma-workspace-4.6.2-optional_akonadi-server.patch, + -files/plasma-workspace-4.6.3-dduplicate.patch, + -files/plasma-workspace-4.6.3-gpsdapi.patch, + -files/plasma-workspace-4.7.3-calendarcrash.patch, + -files/plasma-workspace-4.7.3-deletedwidget.patch, + -files/plasma-workspace-4.7.3-layoutcrash.patch, + -files/plasma-workspace-4.7.3-taskcrash.patch, + -files/plasma-workspace-4.7.3-weathercrash.patch: + Remove old. 20 Feb 2012; Johannes Huber <johu@gentoo.org> -plasma-workspace-4.6.3-r2.ebuild: diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch deleted file mode 100644 index aaa8381005a7..000000000000 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.2/plasma/generic/dataengines/CMakeLists.txt ---- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/CMakeLists.txt 2011-02-25 23:10:02.000000000 +0100 -+++ plasma-workspace-4.6.2/plasma/generic/dataengines/CMakeLists.txt 2011-04-02 13:59:01.919795444 +0200 -@@ -25,10 +25,15 @@ - endif (NEPOMUK_FOUND) - - macro_optional_find_package(KdepimLibs 4.5.60) --macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines") -+macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines") -+ -+macro_optional_find_package(Akonadi) -+macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://pim.kde.org/akonadi/" FALSE "" "Needed for event support in the calendar DataEngine") - - if(KDEPIMLIBS_FOUND) -- add_subdirectory(akonadi) -+ if(AKONADI_FOUND) -+ add_subdirectory(akonadi) -+ endif(AKONADI_FOUND) - add_subdirectory(calendar) - add_subdirectory(rss) - endif(KDEPIMLIBS_FOUND) -diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/CMakeLists.txt plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/CMakeLists.txt ---- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/CMakeLists.txt 2011-04-01 12:52:43.000000000 +0200 -+++ plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/CMakeLists.txt 2011-04-02 14:02:09.274795409 +0200 -@@ -1,7 +1,6 @@ - project(calendar_engine) - - find_package(KdepimLibs REQUIRED) --find_package(Akonadi REQUIRED) - find_package(Boost REQUIRED) - - include_directories( -@@ -14,16 +13,22 @@ - - set(calendar_engine_srcs - calendarengine.cpp -- eventdatacontainer.cpp --# taken from kdepim/akonadi/kcal as long as it's not yet exported: -- akonadi/calendar.cpp -- akonadi/calendarmodel.cpp -- akonadi/calfilterproxymodel.cpp -- akonadi/utils.cpp -- akonadi/blockalarmsattribute.cpp -- akonadi/collectionselection.cpp - ) - -+if(AKONADI_FOUND) -+ ADD_DEFINITIONS(-DAKONADI_FOUND) -+ set(calendar_engine_srcs ${calendar_engine_srcs} -+ eventdatacontainer.cpp -+ # taken from kdepim/akonadi/kcal as long as it's not yet exported: -+ akonadi/calendar.cpp -+ akonadi/calendarmodel.cpp -+ akonadi/calfilterproxymodel.cpp -+ akonadi/utils.cpp -+ akonadi/blockalarmsattribute.cpp -+ akonadi/collectionselection.cpp -+ ) -+endif(AKONADI_FOUND) -+ - kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs}) - - target_link_libraries( -@@ -31,13 +36,19 @@ - ${KDEPIMLIBS_KHOLIDAYS_LIBRARY} - ${KDE4_KDECORE_LIBS} - ${KDE4_PLASMA_LIBS} -- ${KDE4_AKONADI_LIBS} - ${KDE4_KMIME_LIBS} - ${KDE4_KCALCORE_LIBS} - ${KDE4_KCALUTILS_LIBS} -- ${KDEPIMLIBS_AKONADI_KCAL_LIBS} - ) - -+if(AKONADI_FOUND) -+ target_link_libraries( -+ plasma_engine_calendar -+ ${KDE4_AKONADI_LIBS} -+ ${KDEPIMLIBS_AKONADI_KCAL_LIBS} -+ ) -+endif(AKONADI_FOUND) -+ - install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - -diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/calendarengine.cpp plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/calendarengine.cpp ---- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/calendarengine.cpp 2011-02-25 23:10:02.000000000 +0100 -+++ plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/calendarengine.cpp 2011-04-02 13:59:01.920795444 +0200 -@@ -32,6 +32,7 @@ - #include <KCalCore/Todo> - #include <KCalCore/Journal> - -+#ifdef AKONADI_FOUND - #include <Akonadi/ChangeRecorder> - #include <Akonadi/Session> - #include <Akonadi/Collection> -@@ -41,6 +42,7 @@ - #include "akonadi/calendar.h" - #include "akonadi/calendarmodel.h" - #include "eventdatacontainer.h" -+#endif - - CalendarEngine::CalendarEngine(QObject* parent, const QVariantList& args) - : Plasma::DataEngine(parent), -@@ -74,9 +76,11 @@ - return holidayCalendarSourceRequest(requestKey, requestTokens, request); - } - -+#ifdef AKONADI_FOUND - if (requestKey == "events" || requestKey == "eventsInMonth") { - return akonadiCalendarSourceRequest(requestKey, requestTokens, request); - } -+#endif - - return false; - } -@@ -272,6 +276,7 @@ - return false; - } - -+#ifdef AKONADI_FOUND - bool CalendarEngine::akonadiCalendarSourceRequest(const QString& key, const QStringList& args, const QString& request) - { - // figure out what time range was requested from the source string -@@ -339,5 +344,6 @@ - calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch); - m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local()); - } -+#endif - - #include "calendarengine.moc" diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-dduplicate.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-dduplicate.patch deleted file mode 100644 index fec66766319a..000000000000 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-dduplicate.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 3f1dd3b94ab2b56abb43a51b7b78a9cd162325d0 -Author: Aaron Seigo <aseigo@kde.org> -Date: Fri May 6 22:51:50 2011 +0200 - - get rid of duplicate connect - - patch contributed by Luc Menut - BUG:262614 - REVIEW:101284 - -diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp b/plasma/generic/containmentactions/applauncher/launch.cpp -index cbc7175..bef53e5 100644 ---- a/plasma/generic/containmentactions/applauncher/launch.cpp -+++ b/plasma/generic/containmentactions/applauncher/launch.cpp -@@ -36,7 +36,6 @@ AppLauncher::AppLauncher(QObject *parent, const QVariantList &args) - { - m_menu = new KMenu(); - connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*))); -- connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*))); - - m_action->setMenu(m_menu); - } diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch deleted file mode 100644 index f24aded13a93..000000000000 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Rafael Fernández López <ereslibre@kde.org> -Date: Thu, 28 Apr 2011 11:35:53 +0000 -Subject: gpsd api has changed and for GPSD_API_MAJOR_VERSION >=5 there are -X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=a3009dd96e8519bcc205d75c29e18bbbb81fce03 ---- -gpsd api has changed and for GPSD_API_MAJOR_VERSION >=5 there are -some calls that are slightly different. Make the dataengine compile -against this version and previous one by adding conditional code. - -REVIEW: 101247 ---- - - ---- a/plasma/generic/dataengines/geolocation/location_gps.cpp -+++ b/plasma/generic/dataengines/geolocation/location_gps.cpp -@@ -51,7 +51,11 @@ void Gpsd::run() - while (!m_abort) { - Plasma::DataEngine::Data d; - -+#if GPSD_API_MAJOR_VERSION >= 5 -+ if (gps_read(m_gpsdata) != -1) { -+#else - if (gps_poll(m_gpsdata) != -1) { -+#endif - //kDebug() << "poll ok"; - if (m_gpsdata->online) { - //kDebug() << "online"; -@@ -73,11 +77,19 @@ void Gpsd::run() - Gps::Gps(QObject* parent, const QVariantList& args) - : GeolocationProvider(parent, args), - m_gpsd(0) -+#if GPSD_API_MAJOR_VERSION >= 5 -+ , m_gpsdata(0) -+#endif - { -- gps_data_t* gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT); -- if (gpsdata) { -+#if GPSD_API_MAJOR_VERSION >= 5 -+ m_gpsdata = new gps_data_t; -+ gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata); -+#else -+ gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT); -+#endif -+ if (m_gpsdata) { - kDebug() << "gpsd found."; -- m_gpsd = new Gpsd(gpsdata); -+ m_gpsd = new Gpsd(m_gpsdata); - connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)), - this, SIGNAL(setData(const Plasma::DataEngine::Data&))); - } else { -@@ -90,6 +102,9 @@ Gps::Gps(QObject* parent, const QVariant - Gps::~Gps() - { - delete m_gpsd; -+#if GPSD_API_MAJOR_VERSION >= 5 -+ delete m_gpsdata; -+#endif - } - - void Gps::update() - ---- a/plasma/generic/dataengines/geolocation/location_gps.h -+++ b/plasma/generic/dataengines/geolocation/location_gps.h -@@ -58,6 +58,9 @@ public: - - private: - Gpsd* m_gpsd; -+#if GPSD_API_MAJOR_VERSION >= 5 -+ gps_data_t* m_gpsdata; -+#endif - }; - - #endif - diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-calendarcrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-calendarcrash.patch deleted file mode 100644 index 705daf65b4b3..000000000000 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-calendarcrash.patch +++ /dev/null @@ -1,52 +0,0 @@ -commit 44a9c26b9eb27df8297618764f988972d476dc84 -Author: David E. Narváez <david.narvaez@computer.org> -Date: Sun Nov 20 16:31:15 2011 -0500 - - Drop InvisibleCollectionFetch in Favor of KDescendantsProxyModel - - As the InvisibleCollectionFetch fetch strategy is currently broken, I - implemented a suggestion by Christian Mollekopf of working around the - issues by flatting the model through a KDescendantsProxyModel to fix - crashes in Plasma related to calendars. - - BUG: 279322 - FIXED-IN: 4.7.4 - - CCMAIL: chrigi_1@fastmail.fm - REVIEW: 103088 - -diff --git a/plasma/generic/dataengines/calendar/calendarengine.cpp b/plasma/generic/dataengines/calendar/calendarengine.cpp -index 53f98c0..f8b3a90 100644 ---- a/plasma/generic/dataengines/calendar/calendarengine.cpp -+++ b/plasma/generic/dataengines/calendar/calendarengine.cpp -@@ -31,6 +31,7 @@ - #include <KCalCore/Event> - #include <KCalCore/Todo> - #include <KCalCore/Journal> -+#include <kdescendantsproxymodel.h> - - #ifdef AKONADI_FOUND - #include <Akonadi/ChangeRecorder> -@@ -38,6 +39,7 @@ - #include <Akonadi/Collection> - #include <Akonadi/ItemFetchScope> - #include <Akonadi/EntityDisplayAttribute> -+#include <Akonadi/EntityMimeTypeFilterModel> - - #include "akonadi/calendar.h" - #include "akonadi/calendarmodel.h" -@@ -341,8 +343,12 @@ void CalendarEngine::initAkonadiCalendar() - - // create the models that contain the data. they will be updated automatically from akonadi. - CalendarSupport::CalendarModel *calendarModel = new CalendarSupport::CalendarModel(monitor, this); -- calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch); -- m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local()); -+ KDescendantsProxyModel *flatModel = new KDescendantsProxyModel(this); -+ flatModel->setSourceModel(calendarModel); -+ Akonadi::EntityMimeTypeFilterModel *mimeFilteredModel = new Akonadi::EntityMimeTypeFilterModel(this); -+ mimeFilteredModel->addMimeTypeExclusionFilter(Akonadi::Collection::mimeType()); -+ mimeFilteredModel->setSourceModel(flatModel); -+ m_calendar = new CalendarSupport::Calendar(mimeFilteredModel, mimeFilteredModel, KSystemTimeZones::local()); - } - #endif - diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch deleted file mode 100644 index 70f73675345e..000000000000 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 2d1deb4234aa3d43e2a7cc48fc1f6936bd2ff97c -Author: Aaron Seigo <aseigo@kde.org> -Date: Wed Nov 9 17:11:50 2011 +0100 - - since the widget is being deleted, remove it from the collection - - BUG:286197 - BUG:286195 - BUG:264750 - BUG:277367 - BUG:280326 - BUG:280072 - BUG:282552 - BUG:283061 - BUG:284603 - BUG:286177 - BUG:286181 - -diff --git a/plasma/generic/applets/systemtray/core/task.cpp b/plasma/generic/applets/systemtray/core/task.cpp -index 5793102..1a02c24 100644 ---- a/plasma/generic/applets/systemtray/core/task.cpp -+++ b/plasma/generic/applets/systemtray/core/task.cpp -@@ -101,7 +101,7 @@ QHash<Plasma::Applet *, QGraphicsWidget *> Task::widgetsByHost() const - - void Task::abandon(Plasma::Applet *host) - { -- QGraphicsWidget *widget = d->widgetsByHost.value(host); -+ QGraphicsWidget *widget = d->widgetsByHost.take(host); - if (widget) { - widget->deleteLater(); - } -@@ -116,7 +116,7 @@ void Task::widgetDeleted() - { - bool wasEmbeddable = isEmbeddable(); - -- QGraphicsWidget * w = static_cast<QGraphicsWidget*>(sender()); -+ QGraphicsWidget *w = static_cast<QGraphicsWidget*>(sender()); - QMutableHashIterator<Plasma::Applet *, QGraphicsWidget *> it(d->widgetsByHost); - while (it.hasNext()) { - it.next(); diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-layoutcrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-layoutcrash.patch deleted file mode 100644 index 4697a1fde8ba..000000000000 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-layoutcrash.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 77b1374b99ee91d23d8802dd1dec9a5f630e919a -Author: Aaron Seigo <aseigo@kde.org> -Date: Wed Nov 9 20:15:50 2011 +0100 - - only delete the layout when it isn't assigned to another layout - - based on the patch by Raul Fernandes - BUG:275286 - -diff --git a/plasma/desktop/applets/tasks/taskgroupitem.cpp b/plasma/desktop/applets/tasks/taskgroupitem.cpp -index 6b23b71..d7816d3 100644 ---- a/plasma/desktop/applets/tasks/taskgroupitem.cpp -+++ b/plasma/desktop/applets/tasks/taskgroupitem.cpp -@@ -79,8 +79,11 @@ TaskGroupItem::TaskGroupItem(QGraphicsWidget *parent, Tasks *applet) - - TaskGroupItem::~TaskGroupItem() - { -- delete m_tasksLayout; -- m_tasksLayout = 0; -+ if (!m_offscreenLayout && !m_mainLayout) { -+ // only delete this if we have neither an offscreen layout or a mainlayout -+ // if we do, then they will delete the layout for us. -+ delete m_tasksLayout; -+ } - } - - bool TaskGroupItem::isSplit() diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-taskcrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-taskcrash.patch deleted file mode 100644 index 3f45277f836e..000000000000 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-taskcrash.patch +++ /dev/null @@ -1,264 +0,0 @@ -commit 639155a5493a28ca9460d60fa0c078ec65c3bb96 -Author: Aaron Seigo <aseigo@kde.org> -Date: Thu Nov 10 13:01:37 2011 +0100 - - use a QWeakPointer to track the lifespan of the task - - the itemRemoved signal from TaskGroup has dangling pointers, apparently - by design (the next thing on my list to investigate), and the signal is - delayed. so between the actual deletion of the task and the signal, there - pointer is a dangler. easy solution is to just track it in the WindowTaskItem - itself with a cheap QWeakPointer. - - BUG:272495 - -diff --git a/plasma/desktop/applets/tasks/abstracttaskitem.cpp b/plasma/desktop/applets/tasks/abstracttaskitem.cpp -index 00140ef..48ba172 100644 ---- a/plasma/desktop/applets/tasks/abstracttaskitem.cpp -+++ b/plasma/desktop/applets/tasks/abstracttaskitem.cpp -@@ -203,6 +203,10 @@ QIcon AbstractTaskItem::icon() const - return QIcon(); - } - -+void AbstractTaskItem::close() -+{ -+} -+ - void AbstractTaskItem::setTaskFlags(const TaskFlags flags) - { - if (((m_flags & TaskWantsAttention) != 0) != ((flags & TaskWantsAttention) != 0)) { -diff --git a/plasma/desktop/applets/tasks/abstracttaskitem.h b/plasma/desktop/applets/tasks/abstracttaskitem.h -index 9520e1f..a527881 100644 ---- a/plasma/desktop/applets/tasks/abstracttaskitem.h -+++ b/plasma/desktop/applets/tasks/abstracttaskitem.h -@@ -103,7 +103,7 @@ public: - /** Returns the current icon for this task. */ - QIcon icon() const; - -- virtual void close() = 0; -+ virtual void close(); - - /** Tells the window manager the minimized task's geometry. */ - virtual void publishIconGeometry() const; -diff --git a/plasma/desktop/applets/tasks/windowtaskitem.cpp b/plasma/desktop/applets/tasks/windowtaskitem.cpp -index 1ddca2c..1c33476 100644 ---- a/plasma/desktop/applets/tasks/windowtaskitem.cpp -+++ b/plasma/desktop/applets/tasks/windowtaskitem.cpp -@@ -56,7 +56,6 @@ - - WindowTaskItem::WindowTaskItem(QGraphicsWidget *parent, Tasks *applet) - : AbstractTaskItem(parent, applet), -- m_task(0), - m_busyWidget(0) - { - } -@@ -77,8 +76,8 @@ void WindowTaskItem::activate() - // in a widget such as a line edit which does accept the focus) - // this needs to be implemented for Plasma's own panels. - //kDebug(); -- if (m_task && m_task->task()) { -- m_task->task()->activateRaiseOrIconify(); -+ if (m_task && m_task.data()->task()) { -+ m_task.data()->task()->activateRaiseOrIconify(); - // emit windowSelected(this); - } - } -@@ -108,27 +107,20 @@ void WindowTaskItem::keyPressEvent(QKeyEvent *event) - } - } - --//destroy this item --void WindowTaskItem::close() --{ -- //kDebug(); -- m_task = 0; --} -- - void WindowTaskItem::publishIconGeometry() const - { -- if (!m_task || !m_task->task()) { -+ if (!m_task || !m_task.data()->task()) { - return; - } - - QRect rect = iconGeometry(); -- m_task->task()->publishIconGeometry(rect); -+ m_task.data()->task()->publishIconGeometry(rect); - } - - void WindowTaskItem::publishIconGeometry(const QRect &rect) const - { -- if (m_task && m_task->task()) { -- m_task->task()->publishIconGeometry(rect); -+ if (m_task && m_task.data()->task()) { -+ m_task.data()->task()->publishIconGeometry(rect); - } - } - -@@ -142,7 +134,7 @@ void WindowTaskItem::updateTask(::TaskManager::TaskChanges changes) - TaskFlags flags = m_flags; - - if (changes & TaskManager::StateChanged) { -- if (m_task->isActive()) { -+ if (m_task.data()->isActive()) { - flags |= TaskHasFocus; - if (!(m_flags & TaskHasFocus)) { - emit activated(this); -@@ -151,7 +143,7 @@ void WindowTaskItem::updateTask(::TaskManager::TaskChanges changes) - flags &= ~TaskHasFocus; - } - -- if (m_task->isMinimized()) { -+ if (m_task.data()->isMinimized()) { - flags |= TaskIsMinimized; - } else { - flags &= ~TaskIsMinimized; -@@ -160,7 +152,7 @@ void WindowTaskItem::updateTask(::TaskManager::TaskChanges changes) - } - - if (changes & TaskManager::AttentionChanged) { -- if (m_task->demandsAttention()) { -+ if (m_task.data()->demandsAttention()) { - flags |= TaskWantsAttention; - } else { - flags &= ~TaskWantsAttention; -@@ -191,14 +183,14 @@ void WindowTaskItem::updateTask(::TaskManager::TaskChanges changes) - - if (needsUpdate) { - //redraw -- //kDebug() << m_task->name(); -+ //kDebug() << m_task.data()->name(); - queueUpdate(); - } - } - - void WindowTaskItem::updateToolTip() - { -- if (!m_task || !m_task->task()) { -+ if (!m_task || !m_task.data()->task()) { - return; - } - -@@ -219,19 +211,19 @@ void WindowTaskItem::updateToolTip() - } - - if (showToolTip) { -- QPixmap p = m_task->task()->icon(KIconLoader::SizeLarge, KIconLoader::SizeLarge, false); -+ QPixmap p = m_task.data()->task()->icon(KIconLoader::SizeLarge, KIconLoader::SizeLarge, false); - if (p.height() > KIconLoader::SizeLarge) { - p = p.scaled(QSize(KIconLoader::SizeLarge, KIconLoader::SizeLarge), - Qt::KeepAspectRatio, Qt::SmoothTransformation); - } - -- Plasma::ToolTipContent data(Qt::escape(m_task->name()), QString(), p); -- if (m_task->desktop() != 0 && -- (!m_applet->groupManager().showOnlyCurrentDesktop() || !m_task->isOnCurrentDesktop())) { -+ Plasma::ToolTipContent data(Qt::escape(m_task.data()->name()), QString(), p); -+ if (m_task.data()->desktop() != 0 && -+ (!m_applet->groupManager().showOnlyCurrentDesktop() || !m_task.data()->isOnCurrentDesktop())) { - data.setSubText(i18nc("Which virtual desktop a window is currently on", "On %1", -- KWindowSystem::desktopName(m_task->desktop()))); -+ KWindowSystem::desktopName(m_task.data()->desktop()))); - } -- data.setWindowToPreview(m_task->task()->window()); -+ data.setWindowsToPreview(QList<WId>() << m_task.data()->task()->window()); - data.setClickable(true); - data.setInstantPopup(true); - data.setHighlightWindows(m_applet->highlightWindows()); -@@ -285,8 +277,9 @@ void WindowTaskItem::gotTaskPointer() - void WindowTaskItem::setWindowTask(TaskManager::TaskItem* taskItem) - { - if (m_task) { -- disconnect(m_task->task().constData(), 0, this, 0); -+ disconnect(m_task.data()->task().constData(), 0, this, 0); - } -+ - m_task = taskItem; - m_abstractItem = qobject_cast<TaskManager::AbstractGroupableItem *>(taskItem); - -@@ -294,8 +287,10 @@ void WindowTaskItem::setWindowTask(TaskManager::TaskItem* taskItem) - connect(m_abstractItem, SIGNAL(destroyed(QObject*)), this, SLOT(clearAbstractItem())); - } - -- connect(m_task, SIGNAL(changed(::TaskManager::TaskChanges)), -- this, SLOT(updateTask(::TaskManager::TaskChanges))); -+ if (m_task) { -+ connect(m_task.data(), SIGNAL(changed(::TaskManager::TaskChanges)), -+ this, SLOT(updateTask(::TaskManager::TaskChanges))); -+ } - - updateTask(::TaskManager::EverythingChanged); - publishIconGeometry(); -@@ -319,7 +314,7 @@ void WindowTaskItem::setTask(TaskManager::TaskItem* taskItem) - - TaskManager::TaskPtr WindowTaskItem::windowTask() const - { -- return m_task ? m_task->task() : TaskManager::TaskPtr(); -+ return m_task ? m_task.data()->task() : TaskManager::TaskPtr(); - } - - void WindowTaskItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e) -@@ -331,10 +326,10 @@ void WindowTaskItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e) - - QList <QAction*> actionList; - QAction *a(0); -- if (m_task->isGrouped()) { -+ if (m_task.data()->isGrouped()) { - a = new QAction(i18n("Collapse Parent Group"), 0); - actionList.append(a); -- TaskGroupItem *group = qobject_cast<TaskGroupItem*>(m_applet->rootGroupItem()->abstractTaskItem(m_task->parentGroup())); -+ TaskGroupItem *group = qobject_cast<TaskGroupItem*>(m_applet->rootGroupItem()->abstractTaskItem(m_task.data()->parentGroup())); - connect(a, SIGNAL(triggered()), group, SLOT(collapse())); - } - -@@ -343,7 +338,7 @@ void WindowTaskItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e) - actionList.append(configAction); - } - -- TaskManager::BasicMenu menu(0, m_task, &m_applet->groupManager(), actionList); -+ TaskManager::BasicMenu menu(0, m_task.data(), &m_applet->groupManager(), actionList); - menu.adjustSize(); - - if (m_applet->formFactor() != Plasma::Vertical) { -@@ -364,18 +359,13 @@ bool WindowTaskItem::isWindowItem() const - - bool WindowTaskItem::isActive() const - { -- if (!m_task) { -- //kDebug() << "no task set"; -- return false; -- } -- -- return m_task->isActive(); -+ return m_task ? m_task.data()->isActive() : false; - } - - void WindowTaskItem::setAdditionalMimeData(QMimeData* mimeData) - { - if (m_task) { -- m_task->addMimeData(mimeData); -+ m_task.data()->addMimeData(mimeData); - } - } - -diff --git a/plasma/desktop/applets/tasks/windowtaskitem.h b/plasma/desktop/applets/tasks/windowtaskitem.h -index a5b698a..4db9d43 100644 ---- a/plasma/desktop/applets/tasks/windowtaskitem.h -+++ b/plasma/desktop/applets/tasks/windowtaskitem.h -@@ -63,7 +63,6 @@ signals: - - public slots: - void activate(); -- void close(); - - protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); -@@ -82,7 +81,7 @@ private: - /** Sets the window represented by this task. */ - void setWindowTask(TaskManager::TaskItem* taskItem); - -- TaskManager::TaskItem *m_task; -+ QWeakPointer<TaskManager::TaskItem> m_task; - Plasma::BusyWidget *m_busyWidget; - }; - diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-weathercrash.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-weathercrash.patch deleted file mode 100644 index a9daa5004ea7..000000000000 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-weathercrash.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 92b1e7cc6766023050aaaae41390bb5cfcc07ec5 -Author: Max Lin <max7442@gmail.com> -Date: Thu Nov 3 11:48:32 2011 +0800 - - Used the gps_open() return value as condition instead of checking m_gpsdata - - Checking the return value of gps_open() as condition instead of checking - m_gpsdata for GPSD_API_MAJOR_VERSION >=5, there should be prevent crash - occurred when no gpsd running. - - BUG: 277036 - REVIEW: 103035 - -diff --git a/plasma/generic/dataengines/geolocation/location_gps.cpp b/plasma/generic/dataengines/geolocation/location_gps.cpp -index 709321b..551aec2 100644 ---- a/plasma/generic/dataengines/geolocation/location_gps.cpp -+++ b/plasma/generic/dataengines/geolocation/location_gps.cpp -@@ -83,11 +83,11 @@ Gps::Gps(QObject* parent, const QVariantList& args) - { - #if GPSD_API_MAJOR_VERSION >= 5 - m_gpsdata = new gps_data_t; -- gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata); -+ if (gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata) != -1) { - #else - gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT); --#endif - if (m_gpsdata) { -+#endif - kDebug() << "gpsd found."; - m_gpsd = new Gpsd(m_gpsdata); - connect(m_gpsd, SIGNAL(dataReady(Plasma::DataEngine::Data)), |