Add panelview crash fix per bug #261460.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 36 insertions, 14 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index b0a0fb14a9a1..3d693ce8df94 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.10 2009/03/04 22:52:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.11 2009/03/08 19:37:47 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/4.2.1-panelview-crash-fix.patch, plasma-workspace-4.2.1.ebuild:
+  Add panelview crash fix per bug #261460.
 
 *plasma-workspace-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 53eb517dac24..90911ea9c9fa 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 4.2.1-panelview-crash-fix.patch 948 RMD160 d067f0fa21a18623718e79fbdac4addf7895c352 SHA1 118dbf669243290c06464d957e98a356f093f9eb SHA256 2a7f11c47c6b9b5da6760ff6ef0de5cd8625c0c2e61cd685a2cb9cd472609a5e
 DIST kdebase-workspace-4.2.0.tar.bz2 50724381 RMD160 752e727aaf0010e362f3c77190584fa8c6bd4761 SHA1 351eae9401ac6fb990950d1a5120505475abef05 SHA256 e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b
 DIST kdebase-workspace-4.2.1.tar.bz2 50777207 RMD160 fe1debd87fb62c652925f6709905d0cf416b39c4 SHA1 412b8a6778d5c71a366c054b0136edae309bbef0 SHA256 fa8165cb1c64046c4a659cd69962cda79093453f72bf4fb6df869a34dfb87f98
 EBUILD plasma-workspace-4.2.0.ebuild 2378 RMD160 b6a687605cdf899397f6c36ceaf0d0f410c66c0e SHA1 e2fcebe79cc65104958e05af833cb712c860d9c7 SHA256 90e5bae148274e775f0593b2207956aa6c6a4434f9fb77eb3dde01bc76d506f1
-EBUILD plasma-workspace-4.2.1.ebuild 2362 RMD160 c5338cd4c0525a4ea0250e0870a53c9510834820 SHA1 5a4f11204caead29b23fb3e3e86915eaa6851b60 SHA256 67745d15b718bccde3bfd3539005f0d60e689c71897be2cca00d3472882eee1f
-MISC ChangeLog 1643 RMD160 973330e5973084350a5eee87e5d082c1a86d9dc8 SHA1 1501445a3266e0d7d3ae0ab3a9431399f967d3d6 SHA256 ffcb488ce48172a1c5d61dcd5a2ba1ed4becc195fe99c67c8526b3d17d543e93
+EBUILD plasma-workspace-4.2.1.ebuild 2424 RMD160 d4d567434a8d148798aed6ebcee846e6a159961b SHA1 7630234a1735729e13114e0741a54c5089afb4a8 SHA256 7f68417fc645e32d9cce642113954d6f3d9c292983b5fd1c7b3645a6d19d4402
+MISC ChangeLog 1815 RMD160 a6e7f15bb92862f64f0a6f36ade5dd7bf8133c47 SHA1 9b1b2e8e1de7146ac788f668b9e5db006d59dbdc SHA256 fdd3192c93f54efca872fd0ac2ef08b0a10247360038cbec10c9a7afff785af0
 MISC metadata.xml 232 RMD160 d028fb8b7f2b679b9b9ca34425e9e486613d1214 SHA1 0e593316c91dbc1ebf44fce61ab06fae59e31179 SHA256 56df5d6c9a58e369ad080bca94c3790fbd7d0f83fe90e29eec1e58266e10af8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkmvBjsACgkQ5BmOA85PVLjzfACfXSF0mRvRxvM0c7UPj3R09/fq
-DjgAoJR502gQNOIgWpYwLUNZPLr7ray9
-=w2cq
------END PGP SIGNATURE-----
diff --git a/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch b/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch
new file mode 100644
index 000000000000..d14715684dea
--- /dev/null
+++ b/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch
@@ -0,0 +1,25 @@
+--- a/kdebase/workspace/plasma/shells/desktop/panelview.cpp	2009/02/24 04:51:03	930724
++++ b/kdebase/workspace/plasma/shells/desktop/panelview.cpp	2009/03/03 23:39:55	934863
+@@ -203,6 +203,11 @@
+       m_triggerEntered(false)
+ {
+     Q_ASSERT(qobject_cast<Plasma::Corona*>(panel->scene()));
++
++    m_strutsTimer = new QTimer(this);
++    m_strutsTimer->setSingleShot(true);
++    connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts()));
++
+     if (panel) {
+         connect(panel, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted()));
+         connect(panel, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController()));
+@@ -248,10 +253,6 @@
+     KWindowSystem::setOnAllDesktops(winId(), true);
+ 
+     QTimer::singleShot(0, this, SLOT(init()));
+-
+-    m_strutsTimer = new QTimer(this);
+-    m_strutsTimer->setSingleShot(true);
+-    connect(m_strutsTimer,SIGNAL(timeout()),this,SLOT(updateStruts()));
+ }
+ 
+ PanelView::~PanelView()
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.1.ebuild
index 5ae7fb8c3777..e75f039d8d0e 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.2.1.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.2.1.ebuild,v 1.1 2009/03/04 22:52:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.2.1.ebuild,v 1.2 2009/03/08 19:37:47 scarabeus Exp $
 
 EAPI="2"
 
@@ -57,6 +57,8 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager"
 
+PATCHES=( "${FILESDIR}/4.2.1-panelview-crash-fix.patch" )
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with google-gadgets Googlegadgets)