From 885be2d638aadbbea992b7960778969e9ad18db7 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Thu, 22 Nov 2012 18:17:55 +0000
Subject: [PATCH] adding kded-appmenu conflict to workspace

---
 kde-workspace/PKGBUILD | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/kde-workspace/PKGBUILD b/kde-workspace/PKGBUILD
index 655af811b..382d5b947 100644
--- a/kde-workspace/PKGBUILD
+++ b/kde-workspace/PKGBUILD
@@ -13,7 +13,7 @@ _default_wp="Ariya"
 pkgname="kde-workspace"
 arch=('x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Workspace"
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
@@ -33,7 +33,7 @@ optdepends=("kdebindings-pykde4: Python Support for Plasma"
 	    "opentp:             Optional time/date sync support")
 provides=('kdebase-workspace' 'powerdevil' 'kcm_tablet=1.1.3' 'kde-workspace-doc')
 replaces=('guidance-power-manager' 'kdebase-workspace' 'kde-workspace-doc')
-conflicts=('kdebase-workspace' 'powerdevil' 'kcm_tablet' 'guidance-power-manager' 'kde-workspace-doc')
+conflicts=('kdebase-workspace' 'powerdevil' 'kcm_tablet' 'guidance-power-manager' 'kde-workspace-doc' 'kded-appmenu')
 groups=("kde" "kde-uninstall" "kde-minimal")
 backup=('usr/share/config/kdm/kdmrc'
         'etc/pam.d/kscreensaver')
@@ -60,8 +60,7 @@ source=($_mirror/${pkgname}-$_kdever.tar.xz
 	# restart xserver on logout
 	fix_terminate-server.patch
 	# "fix" some sytemsettings modules that need root access
-	fix_root-only-kcms.patch
-	appmenu.diff)
+	fix_root-only-kcms.patch)
 
 md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
         `grep kde-wallpapers-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` # kde-wallpapers
@@ -82,8 +81,7 @@ md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
         '89d96455c6a446ef59b0620d1b8606af'  #  07_always_show_kickoff_subtext.patch
 
         '814350c52c135d6f7bdada1e29223d38'  #  fix_terminate-server.patch
-	'5f963f80a026f0600edae1b1c70411e5'  #  fix_root-only-kcms.patch
-        'ca3877bf428d13eead45756fa94376b5') #  appmenu.diff
+	'5f963f80a026f0600edae1b1c70411e5')  #  fix_root-only-kcms.patch
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -97,7 +95,6 @@ build() {
 	msg "applying fixes ..."
 	patch -p0 -i ${srcdir}/fix_terminate-server.patch
         patch -p1 -i ${srcdir}/fix_root-only-kcms.patch
-        #patch -p1 -i ${srcdir}/appmenu.diff
 
 	msg "starting workspace build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \