Wed Sep 11 01:49:28 PDT 2013

3 files changed, 6 insertions, 62 deletions

diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index a864fd983..a8207807f 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193949 2013-09-07 16:57:19Z andrea $
+# $Id: PKGBUILD 194052 2013-09-10 13:23:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.11.0
-pkgrel=3
+pkgver=4.11.1
+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'
@@ -27,10 +27,8 @@ install="${pkgname}.install"
 backup=('usr/share/config/kdm/kdmrc')
 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-crash.patch')
-sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d'
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+sha1sums=('4515c2909d2b9e711758a566ef6cd9e2f2181531'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
@@ -38,9 +36,7 @@ sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d'
           'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514'
-          '57315ab3adf4d7eed9410c4494f0a63204122763'
-          'e031dd5c989b63e7149a489cdf220c1b9f55317e')
+          'd509dac592bd8b310df27991b208c95b6d907514')
 
 prepare() {
         mkdir build
@@ -54,10 +50,6 @@ prepare() {
 
         # KDEBUG#202629
         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() {
diff --git a/extra/kdebase-workspace/plasma-desktop-crash.patch b/extra/kdebase-workspace/plasma-desktop-crash.patch
deleted file mode 100644
index eaa714687..000000000
--- a/extra/kdebase-workspace/plasma-desktop-crash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 6878e972b87e9ef34617c6280eda8ac5d7113a29
-Author: Eike Hein <hein@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);
-         }
-     }
diff --git a/extra/kdebase-workspace/plasma-desktop-dbus.patch b/extra/kdebase-workspace/plasma-desktop-dbus.patch
deleted file mode 100644
index 70790dac3..000000000
--- a/extra/kdebase-workspace/plasma-desktop-dbus.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
-Date: Tue, 20 Aug 2013 11:35:57 +0000
-Subject: Partially revert commit 83d3018
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=bb2bddb083eb293786206ac91ae1feeaf942db32
----
-Partially revert commit 83d3018
-
-Somehow unique made ksplash quit too soon and/or plasma start
-too late
-
-REVIEW: 112073
-BUG: 321695
-FIXED-IN: 4.11.1
----
-
-
---- a/plasma/desktop/shell/data/plasma-desktop.desktop
-+++ b/plasma/desktop/shell/data/plasma-desktop.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Exec=plasma-desktop
--X-DBUS-StartupType=unique
-+X-DBUS-StartupType=multi
- Name=Plasma Desktop Workspace
- Name[ar]=مساحة عمل بلازما
- Name[ast]=Espaciu de trabayu del escritoriu Plasma
-