[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD fix-freeze.patch)

[Andrea Scarpino]

    Date: Tuesday, October 2, 2012 @ 05:10:10
  Author: andrea
Revision: 167442

KDE 4.9.2

Modified:
  kdebase-workspace/trunk/PKGBUILD
Deleted:
  kdebase-workspace/trunk/fix-freeze.patch

------------------+
 PKGBUILD         |   15 ++++----------
 fix-freeze.patch |   56 -----------------------------------------------------
 2 files changed, 5 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-02 09:10:07 UTC (rev 167441)
+++ PKGBUILD	2012-10-02 09:10:10 UTC (rev 167442)
@@ -4,8 +4,8 @@
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.9.1
-pkgrel=3
+pkgver=4.9.2
+pkgrel=1
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -29,9 +29,8 @@
 options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'fix-freeze.patch')
-sha1sums=('ac1753e2264246ec6347961f44b0aae07072dbb4'
+        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           '712a90999bd429883dcef5dcaf288aace332ced8'
           'b321b5e613b60231330e606fdf1e124646148388'
@@ -39,8 +38,7 @@
           'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514'
-          '820135367cc577a8557061b9844d3ce4a5fde90f')
+          'd509dac592bd8b310df27991b208c95b6d907514')
 
 build() {
 	cd "${srcdir}"/${_pkgname}-${pkgver}
@@ -48,9 +46,6 @@
 	patch -p0 -i "${srcdir}"/fixpath.patch
 	patch -p0 -i "${srcdir}"/terminate-server.patch
 
-    # KDEBUG 306260
-    patch -p1 -i "${srcdir}"/fix-freeze.patch
-	
 	cd "${srcdir}"
 	mkdir build
 	cd build

Deleted: fix-freeze.patch
===================================================================
--- fix-freeze.patch	2012-10-02 09:10:07 UTC (rev 167441)
+++ fix-freeze.patch	2012-10-02 09:10:10 UTC (rev 167442)
@@ -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