Added fix for crash on logout/reboot/shutdown. Thanks lxnay and aseigo. Sleep is overrated.

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 52 insertions, 4 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 2b424fe42e37..ea6c75d9046c 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.716 2011/01/26 20:28:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.717 2011/02/02 02:11:33 dilfridge Exp $
+
+  02 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdelibs-4.6.0.ebuild, +files/kdelibs-4.6.0-logoutcrash.patch:
+  Added fix for crash on logout/reboot/shutdown. Thanks lxnay and aseigo.
 
 *kdelibs-4.6.0 (26 Jan 2011)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 7b7dfffcfb8d..4a7c614259a8 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
 AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 RMD160 aa41988215dc8ede62c5f1e685eb24d597c1ec46 SHA1 b715c25a4bbfbaafaba2275057071efbb187523c SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9
 AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
@@ -19,6 +22,7 @@ AUX kdelibs-4.5.2-open-https.patch 436 RMD160 4c4e45df7758d04f93e38071f3fc9839d4
 AUX kdelibs-4.5.73-module-suffix.patch 4098 RMD160 e003fcb8a496bcbc1c77f16a1e4ab81d735e9567 SHA1 1e15b7e24cbe41bc3f492b8e862fbd7da7f03212 SHA256 7e4116bf0f475b9ec4a6000830f28e0dcded039f58c2cb73c49c295ef276afd9
 AUX kdelibs-4.5.74-klauncher_mac.patch 952 RMD160 666491525d51ca24c9b4228d97aa368ebd9b2eb8 SHA1 6a0ccd169f910842d27d1cc16f4f0f3e7c671de6 SHA256 8477a100f6c73ced8a8be06ac9025d83434fa6396daea8f86df85d7a3fb6fe84
 AUX kdelibs-4.5.90-mimetypes.patch 1629 RMD160 46289674dd977b2b2289ba935d88c1b0c9de5916 SHA1 78c70127486231e24f464f5cce978e06293510e5 SHA256 0276732204ba9b7a9f119ce26a2b992b1d23c321606efc1a6957914329f33109
+AUX kdelibs-4.6.0-logoutcrash.patch 769 RMD160 999f0adf323e0adbe6359c0533bfc8f7bd1b5a9f SHA1 270f24d9682c32c9f69b3e6e13696888724c5169 SHA256 0eb003283c6956c989bece7ff64a4e099b291916e674e6947a582b6a32fc2c46
 DIST kdelibs-4.4.5.tar.bz2 14088335 RMD160 533a627116524d5365ba45f5eb17c972426f59c1 SHA1 73e37abee48536b85782d1a17f1b282313b16c4d SHA256 11d79203e70ba104bf5414cb2a4e8919793ffb5b201592f28fc8ae325c8c6085
 DIST kdelibs-4.5.5.tar.bz2 13876521 RMD160 7c33afa12379119fbf7d70e8895c3f2ada9a2eba SHA1 127a2b50fe31ff345e05660dd50f7c55ae78d854 SHA256 347c6d7034d9cffbb1b5c7d151f13998e64f62906fb6c5064d6eff540db6eaf9
 DIST kdelibs-4.6.0.tar.bz2 12913052 RMD160 acb64c0da9db3381b3f688dc0d5e63422f461459 SHA1 6ea3fc69f98fa91c5159ccd743d4d548e801c7bc SHA256 ed5246fa0c696fe8c857a20677e721872ae9ac147357f7fced9e7f125b6ededd
@@ -26,6 +30,23 @@ EBUILD kdelibs-4.4.5-r1.ebuild 9305 RMD160 3feebd11d22fb86c9bd66fc58caa7f180728f
 EBUILD kdelibs-4.4.5-r2.ebuild 9348 RMD160 ec5b799bf629834e80a2ca905ac822a2090cf98d SHA1 cf69b61305e22c852a71a450124d5ff126c7d429 SHA256 cc33f8d0810f4b5478bbc137e2997deca73e2c5cb8472b75cf670b15586e8539
 EBUILD kdelibs-4.4.5.ebuild 9261 RMD160 c20d3d14b1c96b5b246d522a54a697022365a214 SHA1 6ab566883d3a2e4e8a1d70e9978e2ad0542078f1 SHA256 05f69b920cad81fffebc3e6242dea3a1cc017ae613aa8982d2303144968641b9
 EBUILD kdelibs-4.5.5.ebuild 9310 RMD160 ba1849123405f11822bfd11cfefcb081b03ad781 SHA1 013ee0f9bc1812bc9bfa3aee0a44bd25364ec5c1 SHA256 5d59e3c962eef54d23f50817819186d4038450e8718ae0f5e28c8b3773a0eb3b
-EBUILD kdelibs-4.6.0.ebuild 9501 RMD160 6ae74d103effad399d2a05d8caec2d2c4e182e1a SHA1 8a73f46691c9b02f02227cfb050b567d809fd71d SHA256 64599e1846b1b0a56305bb6e9cf54ba4da05b90dde2a55e8e4f60a4e7798f79b
-MISC ChangeLog 119301 RMD160 6542d7c3e886f5cb60cf055c547261abbbca5d7d SHA1 493e77d79033b7f7e576bc257ea74e5c19b17073 SHA256 998e5c04c103526c7397e852c55615632a333d55eb6d533fe51231db50694caf
+EBUILD kdelibs-4.6.0.ebuild 9549 RMD160 059330f352ec220160a24adb7dc4338dde2cffa1 SHA1 43acf137de13a8272a854c5cb7447af8db04d9e3 SHA256 e8b7deb309078cc8e5904338a3d7c05c040471ff43e4ce02dc8d19a1ebb24a29
+MISC ChangeLog 119500 RMD160 7310efbfb6784a6167425d4655b3c4fc769cc971 SHA1 cbd08fe2b383c3642d9317336ee121d76de8dbf2 SHA256 59b0bf3641ce1ae69617b5992dfc55554cd75159d1b9a9330452f7b4a8a84a1b
 MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNSL0rAAoJENwGBM22xffeM+EP/RaPRlmF3f1fQkyToW//deVB
+p3h2nlf22wHdU2RjhZg/psREoR1SCRNq49kK54oTdVajmAfQqoSvs9do0QzN3V59
+XlS5U4MqVVHrgLkzPVCnEbywHy0tiHM2FpFNvQmsbBRJIZATloHarhoqbWB6KKZP
+VdbJnC3Uwsn3tUivwsgSG56WP90XYX3x1Lt++qNkE2kc3yLNRec4R0U87KB+HZHb
+HwXGJDLfEOWLabz7iWstHWhr8dGJC0NsuNtZ0w7MEsjgt0iFhklk0dQiQteqv5xW
+tX7FQkZOnEEu9Z4v9SpHS0Zu/sMc6WOfqNBqqffyXDnikpS2pt2n5rePuoJS+R0U
+0PKEGREmbtMeL2ch7ZVXSW+LDpuPRWPoIsCkvXCr6IMx2BvFKfOJKLwgELdDk8EG
+wxKfKKHcTKG2qb3+DVK+rf8P2H9tRxZqJq/wf/Q7HT2gswjQcQ0Y9BX0eLCnpjr3
+ZKHAwApCAr4BFoVyJ8/k+pd4pdGoXeGeKbtgc6RltmZZMOnWLJtXSGa7nmxJtQqv
+Ce5BWIw+Fc72nJsfuToQFDZ3ba4yEi+MhbYVJzbAULj4mz/tldtztv0ZMQQDJ5zr
+LqjouNy5DYF1R2Y1Yk+sCK1yNVgwdxC+pPenBdljhJ0umU91yh0jbc2AD9j6ycv6
+MZlgnHc2Okd8OTkh3wWE
+=5hi1
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch b/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch
new file mode 100644
index 000000000000..5fd8d0a5c313
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch
@@ -0,0 +1,22 @@
+commit 709f75ac353cd735ccac31f87363ea90dde345d3
+Author: Marco Martin <notmart@gmail.com>
+Date:   Tue Feb 1 21:15:49 2011 +0100
+
+    don't collapse when it's destroying
+    try to not crash upon deletion of the extender
+
+diff --git a/plasma/extenders/extenderitem.cpp b/plasma/extenders/extenderitem.cpp
+index bdbc886..3e5809f 100644
+--- a/plasma/extenders/extenderitem.cpp
++++ b/plasma/extenders/extenderitem.cpp
+@@ -596,6 +596,10 @@ void ExtenderItem::destroy()
+ 
+ void ExtenderItem::setCollapsed(bool collapsed)
+ {
++    if (extender()->d->destroying) {
++        return;
++    }
++
+     config().writeEntry("isCollapsed", collapsed);
+     d->collapsed = collapsed;
+     d->collapseIcon->setToolTip(collapsed ? i18n("Expand this widget") : i18n("Collapse this widget"));
diff --git a/kde-base/kdelibs/kdelibs-4.6.0.ebuild b/kde-base/kdelibs/kdelibs-4.6.0.ebuild
index d5a4771b7505..77d178912101 100644
--- a/kde-base/kdelibs/kdelibs-4.6.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.0.ebuild,v 1.1 2011/01/26 20:28:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.0.ebuild,v 1.2 2011/02/02 02:11:33 dilfridge Exp $
 
 EAPI="3"
 
@@ -133,6 +133,7 @@ PATCHES=(
 #	"${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above
 	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
 	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.0-logoutcrash.patch"
 )
 
 src_prepare() {