[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD plasma-desktop-crash.patch)

[Andrea Scarpino]

    Date: Saturday, September 7, 2013 @ 18:45:55
  Author: andrea
Revision: 193947

Fix plasma-desktop crash (FS#36604)

Added:
  kdebase-workspace/trunk/plasma-desktop-crash.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   13 +++++++++----
 plasma-desktop-crash.patch |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-07 16:40:23 UTC (rev 193946)
+++ PKGBUILD	2013-09-07 16:45:55 UTC (rev 193947)
@@ -5,7 +5,7 @@
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.11.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -28,7 +28,8 @@
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
         'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'plasma-desktop-dbus.patch')
+        'plasma-desktop-dbus.patch'
+        'plasma-desktop-crash.patch')
 sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -38,9 +39,12 @@
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'd509dac592bd8b310df27991b208c95b6d907514'
-          '57315ab3adf4d7eed9410c4494f0a63204122763')
+          '57315ab3adf4d7eed9410c4494f0a63204122763'
+          'e031dd5c989b63e7149a489cdf220c1b9f55317e')
 
 prepare() {
+        mkdir build
+
         cd ${_pkgname}-${pkgver}
 
         # reads the shell scripts in /etc/kde/
@@ -52,10 +56,11 @@
         patch -p0 -i "${srcdir}"/terminate-server.patch
         # KDEBUG#321695
         patch -p1 -i "${srcdir}"/plasma-desktop-dbus.patch
+        # KDEBUG#322283
+        patch -p1 -i "${srcdir}"/plasma-desktop-crash.patch
 }
 
 build() {
-        mkdir build
         cd build
         cmake ../${_pkgname}-${pkgver} \
           -DCMAKE_BUILD_TYPE=Release \

Added: plasma-desktop-crash.patch
===================================================================
--- plasma-desktop-crash.patch	                        (rev 0)
+++ plasma-desktop-crash.patch	2013-09-07 16:45:55 UTC (rev 193947)
@@ -0,0 +1,21 @@
+commit 6878e972b87e9ef34617c6280eda8ac5d7113a29
+Author: Eike Hein <hein at kde.org>
+Date:   Sun Aug 25 16:38:15 2013 +0200
+
+    Don't attempt to publish geometry for launcher items.
+    
+    CCBUG:322283
+
+diff --git a/plasma/desktop/applets/tasks/package/contents/code/tools.js b/plasma/desktop/applets/tasks/package/contents/code/tools.js
+index 53e5563..028dd2c 100644
+--- a/plasma/desktop/applets/tasks/package/contents/code/tools.js
++++ b/plasma/desktop/applets/tasks/package/contents/code/tools.js
+@@ -100,7 +100,7 @@ function publishIconGeometries(taskItems) {
+             for (j = 0; j < taskIdList.length; ++j) {
+                 tasks.itemGeometryChanged(taskIdList[j].itemId, task.x, task.y, task.width, task.height);
+             }
+-        } else {
++        } else if (!task.isLauncher) {
+             tasks.itemGeometryChanged(task.itemId, task.x, task.y, task.width, task.height);
+         }
+     }