Mon Jan 9 13:47:49 UTC 2012

4 files changed, 0 insertions, 343 deletions

diff --git a/kde-unstable/kactivities/fix-activities.patch b/kde-unstable/kactivities/fix-activities.patch
deleted file mode 100644
index 5cf62c48c..000000000
--- a/kde-unstable/kactivities/fix-activities.patch
+++ /dev/null
@@ -1,156 +0,0 @@
---- kactivities-4.7.80/service/ActivityManager.cpp~	2011-11-24 16:05:52.777981854 +0000
-+++ kactivities-4.7.80/service/ActivityManager.cpp	2011-11-24 16:06:32.721637122 +0000
-@@ -75,14 +75,14 @@
-             QHash < WId, SharedInfo::WindowData > & _windows,
-             QHash < KUrl, SharedInfo::ResourceData > & _resources
-         )
--    : haveSessions(false),
--    config("activitymanagerrc"),
--    windows(_windows),
--    resources(_resources),
-+    : config("activitymanagerrc"),
-+      windows(_windows),
-+      resources(_resources),
- #ifdef HAVE_NEPOMUK
--    m_nepomukInitCalled(false),
-+      m_nepomukInitCalled(false),
- #endif
--    q(parent)
-+      q(parent),
-+      ksmserverInterface(0)
- {
-     // Initializing config
-     connect(&configSyncTimer, SIGNAL(timeout()),
-@@ -116,20 +116,26 @@
-             this, SLOT(activeWindowChanged(WId)));
- 
-     //listen to ksmserver for starting/stopping
-+    QDBusServiceWatcher *watcher = new QDBusServiceWatcher("org.kde.ksmserver",
-+                                                           QDBusConnection::sessionBus(),
-+                                                           QDBusServiceWatcher::WatchForRegistration);
-+    connect(watcher, SIGNAL(serviceRegistered(QString)), this, SLOT(sessionServiceRegistered()));
-+    sessionServiceRegistered();
-+}
-+
-+void ActivityManagerPrivate::sessionServiceRegistered()
-+{
-+    delete ksmserverInterface;
-     ksmserverInterface = new QDBusInterface("org.kde.ksmserver", "/KSMServer", "org.kde.KSMServerInterface");
-     if (ksmserverInterface->isValid()) {
-         ksmserverInterface->setParent(this);
-         connect(ksmserverInterface, SIGNAL(subSessionOpened()), this, SLOT(startCompleted()));
-         connect(ksmserverInterface, SIGNAL(subSessionClosed()), this, SLOT(stopCompleted()));
-         connect(ksmserverInterface, SIGNAL(subSessionCloseCanceled()), this, SLOT(stopCancelled())); //spelling fail :)
--        haveSessions = true;
-     } else {
--        kDebug() << "couldn't connect to ksmserver! session stuff won't work";
--        //note: in theory it's nice to try again later
--        //but in practice, ksmserver is either there or it isn't (killing it logs you out)
--        //so in this case there's no point. :)
--        ksmserverInterface->deleteLater();
-+        delete ksmserverInterface;
-         ksmserverInterface = 0;
-+        kDebug() << "couldn't connect to ksmserver! session stuff won't work";
-     }
- }
- 
-@@ -519,26 +525,24 @@
- {
-     bool called = false;
-     // start the starting :)
--    if (haveSessions) {
--        QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
--        if (kwin.isValid()) {
--            QDBusMessage reply = kwin.call("startActivity", id);
--            if (reply.type() == QDBusMessage::ErrorMessage) {
--                kDebug() << "dbus error:" << reply.errorMessage();
-+    QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
-+    if (kwin.isValid()) {
-+        QDBusMessage reply = kwin.call("startActivity", id);
-+        if (reply.type() == QDBusMessage::ErrorMessage) {
-+            kDebug() << "dbus error:" << reply.errorMessage();
-+        } else {
-+            QList<QVariant> ret = reply.arguments();
-+            if (ret.length() == 1 && ret.first().toBool()) {
-+                called = true;
-             } else {
--                QList<QVariant> ret = reply.arguments();
--                if (ret.length() == 1 && ret.first().toBool()) {
--                    called = true;
--                } else {
--                    kDebug() << "call returned false; probably ksmserver is busy";
--                    setActivityState(transitioningActivity, ActivityManager::Stopped);
--                    transitioningActivity.clear();
--                    return; //assume we're mid-logout and just don't touch anything
--                }
-+                kDebug() << "call returned false; probably ksmserver is busy";
-+                setActivityState(transitioningActivity, ActivityManager::Stopped);
-+                transitioningActivity.clear();
-+                return; //assume we're mid-logout and just don't touch anything
-             }
--        } else {
--            kDebug() << "couldn't get kwin interface";
-         }
-+    } else {
-+        kDebug() << "couldn't get kwin interface";
-     }
- 
-     if (!called) {
-@@ -585,25 +589,23 @@
- {
-     bool called = false;
-     // start the stopping :)
--    if (haveSessions) {
--        QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
--        if (kwin.isValid()) {
--            QDBusMessage reply = kwin.call("stopActivity", id);
--            if (reply.type() == QDBusMessage::ErrorMessage) {
--                kDebug() << "dbus error:" << reply.errorMessage();
-+    QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
-+    if (kwin.isValid()) {
-+        QDBusMessage reply = kwin.call("stopActivity", id);
-+        if (reply.type() == QDBusMessage::ErrorMessage) {
-+            kDebug() << "dbus error:" << reply.errorMessage();
-+        } else {
-+            QList<QVariant> ret = reply.arguments();
-+            if (ret.length() == 1 && ret.first().toBool()) {
-+                called = true;
-             } else {
--                QList<QVariant> ret = reply.arguments();
--                if (ret.length() == 1 && ret.first().toBool()) {
--                    called = true;
--                } else {
--                    kDebug() << "call returned false; probably ksmserver is busy";
--                    stopCancelled();
--                    return; //assume we're mid-logout and just don't touch anything
--                }
-+                kDebug() << "call returned false; probably ksmserver is busy";
-+                stopCancelled();
-+                return; //assume we're mid-logout and just don't touch anything
-             }
--        } else {
--            kDebug() << "couldn't get kwin interface";
-         }
-+    } else {
-+        kDebug() << "couldn't get kwin interface";
-     }
- 
-     if (!called) {
---- kactivities-4.7.80/service/ActivityManager_p.h~	2011-11-24 16:06:01.618054620 +0000
-+++ kactivities-4.7.80/service/ActivityManager_p.h	2011-11-24 16:06:32.721637122 +0000
-@@ -68,7 +68,6 @@
- 
-     //opening/closing activity (ksmserver can only handle one at a time)
-     QString transitioningActivity;
--    bool haveSessions; //whether ksmserver's available
- 
-     // Configuration
-     QTimer configSyncTimer;
-@@ -106,6 +105,7 @@
- 
-     void backstoreAvailable();
-     void syncActivitiesWithNepomuk();
-+    void sessionServiceRegistered();
- 
- private:
-     ActivityManager * const q;
diff --git a/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch b/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch
deleted file mode 100644
index 779456b39..000000000
--- a/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c	2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c	2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- "    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- "    zhome=${ZDOTDIR:-$HOME}\n"
- "    # zshenv is always sourced automatically.\n"
--"    [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+"    [ -f /etc/profile ] && . /etc/profile\n"
- "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
diff --git a/kde-unstable/kdebindings-smokegen/fix-crash.patch b/kde-unstable/kdebindings-smokegen/fix-crash.patch
deleted file mode 100644
index 5864da3f3..000000000
--- a/kde-unstable/kdebindings-smokegen/fix-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up smokegen-4.7.0/parser/type_compiler.cpp.orig smokegen-4.7.0/parser/type_compiler.cpp
-diff -up smokegen-4.7.0/type_compiler.cpp.orig smokegen-4.7.0/type_compiler.cpp
---- smokegen-4.7.0/type_compiler.cpp.orig	2011-08-02 14:34:08.000000000 +0200
-+++ smokegen-4.7.0/type_compiler.cpp	2011-08-02 14:34:34.000000000 +0200
-@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara
- 
- void TypeCompiler::visitPtrOperator(PtrOperatorAST* node)
- {
-+    if ( ! m_session->token_stream ) return;
-+    if ( ! token_text(m_session->token_stream->kind(node->op)) ) return;
-     if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
-         QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
-         pointerDepth.append(cv.first);
diff --git a/kde-unstable/kdeplasma-addons/fix-build.patch b/kde-unstable/kdeplasma-addons/fix-build.patch
deleted file mode 100644
index 79e1d1f8c..000000000
--- a/kde-unstable/kdeplasma-addons/fix-build.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From: Aaron Seigo <aseigo@kde.org>
-Date: Tue, 22 Nov 2011 20:10:45 +0000
-Subject: fix build
-X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&amp;a=commitdiff&amp;h=6967ee53518136651b4fd5d691293a3c866d7a47
----
-fix build
----
-
-
---- a/libs/lancelot-datamodels/OpenDocuments.cpp
-+++ b/libs/lancelot-datamodels/OpenDocuments.cpp
-@@ -66,41 +66,41 @@ OpenDocuments::~OpenDocuments()
-     delete d;
- }
- 
--void OpenDocuments::Private::connectTask(TaskPtr task)
-+void OpenDocuments::Private::connectTask(::TaskManager::Task *task)
- {
-     Q_ASSERT(task);
-     connect(
--        task.constData(), SIGNAL(changed(::TaskManager::TaskChanges)),
-+        task, SIGNAL(changed(::TaskManager::TaskChanges)),
-         this, SLOT(taskChanged())
-     );
- }
- 
- void OpenDocuments::load()
- {
--    foreach (TaskPtr task, TaskManager::TaskManager::self()->tasks()) {
-+    foreach (TaskManager::Task *task, TaskManager::TaskManager::self()->tasks()) {
-         if (d->setDataForTask(task)) {
-             d->connectTask(task);
-         }
-     }
- 
-     connect(
--        TaskManager::TaskManager::self(), SIGNAL(taskAdded(TaskPtr)),
--        d, SLOT(taskAdded(TaskPtr))
-+        TaskManager::TaskManager::self(), SIGNAL(taskAdded(::TaskManager::Task*)),
-+        d, SLOT(taskAdded(::TaskManager::Task*))
-     );
- 
-     connect(
--        TaskManager::TaskManager::self(), SIGNAL(taskRemoved(TaskPtr)),
--        d, SLOT(taskRemoved(TaskPtr))
-+        TaskManager::TaskManager::self(), SIGNAL(taskRemoved(::TaskManager::Task*)),
-+        d, SLOT(taskRemoved(::TaskManager::Task*))
-     );
- }
- 
--void OpenDocuments::Private::taskAdded(TaskPtr task)
-+void OpenDocuments::Private::taskAdded(::TaskManager::Task *task)
- {
-     connectTask(task);
-     setDataForTask(task);
- }
- 
--void OpenDocuments::Private::taskRemoved(TaskPtr task)
-+void OpenDocuments::Private::taskRemoved(::TaskManager::Task *task)
- {
-     Q_ASSERT(task);
-     int index = indexOf(task->window());
-@@ -115,10 +115,10 @@ void OpenDocuments::Private::taskChanged
-     TaskManager::Task* task = qobject_cast<TaskManager::Task*>(sender());
-     Q_ASSERT(task);
- 
--    setDataForTask(TaskPtr(task));
-+    setDataForTask(task);
- }
- 
--bool OpenDocuments::Private::setDataForTask(TaskPtr task)
-+bool OpenDocuments::Private::setDataForTask(::TaskManager::Task *task)
- {
-     Q_ASSERT(task);
- 
-
---- a/libs/lancelot-datamodels/OpenDocuments.h
-+++ b/libs/lancelot-datamodels/OpenDocuments.h
-@@ -26,8 +26,6 @@
- #include <taskmanager/taskmanager.h>
- #include <QSet>
- 
--using TaskManager::TaskPtr;
--
- namespace Lancelot {
- namespace Models {
- 
-
---- a/libs/lancelot-datamodels/OpenDocuments_p.h
-+++ b/libs/lancelot-datamodels/OpenDocuments_p.h
-@@ -24,8 +24,6 @@
- #include <taskmanager/taskmanager.h>
- #include <QSet>
- 
--using TaskManager::TaskPtr;
--
- namespace Lancelot {
- namespace Models {
- 
-@@ -44,16 +42,16 @@ public:
- 
- public Q_SLOTS:
-     void taskChanged();
--    void taskAdded(TaskPtr task);
--    void taskRemoved(TaskPtr task);
-+    void taskAdded(::TaskManager::Task *task);
-+    void taskRemoved(::TaskManager::Task *task);
- 
--    void connectTask(TaskPtr task);
--    bool setDataForTask(TaskPtr task);
-+    void connectTask(::TaskManager::Task *task);
-+    bool setDataForTask(::TaskManager::Task *task);
- 
-     int indexOf(WId wid);
- 
- public:
--    QMap <WId, TaskPtr > tasks;
-+    QMap <WId, TaskManager::Task *> tasks;
-     QList <SupportedTask> supportedTasks;
- 
- private:
-
-From: Aaron Seigo <aseigo@kde.org>
-Date: Tue, 22 Nov 2011 13:07:59 +0000
-Subject: remove outdated using statements
-X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&amp;a=commitdiff&amp;h=b0c70d7fd866efb628036f43978bc791e0485f90
----
-remove outdated using statements
----
-
-
---- a/applets/icontasks/taskitemlayout.h
-+++ b/applets/icontasks/taskitemlayout.h
-@@ -32,9 +32,6 @@ class TaskGroupItem;
- class AbstractTaskItem;
- class LauncherSeparator;
- 
--using TaskManager::StartupPtr;
--using TaskManager::TaskPtr;
--
- /**
-  * A Layout for the expanded group
-  */
-
---- a/applets/icontasks/tasks.h
-+++ b/applets/icontasks/tasks.h
-@@ -54,15 +54,6 @@ namespace TaskManager
- class GroupManager;
- } // namespace TaskManager
- 
--using TaskManager::StartupPtr;
--using TaskManager::TaskPtr;
--using TaskManager::StartupPtr;
--using TaskManager::GroupPtr;
--using TaskManager::AbstractGroupableItem;
--using TaskManager::TaskItem;
--using TaskManager::TaskGroup;
--using TaskManager::LauncherItem;
--
- class TaskGroupItem;
- class GroupManager;
- 
-