Sun Feb 10 01:12:35 PST 2013

7 files changed, 0 insertions, 389 deletions

diff --git a/extra/kdebase-workspace/fix-freeze.patch b/extra/kdebase-workspace/fix-freeze.patch
deleted file mode 100644
index 1926baebc..000000000
--- a/extra/kdebase-workspace/fix-freeze.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/kwin/tabbox/clientmodel.cpp b/kwin/tabbox/clientmodel.cpp
-index 9591bab..a67d979 100644
---- a/kwin/tabbox/clientmodel.cpp
-+++ b/kwin/tabbox/clientmodel.cpp
-@@ -188,7 +188,7 @@ void ClientModel::createClientList(int desktop, bool partialReset)
-     switch(tabBox->config().clientSwitchingMode()) {
-     case TabBoxConfig::FocusChainSwitching: {
-         TabBoxClient* c = start;
--        if (!c) {
-+        if (!tabBox->isInFocusChain(c)) {
-             QSharedPointer<TabBoxClient> firstClient = tabBox->firstClientFocusChain().toStrongRef();
-             if (firstClient) {
-                 c = firstClient.data();
-diff --git a/kwin/tabbox/tabbox.cpp b/kwin/tabbox/tabbox.cpp
-index d96d0bd..7a08d37 100644
---- a/kwin/tabbox/tabbox.cpp
-+++ b/kwin/tabbox/tabbox.cpp
-@@ -112,6 +112,14 @@ QWeakPointer< TabBoxClient > TabBoxHandlerImpl::firstClientFocusChain() const
-     }
- }
- 
-+bool TabBoxHandlerImpl::isInFocusChain(TabBoxClient *client) const
-+{
-+    if (TabBoxClientImpl *c = static_cast<TabBoxClientImpl*>(client)) {
-+        return Workspace::self()->globalFocusChain().contains(c->client());
-+    }
-+    return false;
-+}
-+
- int TabBoxHandlerImpl::nextDesktopFocusChain(int desktop) const
- {
-     return m_tabBox->nextDesktopFocusChain(desktop);
-diff --git a/kwin/tabbox/tabbox.h b/kwin/tabbox/tabbox.h
-index 6652f93..bba0b39 100644
---- a/kwin/tabbox/tabbox.h
-+++ b/kwin/tabbox/tabbox.h
-@@ -52,6 +52,7 @@ public:
-     virtual QString desktopName(int desktop) const;
-     virtual QWeakPointer< TabBoxClient > nextClientFocusChain(TabBoxClient* client) const;
-     virtual QWeakPointer< TabBoxClient > firstClientFocusChain() const;
-+    virtual bool isInFocusChain (TabBoxClient* client) const;
-     virtual int nextDesktopFocusChain(int desktop) const;
-     virtual int numberOfDesktops() const;
-     virtual TabBoxClientList stackingOrder() const;
-diff --git a/kwin/tabbox/tabboxhandler.h b/kwin/tabbox/tabboxhandler.h
-index 7abddfc..d9a6122 100644
---- a/kwin/tabbox/tabboxhandler.h
-+++ b/kwin/tabbox/tabboxhandler.h
-@@ -119,6 +119,7 @@ public:
-      * @since 4.9.1
-      **/
-     virtual QWeakPointer<TabBoxClient> firstClientFocusChain() const = 0;
-+    virtual bool isInFocusChain(TabBoxClient* client) const = 0;
-     /**
-     * @param client The client whose desktop name should be retrieved
-     * @return The desktop name of the given TabBoxClient. If the client is
diff --git a/extra/kdebase-workspace/fix-krunner-crash.patch b/extra/kdebase-workspace/fix-krunner-crash.patch
deleted file mode 100644
index 2bdf0b512..000000000
--- a/extra/kdebase-workspace/fix-krunner-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libs/plasmagenericshell/panelshadows.cpp b/libs/plasmagenericshell/panelshadows.cpp
-index ee55571..2f45153 100644
---- a/libs/plasmagenericshell/panelshadows.cpp
-+++ b/libs/plasmagenericshell/panelshadows.cpp
-@@ -122,7 +122,7 @@ void PanelShadows::Private::initPixmap(const QString &element)
- {
- #ifdef Q_WS_X11
-     QPixmap pix = q->pixmap(element);
--    if (pix.handle() == 0) {
-+    if (!pix.isNull() && pix.handle() == 0) {
-         Pixmap xPix = XCreatePixmap(QX11Info::display(), QX11Info::appRootWindow(), pix.width(), pix.height(), 32);
-         QPixmap tempPix = QPixmap::fromX11Pixmap(xPix, QPixmap::ExplicitlyShared);
-         tempPix.fill(Qt::transparent);
diff --git a/extra/kdebase-workspace/fix-mesa9.patch b/extra/kdebase-workspace/fix-mesa9.patch
deleted file mode 100644
index 4c5fca408..000000000
--- a/extra/kdebase-workspace/fix-mesa9.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 6cf057777555a5d0c834de3a0165a62916cf3b40
-Author: Fredrik Höglund <fredrik@kde.org>
-Date:   Tue Oct 30 18:20:00 2012 +0100
-
-    kwin/glx: Avoid MSAA configs in initBufferConfigs()
-    
-    It appears that we're accidentally choosing an MSAA config with the
-    Intel driver in Mesa 9.0. So change the algorithm to take the values
-    of GLX_SAMPLES and GLX_SAMPLE_BUFFERS into account.
-    
-    Found by Kenneth Graunke.
-
-diff --git a/kwin/scene_opengl_glx.cpp b/kwin/scene_opengl_glx.cpp
-index 1fe2f18..cf7933b 100644
---- a/kwin/scene_opengl_glx.cpp
-+++ b/kwin/scene_opengl_glx.cpp
-@@ -270,12 +270,15 @@ bool SceneOpenGL::initBufferConfigs()
-     fbcbuffer_nondb = NULL;
- 
-     for (int i = 0; i < 2; i++) {
--        int back, stencil, depth, caveat, alpha;
-+        int back, stencil, depth, caveat, msaa_buffers, msaa_samples, alpha;
-         back = i > 0 ? INT_MAX : 1;
-         stencil = INT_MAX;
-         depth = INT_MAX;
-         caveat = INT_MAX;
-+        msaa_buffers = INT_MAX;
-+        msaa_samples = INT_MAX;
-         alpha = 0;
-+
-         for (int j = 0; j < cnt; j++) {
-             XVisualInfo *vi;
-             int visual_depth;
-@@ -322,10 +325,26 @@ bool SceneOpenGL::initBufferConfigs()
-                                  GLX_CONFIG_CAVEAT, &caveat_value);
-             if (caveat_value > caveat)
-                 continue;
-+
-+            int msaa_buffers_value;
-+            glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLE_BUFFERS,
-+                                 &msaa_buffers_value);
-+            if (msaa_buffers_value > msaa_buffers)
-+                continue;
-+
-+            int msaa_samples_value;
-+            glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLES,
-+                                 &msaa_samples_value);
-+            if (msaa_samples_value > msaa_samples)
-+                continue;
-+
-             back = back_value;
-             stencil = stencil_value;
-             depth = depth_value;
-             caveat = caveat_value;
-+            msaa_buffers = msaa_buffers_value;
-+            msaa_samples = msaa_samples_value;
-+
-             if (i > 0)
-                 fbcbuffer_nondb = fbconfigs[ j ];
-             else
diff --git a/extra/kdebase-workspace/fixpath.patch b/extra/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/extra/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/extra/kdebase-workspace/kdm b/extra/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/extra/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
-  start)
-    stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon kdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping KDE Desktop Manager"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon kdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/kdebase-workspace/logind-support.patch b/extra/kdebase-workspace/logind-support.patch
deleted file mode 100644
index 9de205400..000000000
--- a/extra/kdebase-workspace/logind-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Lukas Tinkl <lukas@kde.org>
-Date: Fri, 05 Oct 2012 09:57:13 +0000
-Subject: store the filedescriptor in a member variable
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1
----
-store the filedescriptor in a member variable
-
-make systemd-inhibit work as intended, PowerDevil now handles
-power/sleep/lid buttons as intended
-
-BUG: 307412
----
-
-
---- a/powerdevil/daemon/powerdevilpolicyagent.cpp
-+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
-@@ -29,7 +29,6 @@
- #include <QtDBus/QDBusPendingReply>
- #include <QtDBus/QDBusConnectionInterface>
- #include <QtDBus/QDBusServiceWatcher>
--#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <KGlobal>
- #include <KDebug>
-@@ -225,6 +224,9 @@
-         onActiveSessionChanged(m_activeSessionPath);
- 
-         // inhibit systemd handling of power/sleep/lid buttons
-+        // http://www.freedesktop.org/wiki/Software/systemd/inhibit
-+        kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
-+
-         QVariantList args;
-         args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
-         args << "PowerDevil"; // who
-@@ -232,8 +234,9 @@
-         args << "block"; // mode
-         QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
-         desc.waitForFinished();
--        if (desc.isValid() && desc.value().isValid()) {
--            kDebug() << "systemd powersave events handling inhibited";
-+        if (desc.isValid()) {
-+            m_systemdInhibitFd = desc.value();
-+            kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
-         }
-         else
-             kWarning() << "failed to inhibit systemd powersave handling";
-
---- a/powerdevil/daemon/powerdevilpolicyagent.h
-+++ b/powerdevil/daemon/powerdevilpolicyagent.h
-@@ -27,6 +27,7 @@
- #include <QtCore/QWeakPointer>
- 
- #include <QtDBus/QDBusContext>
-+#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <kdemacros.h>
- 
-@@ -108,6 +109,7 @@
-     QString m_activeSessionPath;
-     QWeakPointer< QDBusInterface > m_sdSessionInterface;
-     QWeakPointer< QDBusInterface > m_sdSeatInterface;
-+    QDBusUnixFileDescriptor m_systemdInhibitFd;
- 
-     // ConsoleKit support
-     bool m_ckAvailable;
-
diff --git a/extra/kdebase-workspace/logind-support2.patch b/extra/kdebase-workspace/logind-support2.patch
deleted file mode 100644
index e36757f6a..000000000
--- a/extra/kdebase-workspace/logind-support2.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-commit 80e9e6e48ff5b84962f3a8543ee06bcd4f122623
-Author: Lukáš Tinkl <lukas@kde.org>
-Date:   Tue Oct 30 11:32:52 2012 +0100
-
-    move systemd inhibition initialization to a slot
-    
-    and call it on resume. It looks like the filedescriptor
-    goes away when you suspend so we need to recreate it.
-    
-    BUG: 307412
-
-diff --git a/powerdevil/daemon/powerdevilcore.cpp b/powerdevil/daemon/powerdevilcore.cpp
-index df79667..7f24cbb 100644
---- a/powerdevil/daemon/powerdevilcore.cpp
-+++ b/powerdevil/daemon/powerdevilcore.cpp
-@@ -127,8 +127,6 @@ void Core::onBackendReady()
-             this, SLOT(onAcAdapterStateChanged(PowerDevil::BackendInterface::AcAdapterState)));
-     connect(m_backend, SIGNAL(batteryRemainingTimeChanged(qulonglong)),
-             this, SLOT(onBatteryRemainingTimeChanged(qulonglong)));
--    connect(m_backend, SIGNAL(resumeFromSuspend()),
--            this, SLOT(onResumeFromSuspend()));
-     connect(KIdleTime::instance(), SIGNAL(timeoutReached(int,int)),
-             this, SLOT(onKIdleTimeoutReached(int,int)));
-     connect(KIdleTime::instance(), SIGNAL(resumingFromIdle()),
-@@ -139,6 +137,9 @@ void Core::onBackendReady()
-     // Set up the policy agent
-     PowerDevil::PolicyAgent::instance()->init();
- 
-+    connect(m_backend, SIGNAL(resumeFromSuspend()),
-+            this, SLOT(onResumeFromSuspend()));
-+
-     // Initialize the action pool, which will also load the needed startup actions.
-     PowerDevil::ActionPool::instance()->init(this);
- 
-@@ -601,6 +602,7 @@ void Core::onResumeFromSuspend()
-                                              "/ScreenSaver",
-                                              QDBusConnection::sessionBus());
-     iface.SimulateUserActivity();
-+    PowerDevil::PolicyAgent::instance()->setupSystemdInhibition();
- 
-     emit resumingFromSuspend();
- }
-diff --git a/powerdevil/daemon/powerdevilpolicyagent.cpp b/powerdevil/daemon/powerdevilpolicyagent.cpp
-index 70588db..0777846 100644
---- a/powerdevil/daemon/powerdevilpolicyagent.cpp
-+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
-@@ -88,6 +88,7 @@ PolicyAgent *PolicyAgent::instance()
- PolicyAgent::PolicyAgent(QObject* parent)
-     : QObject(parent)
-     , m_sdAvailable(false)
-+    , m_systemdInhibitFd(-1)
-     , m_ckAvailable(false)
-     , m_sessionIsBeingInterrupted(false)
-     , m_lastCookie(0)
-@@ -223,23 +224,7 @@ void PolicyAgent::onSessionHandlerRegistered(const QString & serviceName)
- 
-         onActiveSessionChanged(m_activeSessionPath);
- 
--        // inhibit systemd handling of power/sleep/lid buttons
--        // http://www.freedesktop.org/wiki/Software/systemd/inhibit
--        kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
--
--        QVariantList args;
--        args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
--        args << "PowerDevil"; // who
--        args << "KDE handles power events"; // why
--        args << "block"; // mode
--        QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
--        desc.waitForFinished();
--        if (desc.isValid()) {
--            m_systemdInhibitFd = desc.value();
--            kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
--        }
--        else
--            kWarning() << "failed to inhibit systemd powersave handling";
-+        setupSystemdInhibition();
- 
-         kDebug() << "systemd support initialized";
-     } else if (serviceName == CONSOLEKIT_SERVICE) {
-@@ -552,6 +537,31 @@ void PolicyAgent::releaseAllInhibitions()
-     }
- }
- 
-+void PolicyAgent::setupSystemdInhibition()
-+{
-+    if (m_systemdInhibitFd.fileDescriptor() != -1)
-+        return;
-+
-+    // inhibit systemd handling of power/sleep/lid buttons
-+    // http://www.freedesktop.org/wiki/Software/systemd/inhibit
-+    QDBusInterface managerIface(SYSTEMD_LOGIN1_SERVICE, SYSTEMD_LOGIN1_PATH, SYSTEMD_LOGIN1_MANAGER_IFACE, QDBusConnection::systemBus());
-+    kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
-+
-+    QVariantList args;
-+    args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
-+    args << "PowerDevil"; // who
-+    args << "KDE handles power events"; // why
-+    args << "block"; // mode
-+    QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
-+    desc.waitForFinished();
-+    if (desc.isValid()) {
-+        m_systemdInhibitFd = desc.value();
-+        kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
-+    }
-+    else
-+        kWarning() << "failed to inhibit systemd powersave handling";
-+}
-+
- }
- 
- #include "powerdevilpolicyagent.moc"
-diff --git a/powerdevil/daemon/powerdevilpolicyagent.h b/powerdevil/daemon/powerdevilpolicyagent.h
-index a046497..f1e8c03 100644
---- a/powerdevil/daemon/powerdevilpolicyagent.h
-+++ b/powerdevil/daemon/powerdevilpolicyagent.h
-@@ -74,6 +74,8 @@ public:
- 
-     RequiredPolicies unavailablePolicies();
- 
-+    void setupSystemdInhibition();
-+
- public Q_SLOTS:
-     // Exported slots
-     uint AddInhibition(uint types, const QString &appName, const QString &reason);