Fixes bug #148384.

(Portage version: 2.1.1)

4 files changed, 60 insertions, 1 deletions

diff --git a/kde-base/kwalletmanager/ChangeLog b/kde-base/kwalletmanager/ChangeLog
index 129c459dad08..37358d668052 100644
--- a/kde-base/kwalletmanager/ChangeLog
+++ b/kde-base/kwalletmanager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kwalletmanager
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/ChangeLog,v 1.50 2006/09/17 22:53:00 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/ChangeLog,v 1.51 2006/09/26 22:54:39 deathwing00 Exp $
+
+*kwalletmanager-3.5.4-r2 (26 Sep 2006)
+
+  26 Sep 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/kwalletmanager-3.5.4-systray-fix.patch,
+  +kwalletmanager-3.5.4-r2.ebuild:
+  Fixes bug #148384. Now it shows correctly in systray. Thanks to Paolo
+  Pedroni for reporting it.
 
   17 Sep 2006; Carsten Lohrke <carlo@gentoo.org>
   -kwalletmanager-3.4.3.ebuild:
diff --git a/kde-base/kwalletmanager/files/digest-kwalletmanager-3.5.4-r2 b/kde-base/kwalletmanager/files/digest-kwalletmanager-3.5.4-r2
new file mode 100644
index 000000000000..57a4f3199467
--- /dev/null
+++ b/kde-base/kwalletmanager/files/digest-kwalletmanager-3.5.4-r2
@@ -0,0 +1,6 @@
+MD5 548aa1b3b2d0260d2617a575e5b023a3 kdeutils-3.5-patchset-01.tar.bz2 2746
+RMD160 e452bd68da2a58df5a796c325915745631d64a0e kdeutils-3.5-patchset-01.tar.bz2 2746
+SHA256 271b4a355c17cbe010aa49799c78773773e14065a15afdd3654b0a5e7eba6892 kdeutils-3.5-patchset-01.tar.bz2 2746
+MD5 e24cd91576db3d2414fb30cab47e44e5 kdeutils-3.5.4.tar.bz2 2981597
+RMD160 56264e29a9a9b7074352d7a7cc582536e2959498 kdeutils-3.5.4.tar.bz2 2981597
+SHA256 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da kdeutils-3.5.4.tar.bz2 2981597
diff --git a/kde-base/kwalletmanager/files/kwalletmanager-3.5.4-systray-fix.patch b/kde-base/kwalletmanager/files/kwalletmanager-3.5.4-systray-fix.patch
new file mode 100644
index 000000000000..b8f6f0185103
--- /dev/null
+++ b/kde-base/kwalletmanager/files/kwalletmanager-3.5.4-systray-fix.patch
@@ -0,0 +1,24 @@
+diff -U 4 -H -b -w -B -E -d -i -r kwalletmanager-3.5.4-orig/kwallet/kwalletmanager.cpp kwalletmanager-3.5.4/kwallet/kwalletmanager.cpp
+--- kwalletmanager-3.5.4-orig/kwallet/kwalletmanager.cpp	2006-09-27 00:38:20.000000000 +0200
++++ kwalletmanager-3.5.4/kwallet/kwalletmanager.cpp	2006-09-27 00:39:40.000000000 +0200
+@@ -42,8 +42,9 @@
+ #include <qaccel.h>
+ #include <qguardedptr.h>
+ #include <qptrstack.h>
+ #include <qregexp.h>
++#include <qtimer.h>
+ #include <qtooltip.h>
+ 
+ KWalletManager::KWalletManager(QWidget *parent, const char *name, WFlags f)
+ : KMainWindow(parent, name, f), DCOPObject("KWalletManager") {
+@@ -74,9 +75,9 @@
+ 		}
+ 		if (!isOpen && kapp->isRestored()) {
+ 			delete _tray;
+ 			_tray = 0L;
+-			kapp->exit();
++			QTimer::singleShot( 0, kapp, SLOT( quit()));
+ 			return;
+ 		}
+ 	} else {
+ 		_tray = 0L;
diff --git a/kde-base/kwalletmanager/kwalletmanager-3.5.4-r2.ebuild b/kde-base/kwalletmanager/kwalletmanager-3.5.4-r2.ebuild
new file mode 100644
index 000000000000..354892297876
--- /dev/null
+++ b/kde-base/kwalletmanager/kwalletmanager-3.5.4-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/kwalletmanager-3.5.4-r2.ebuild,v 1.1 2006/09/26 22:54:39 deathwing00 Exp $
+
+KMNAME=kdeutils
+KMMODULE=kwallet
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdeutils-3.5-patchset-01.tar.bz2"
+
+DESCRIPTION="KDE Wallet Management Tool"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	kde-meta_src_unpack
+	epatch "${FILESDIR}/${P}-systray-fix.patch"
+}