Remove unused patches.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

8 files changed, 40 insertions, 142 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 64dc7d249997..b67eed095a74 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.434 2014/05/08 10:32:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.435 2014/05/08 21:17:00 johu Exp $
+
+  08 May 2014; Johannes Huber <johu@gentoo.org>
+  -files/kopete-4.11.2-jabber-connect.patch,
+  -files/kopete-4.11.2-jabber-connect2.patch:
+  Remove unused patches.
 
   08 May 2014; Agostino Sarubbo <ago@gentoo.org> -kopete-4.11.5.ebuild:
   Remove old
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 54e292003391..02ff376116e9 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX kopete-4.11.2-jabber-connect.patch 1502 SHA256 90f7b33135afd042be337c626d996acf45004c8ef931df911ab10e03f7ce700f SHA512 d018ccef245f5088025867dac3c5c53425636323c652042901c57a2a973529ab8fa973feb5b3fa28e16eeedb5781079ca551c555ab3cc7877fe1855a9b841a2d WHIRLPOOL b17b8627af5ef67e6399e818c9ed3b3bd1fed3243c23129cb2ef015fc7a4c78ca4c22acf426bb2d78c036b9e3c93686ee8f602ae3ea3f15e15a385ab5d025970
-AUX kopete-4.11.2-jabber-connect2.patch 1502 SHA256 7496617b901f990f60a31c3ce158b228831f22a2aa166da5989b36324f8e306b SHA512 230681fc66fa3ec17f45568a8032284f40d1f8725999f7e8c83ca5b2167d4c6a3673554ab3c8a42c7bd38a18a39c33de029a829096e66a67ef0c0d882b002b42 WHIRLPOOL cf694cf92178f33f7900c010dea9afd6d7e48613b2b77c78d5f491afe5aa6a30129c2baea8707b028efaf46a61b1de8358acdd62669baf25af1fbb650ffc4ad3
 DIST kopete-4.12.5.tar.xz 6309392 SHA256 bfb4f8147b04c521bfee9018157cd6ce8e4dd559cb7e755ec5920503e414440d SHA512 50663de13d27ea9a225cb66629983107812f1626d9a73b7aa215153e3b5883f6edc1216e60683179f412e620959635c4f888e890ca53303c63d148729621ccc1 WHIRLPOOL 81cb187d3002d87f3bbe82e8445413c2084f50cdbfff7209a440b5de3f2ee777852d6cc0bf2161e887c9d7f3b43104452d4ff589a9cbd4fcb0c7fce66d964556
 DIST kopete-4.13.0.tar.xz 6314648 SHA256 f0e958c92227e4203f9f392a2b543458ce048eea4b83d797b9c8718991a03f18 SHA512 cb48ab237e83c959af93b8782d75af1e25f5f2f6aea7d887f74ebaf4235c35e3795619bfd9dcd1dbd2fb3bc73174885c209e9ac0ff405198607381e2d26d91a5 WHIRLPOOL b6f5c0afa1e5424c3c94e315a74dfc383ca028504a4797e3824e29fc25c057e6bc9a2242fe9148ddafeed86535d7ef2ddda39788f8cc2990d2d6ae97e30350c0
 EBUILD kopete-4.12.5.ebuild 4130 SHA256 8584ebb2b3513e6d14c4bb7e4e5b9b3c481926371894a209c09599485a643049 SHA512 bb841cccd3004d5821846922acf29087b76ecd611519c1ac2e9dcd3b0fcfcfb258c3d679178047b3934b81b46670e35b05e5d5a8ec8a7d7e8c59a10d00a6c29b WHIRLPOOL d6ef29691faf10637dde52120a78a87b3b2f740469a49e2ce879a703de06e1b261fcdc9841a8f576f8527d0dea9fcd84aa39cbb9b00e91f6d3f4c0423dcf29e6
 EBUILD kopete-4.13.0.ebuild 4135 SHA256 536cb6ee577ecdb0530977d8a9470e36f6f9fba5b35c6e05d55047bc032410a7 SHA512 3129ea2556c2edee074e27bf38631920d7fdad59a6fa8cf0a317528abcc253906397ac5dfb439d5adb9c18f674c201210ef2cd08326074c76305c5ed2582cafd WHIRLPOOL b92b72e0efceeebf1837f8e3f6d09757a41510311ad901a18500279b50ea5e816c030f3a55d06fb58f0330f44601f1e12de18179819ada62e58d1fe9b6076b0b
-MISC ChangeLog 59429 SHA256 872a5a18316bd9cf7fe418a33c938a7f4cc72b5572d3755eb306a2aa1770e7d4 SHA512 3725d5596a21e377b02bbe6d37f0e9b168b4320ea92b66968d785d98695b1899659b63a1667e344aee678582338689dc7b8c75604caab98baef596d8eead50d8 WHIRLPOOL ddc0cf879f92343d55c89d4b138657942fe59ac8f6c3704b4f2252d5c7057e01beb61f22807ace842d6cd56aeae88fa63af3707b019bfdb8837c3e3d004633c5
+MISC ChangeLog 59595 SHA256 65fbe2efbb47f184912c55a01bf1aa70505f0470e09145642371e7e5429b44aa SHA512 65d5257eab79d69d962681b3b1c8be7535984e97660e69e2a94ddd84d3a9c4cc1106c8a899aee14166398fa59f51402fdda0b3c47b977258d68d5750cb31d9b2 WHIRLPOOL b8e173cdcb22ef84ae8f401b2c7fb634aefeb61a56eb685426c29d51cd19aa9c60fb4c5d519299f9270aa3780ef9fa3f4b8aa70592941fe7e24cbdfb9bed439a
 MISC metadata.xml 2449 SHA256 2373b4b12a5db6aed29c91a5a9c114250692ac02691b3ec919dda89ceeb3fa0b SHA512 087fd456daee8ce857b321d32a572838fb5c32137c051ff9f1a8df9cded0dbcbc3517a784347e9231ecc41069d8ef5242efd08def865489bb434e99ddaf0db88 WHIRLPOOL dfe45c7f2a1821f5636ea1dc88e38cd47b9f4b6d4831c60cb68f4ce52eea03435e46fc128bf8af36e5f7de5598408989f9ae419dec62cc096f15f1717a67cb61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTa11yAAoJELp701BxlEWfXn8P/jfhwxkt+ySTsjpGSPtl6MWa
-r238+NktlSxDxghItabbEVoJP44k30grrsaOKYtEv9RNV/rS/E60Qb58cC3axM7R
-y9qXBfBP5N0QG3Bxv+mWKZOMRKKe3sK317j5TXkZRn8FH5+3qmYrBVGja6rYEF96
-RcIDhxH0bNxL4IOq5r/Qa75DfgdWVGRBx09Z3TLQPhUFhVG56VafyIsEe/1wnAKV
-pI/E5MLjUnj2aERlIl4CgecerjEHdI7ntoLSmEiYy6Bd+75DQ8G5gyPR13bcB1K1
-P8rS9Qkt+whh4T7A9yelW3D1i4K2SExshdsDIIDRMDEYsH3y9fpZNyDxu6X6VVie
-+JTaRTmUp44ffhTWA1EWtwYIoe3n+2o9hQVOCPPHVCFamovjpNUKoBfUW59T7+Le
-0EiHNNNz1J0CwCvEDosCBuw3vvyT38LEjBq31IDpq97+yWKvbBZN6CA0uWC1QZqG
-FFeLgUT/pqZY2DLoEArqlMoKKyrzzy7vSx/UseALl0NSm9LiM1YAwrJaKgW8n+KI
-G+Vyt/i8CaLewhp3Ml2jFP45R6F4qGbGJfP/aKT4jkJFPKFxHLr/771EeNsUPsE5
-g6O5AK1qkUlGKMbMNp2Yc0A0rhZH/JGnDg0q25Z/HKL0PTv6EajqOwTNbp6jFYs1
-RC799QrL6ripdf1c4lGr
-=vKl4
+iQIcBAEBCAAGBQJTa/RNAAoJEGVpnaTzz9K9NEEQAJ5kxDavoCTT7R9z4WQAANUl
+5NEQq+/hRS1HaQmypYkpIVo+iPBmvfTt94r1h3mvoWeFQP7d2O97XKP8k3EBuLKV
+I5RITH2fDeSHYLevyya1aZn0dEp5VSUqC2eypE5z+SD2gp41dv1u2FxbzZe+ZwsT
+oZg/CkW9RKj+DChEtmfZPR9hzUwp0vg7akdMdVQcZKix+GOIjulvctDergqUChPB
+wCLIpGWMJ1ujwMqQBU48lKp0dt1kBEnws2gQxiuZqqSkraK5AarGniYK999gXxuK
+MqkJgie2CDlGI7g0uTPSFhsVbKhk9b4dFgRAW/O44DQeoa7zMFvhYVs3CEzHxGzH
+eWlDKHqTXyxnSuVod8q9Vj5rHYW5LOjgehMXT+CeqZ/G6mfbqHtp/fx7RF/6Wax0
+xLinIPxwyEry9xL2MLBZyhSgUhn+tvGhS02uSZ6FKSJvzRxz6Z0W7V5viSMhOvWO
+nRomCkImIJaaGZt1/moh45gTIDfHgXSmoJh8LHTVuj5Ku6VST2sZHH3hb+3YzzMo
+fz0JuyLXwWmcRLwtHAtTi7I8kGTspAlN1WPOEWrThuacFP33W7Mg+NKx3lz8RkMS
+i5dWL+0dR8PQ6XTg9dgKkkztiBqR+L4s7N0Cl//WI87u0VuClfcKcKdC9LwlqdTx
+sc2c4p6mq6FHsnBrRehr
+=IjEA
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/kopete-4.11.2-jabber-connect.patch b/kde-base/kopete/files/kopete-4.11.2-jabber-connect.patch
deleted file mode 100644
index 40e226b7c286..000000000000
--- a/kde-base/kopete/files/kopete-4.11.2-jabber-connect.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit dd536999ce5611ad5d80adb813f7857ab29f20d4
-Author: Pali Rohár <pali.rohar@gmail.com>
-Date:   Mon Oct 21 15:33:54 2013 +0200
-
-    Do not allow overwriting bare jid of myself account in jabber client
-    
-    Kopete account id and myself contact id cannot be changed. This means that all
-    jabber code must use bare jid for myself contact specified in account dialog.
-    Jabber server can change user jid after successfull login, but there is no
-    way in Kopete to propage it. So allow changing only of resource name and do not
-    tell other Kopete code about bare jid changes (which is account id and myself
-    contact id). Chaning resource name is OK. Without this patch it is not possible
-    to login to jabber servers which chaning bare jid (e.g facebook).
-    
-    BUG: 324937
-    FIXED-IN: 4.12
-
-diff --git a/protocols/jabber/jabberclient.cpp b/protocols/jabber/jabberclient.cpp
-index c1d5f58..b96241e 100644
---- a/protocols/jabber/jabberclient.cpp
-+++ b/protocols/jabber/jabberclient.cpp
-@@ -1059,9 +1059,8 @@ void JabberClient::slotCSAuthenticated ()
- 		d->jabberClient->s5bManager()->setServer ( s5bServer () );
- 	}
- 
--	
--	//update the resource:
--	d->jid = d->jabberClientStream->jid();
-+	// update only resource and do not change bare jid, see bug 324937
-+	d->jid = XMPP::Jid ( d->jid.node(), d->jid.domain(), d->jabberClientStream->jid().resource() );
- 
- 	// start the client operation
- 	d->jabberClient->start ( jid().domain (), jid().node (), d->password, jid().resource () );
diff --git a/kde-base/kopete/files/kopete-4.11.2-jabber-connect2.patch b/kde-base/kopete/files/kopete-4.11.2-jabber-connect2.patch
deleted file mode 100644
index 319c0851c643..000000000000
--- a/kde-base/kopete/files/kopete-4.11.2-jabber-connect2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 7801dae888e6fd145e6755e9f89d2bf04092bf4a
-Author: Pali Rohár <pali.rohar@gmail.com>
-Date:   Mon Oct 21 12:45:37 2013 +0200
-
-    Fix JabberResourcePool::lockToResource
-    
-    When locking contact to resource check only for bare JID. It does not make sense to check for full JID with (maybe old/bad) resource name
-    
-    CCBUG: 324937
-
-diff --git a/protocols/jabber/jabberresourcepool.cpp b/protocols/jabber/jabberresourcepool.cpp
-index de2b2bf..27330a7 100644
---- a/protocols/jabber/jabberresourcepool.cpp
-+++ b/protocols/jabber/jabberresourcepool.cpp
-@@ -220,7 +220,7 @@ void JabberResourcePool::clear ()
- 
- void JabberResourcePool::lockToResource ( const XMPP::Jid &jid, const XMPP::Resource &resource )
- {
--	kDebug(JABBER_DEBUG_GLOBAL) << "Locking " << jid.full() << " to " << resource.name();
-+	kDebug(JABBER_DEBUG_GLOBAL) << "Locking " << jid.bare() << " to " << resource.name();
- 
- 	// remove all existing locks first
- 	removeLock ( jid );
-@@ -228,7 +228,7 @@ void JabberResourcePool::lockToResource ( const XMPP::Jid &jid, const XMPP::Reso
- 	// find the resource in our dictionary that matches
- 	foreach(JabberResource *mResource, d->pool)
- 	{
--		if ( (mResource->jid().bare().toLower() == jid.full().toLower()) && (mResource->resource().name().toLower() == resource.name().toLower()) )
-+		if ( (mResource->jid().bare().toLower() == jid.bare().toLower()) && (mResource->resource().name().toLower() == resource.name().toLower()) )
- 		{
- 			d->lockList.append ( mResource );
- 			return;
diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog
index bd2761cda001..ebe4b5b6127e 100644
--- a/kde-base/ksmserver/ChangeLog
+++ b/kde-base/ksmserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/ksmserver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.311 2014/05/08 10:32:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.312 2014/05/08 21:18:46 johu Exp $
+
+  08 May 2014; Johannes Huber <johu@gentoo.org>
+  -files/ksmserver-4.10.50-noplasmalock.patch,
+  -files/ksmserver-4.11.97-noplasmalock.patch:
+  Remove unused patches.
 
   08 May 2014; Agostino Sarubbo <ago@gentoo.org> -ksmserver-4.11.5.ebuild:
   Remove old
diff --git a/kde-base/ksmserver/Manifest b/kde-base/ksmserver/Manifest
index 0619c95b3cfc..46f70111a013 100644
--- a/kde-base/ksmserver/Manifest
+++ b/kde-base/ksmserver/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ksmserver-4.10.50-noplasmalock.patch 925 SHA256 cb8c68c0e5bdee243e9da547a0e65181b40291fff0740c49f782688a7ba932cb SHA512 438dbf02b81463cf5b511a3e6dfede41924c20890e89cce5f31327c4acdead5b316c8c6f5afd25ed54f97f68d4d0fbc363ab829c572bc25fa4520831da30be5a WHIRLPOOL 2894233484fcba09b22eb56b7735d6c67a14f599cba342678ad01c55dac50d37078d4968a75f38be2ef51365a29796a80db6dd6496796cded53da0e493ead49a
-AUX ksmserver-4.11.97-noplasmalock.patch 836 SHA256 47d00acc79b8caee112d19b93f8e5bad0e2fd1f6a6dda39b4bc35963cf1a14de SHA512 e79a12f4b2280c535b30cc9023542f4e59b6abd917355f1bf9942207487f373c93e2656f5f12a3f7148c407cc13ebc15d31ecd06c7699f524bca1e30ee095030 WHIRLPOOL 6ade1e26df609e4b9b36dce5e723a3063182adc9ea91a1a7eeecd3af874711eb060d7b186873d7419246467ed403a2146bab009da726cb841bbea7b866f84a16
 DIST kde-workspace-4.11.9.tar.xz 13536252 SHA256 aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf SHA512 9f4292144981a94ccd9cfcd9a70ce673c3212c9962cce049668b15b86c5a037dfe0a4b0acfa4ad0c4c2902ded2b17521cbcff7e2411af7efb4c05af5b9465c81 WHIRLPOOL 26327aaee0ac92a6d8f9d9981b1f1cd4d2090d1124a7435301c55287228b57dba1f50814753abb468080787514ed19a60099ede0764d1bc09e76d948f1360879
 EBUILD ksmserver-4.11.9.ebuild 801 SHA256 94d7b7a77302af6a7e6e66d2fa0628565a8bfab99d7cbef3e8ceb9aa3b513cca SHA512 919af44a70a2ab54cecf0a421ad8b2fb5f8e657a3796437c39f3efcfe4a63a9fe6d2e95629f340081e5268e42b0148543e06f923c07991d9639949deba48275b WHIRLPOOL 640955b8a1c208af63365eecb20713d66ea054073949f3d812ba68428eb3dcdb2a45b9e1d61f5ed97234c3e00f6c45fa6f474ea1e2d30e2eaf53eef41476c1fa
-MISC ChangeLog 38490 SHA256 cc4963054206f0c6668e952003bd358c88ef76c4c85b4a06f834ee8fce71c4db SHA512 a49e83b32bf5b6d33d8a5dff32f1fe19c46c7db34513229f937cdb413a79e106ca3930709712696f52e7541ccdbcc61405761b4cab78fc28fa602171c3df5ec4 WHIRLPOOL bb0c233c8614970b543b0822b82ebda7958ee32acb8e1a24f768fd16814775722d1a627e9a88aaffa948c1595477d05effb2e38688d54b2b767dda7d9bdda4f5
+MISC ChangeLog 38659 SHA256 983d89e8d237234708cca925e29aba4a4c40b4d460fb5aa09a6e696075bc0e3f SHA512 ecd7f1aeb94502bfd1bda76ccc558cb8e53d41304720dc189a5b2fb520588269881958895461edfacdd6e7906ebe69d321122359ce63e5ff8af007ba5981c765 WHIRLPOOL a6f1b64e339a03bad656be896eddf7b46d5e857c8f365406a56fcaa609373c1adc035d4189a4c9bd8c504c6d2e20c56cc246313cd6a10a2afd83a63fad31a247
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTa110AAoJELp701BxlEWfQKQP/iElRcgGBBBIuZgkb6dAwtm1
-hKNkd9kKq9k9Fza03FRLmKU7FKJL6OXZv98yckNbS8MW5pjDtTo+n0AqbtFNOeLe
-/d1HDP19uHFiPqTe8gnW0QzctL7M3QKZcpgKx0jpTnKvRhMiniCK4Fx9wYYtwg9J
-06oOP/hXZvZQAw8X/qPAr44A2PL6os/v0k2icD7ZN6aumsP7Bznsx4OkTNwWd0GY
-IKjy6SKylwxCi04tOvwKSLjhcH5F8FrGfF+0wd+6d+UzJ5OOMrhj0vqJpuea0aom
-5owndCs6a2DZNOUWFLY+aRcGIU+GSA0YY1r77vzNbsAoeYZ3DoExXTY19+8FeJN8
-ZDBW3DNm1NLluSG0zHQMfktqucc6vLaPZ4/AvG3HoU38qtnhUIbGUpVXeXXM9RB7
-jrQytQlTGrrNT1CGFyRHs1g57VrfuL3oKAGU/qx0okVEFyDX5yeQWyFPVLLRKruM
-JrUnfWHgBOrZea3QLVTJXy799a7mWBRr80H7QeqB+jKL53SzR7qeAWGTtpk3dcxZ
-2GhdNf5mkZkZb8kPRkpe/ZRH0DbYLtcpyuyUf7ypquaOwV/QGDkU4P8Q5X/Dbx99
-VPWkIybjHiBGEWee674qUxFqQrJOVC/4+CDs46BB6plPBBW/N0Vh44voq9oVpQ5X
-uH72D6L57BS211uzDbzV
-=Ujuf
+iQIcBAEBCAAGBQJTa/S4AAoJEGVpnaTzz9K9DTIQAJwP9jewEg5Veo9tEHrKlAE6
+qjyzN1FW//rWjDPnC5RkOta+zT8mNXwEf+m6XNore7EezHNcXy21BJOHm0VshhP1
+dEOSONVvDuIndXana72vezQwnrUMAygzidd4uwZ7x2X+xA9Mu/H5FF7wszsx7FtM
+vXwuaoGc7WLUdpdPIwSG3+joipn27DDC9Y9H4qlVUPe+kw5WFDOu6gaRm7R3jiYd
+fj/abOdIt1HYg2FMxf77SRaVZzYt8EktCzFK6Z5Smziyt1gNBxP9ToGHfHPcS8aj
+xB5u4PIw1QAot/1f3MBJfwHyZKKpbKWNhE2Lksq3LXbPESSZMnweZosv2XCAYcwm
+qDC2gmwbJ4Tu6KmzBjSWTWZG0yh+ZWHgCayDcLppsUOQD9OGXVu4BYCQEazVUuce
+v6dse1UGXPazPFm+CULTBUoyCDLOKCr/z75jaH8BXNTRoAkE1xpMNvYTuWVsAcGM
+sw0mcznj9b+7VeDis+d49eOMDl08TpbLWGFaC+z4z8RVz/QBoz/Naijx+jQze4gn
+IIkupZJB+8vSsQtGRQZ9jeAwTvPmpEMikzputgxOpdrPVCultnwUUTVRcWYb+aF6
+gYBuoP58elBVqYWN74Eute/iew9PXzfznd7xonQxvNG1PFPWWo9FWrmXNpHxG/1n
+SisuOPhJkWxyDzLTCGeN
+=jbTe
 -----END PGP SIGNATURE-----
diff --git a/kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch b/kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch
deleted file mode 100644
index 4e3753ad09b0..000000000000
--- a/kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp
-index f0526cf..feb3c8e 100644
---- a/ksmserver/screenlocker/ksldapp.cpp
-+++ b/ksmserver/screenlocker/ksldapp.cpp
-@@ -278,12 +278,12 @@ void KSldApp::lockProcessReady()
- 
- bool KSldApp::startLockProcess()
- {
--    if (m_plasmaEnabled) {
--        m_lockProcess->start(KStandardDirs::findExe(QLatin1String("plasma-overlay")),
--                             QStringList() << QLatin1String("--nofork"));
--    } else {
-+//    if (m_plasmaEnabled) {
-+//        m_lockProcess->start(KStandardDirs::findExe(QLatin1String("plasma-overlay")),
-+//                             QStringList() << QLatin1String("--nofork"));
-+//    } else {
-         m_lockProcess->start(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet")));
--    }
-+//    }
-     // we wait one minute
-     if (!m_lockProcess->waitForStarted(60000)) {
-         m_lockProcess->kill();
diff --git a/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch b/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch
deleted file mode 100644
index e41d58bbe693..000000000000
--- a/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp
-index 6490145..2403b45 100644
---- a/ksmserver/screenlocker/ksldapp.cpp
-+++ b/ksmserver/screenlocker/ksldapp.cpp
-@@ -286,16 +286,11 @@ void KSldApp::lockProcessReady()
- 
- bool KSldApp::startLockProcess(bool immediateLock)
- {
--    if (m_plasmaEnabled) {
--        m_lockProcess->start(KStandardDirs::findExe(QLatin1String("plasma-overlay")),
--                             QStringList() << QLatin1String("--nofork"));
--    } else {
-         QStringList args;
-         if (immediateLock) {
-             args << "--immediateLock";
-         }
-         m_lockProcess->start(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet")), args);
--    }
-     // we wait one minute
-     if (!m_lockProcess->waitForStarted(60000)) {
-         m_lockProcess->kill();