summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2010-02-12 18:56:49 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2010-02-12 18:56:49 +0000
commit91d1b7eeff3ec549a94b279bc850333914579b5f (patch)
treee59d2967f072d5a7559c0988504f167cf7433c42 /kde-base/krunner
parentMasked app-emulation/mol. (diff)
downloadgentoo-2-91d1b7eeff3ec549a94b279bc850333914579b5f.tar.gz
gentoo-2-91d1b7eeff3ec549a94b279bc850333914579b5f.tar.bz2
gentoo-2-91d1b7eeff3ec549a94b279bc850333914579b5f.zip
Copied Alex (wired) ebuild from the kde overlay.
Thanks to Jeff Mitchell (jefferai) for the patch. [kde-base/krunner-4.4.0-r1] fixed lock dialog crash - b.k.o #217882 (Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/krunner')
-rw-r--r--kde-base/krunner/ChangeLog10
-rw-r--r--kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch51
-rw-r--r--kde-base/krunner/krunner-4.4.0-r1.ebuild56
3 files changed, 116 insertions, 1 deletions
diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog
index f95535866c68..80d45dc7d5dd 100644
--- a/kde-base/krunner/ChangeLog
+++ b/kde-base/krunner/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for kde-base/krunner
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.57 2010/02/09 00:20:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.58 2010/02/12 18:56:48 jmbsvicetto Exp $
+
+*krunner-4.4.0-r1 (12 Feb 2010)
+
+ 12 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ +krunner-4.4.0-r1.ebuild, +files/krunner-4.4.0_lock_dialog_crash.patch:
+ Copied Alex (wired) ebuild from the kde overlay.
+ Thanks to Jeff Mitchell (jefferai) for the patch.
+ [kde-base/krunner-4.4.0-r1] fixed lock dialog crash - b.k.o #217882
*krunner-4.4.0 (08 Feb 2010)
diff --git a/kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch b/kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch
new file mode 100644
index 000000000000..27c46b007f5d
--- /dev/null
+++ b/kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch
@@ -0,0 +1,51 @@
+--- trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.cc 2010/02/12 17:50:14 1089212
++++ trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.cc 2010/02/12 17:51:21 1089213
+@@ -85,7 +85,8 @@
+ : KDialog(parent, Qt::X11BypassWindowManagerHint),
+ mPlugin( plugin ),
+ mCapsLocked(-1),
+- mUnlockingFailed(false)
++ mUnlockingFailed(false),
++ sNot(0)
+ {
+ QWidget* w = mainWidget();
+
+@@ -435,6 +436,8 @@
+ //
+ void PasswordDlg::gplugStart()
+ {
++ if (sNot)
++ return;
+ int sfd[2];
+ char fdbuf[16];
+
+@@ -465,6 +468,7 @@
+ sFd = sfd[0];
+ sNot = new QSocketNotifier(sFd, QSocketNotifier::Read, this);
+ connect(sNot, SIGNAL(activated(int)), SLOT(handleVerify()));
++ connect(sNot, SIGNAL(destroyed()), SLOT(slotNotifierDestroyed()));
+ }
+
+ void PasswordDlg::gplugChanged()
+@@ -651,6 +655,11 @@
+ KDisplayManager().switchVT( itm->vt );
+ }
+
++void PasswordDlg::slotNotifierDestroyed()
++{
++ sNot = 0;
++}
++
+ void PasswordDlg::capsLocked()
+ {
+ unsigned int lmask;
+--- trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.h 2010/02/12 17:50:14 1089212
++++ trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.h 2010/02/12 17:51:21 1089213
+@@ -63,6 +63,7 @@
+ void slotOK();
+ void slotActivity();
+ void handleVerify();
++ void slotNotifierDestroyed();
+
+ private:
+ void capsLocked();
diff --git a/kde-base/krunner/krunner-4.4.0-r1.ebuild b/kde-base/krunner/krunner-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..41e6b7e825bd
--- /dev/null
+++ b/kde-base/krunner/krunner-4.4.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.4.0-r1.ebuild,v 1.1 2010/02/12 18:56:48 jmbsvicetto Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE Command Runner"
+IUSE="debug"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+COMMONDEPEND="
+ $(add_kdebase_dep kephal)
+ $(add_kdebase_dep ksmserver)
+ $(add_kdebase_dep ksysguard)
+ $(add_kdebase_dep libkworkspace)
+ !aqua? (
+ x11-libs/libXxf86misc
+ x11-libs/libXcursor
+ x11-libs/libXScrnSaver
+ )
+"
+DEPEND="${COMMONDEPEND}
+ !aqua? (
+ x11-libs/libXcursor
+ x11-proto/xf86miscproto
+ x11-proto/scrnsaverproto
+ )
+"
+RDEPEND="${COMMONDEPEND}"
+
+KMEXTRACTONLY="
+ libs/kdm/
+ libs/ksysguard/
+ libs/kworkspace/
+ kcontrol/
+ ksysguard/
+ ksmserver/org.kde.KSMServerInterface.xml
+ plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
+ kcheckpass/
+"
+
+KMLOADLIBS="libkworkspace"
+
+PATCHES=( "${FILESDIR}/${P}_lock_dialog_crash.patch" )
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_with opengl OpenGL)
+ )
+
+ kde4-meta_src_configure
+}