diff options
| -rw-r--r-- | kde-base/krunner/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/krunner/files/krunner-4.4.0_lock_dialog_crash.patch | 51 | ||||
| -rw-r--r-- | kde-base/krunner/krunner-4.4.0-r1.ebuild | 56 |
3 files changed, 110 insertions, 0 deletions
diff --git a/kde-base/krunner/Manifest b/kde-base/krunner/Manifest index 6c7b23c848c..904576e565a 100644 --- a/kde-base/krunner/Manifest +++ b/kde-base/krunner/Manifest @@ -1,3 +1,6 @@ +AUX krunner-4.4.0_lock_dialog_crash.patch 1348 RMD160 b540e35a3abac3e60acdf5db60ecbebaeadeb6d3 SHA1 586181bb85ea8f44454080dc399cc98d46e44c2d SHA256 a79972c4d1835a35e7b901ee3e00782d172bc98dd7b1b02e4dbfb2635c02d19b +DIST kdebase-workspace-4.4.0.tar.bz2 76893149 RMD160 e93e0517d944add5711768141da38c43ca1bca59 SHA1 86f8046f8fa3a4b53389353217cf8da8941a1d9c SHA256 16a6f32d7a3da48ac7a3a72653505ff221b2e79809d705e4666e9d842f232c9b +EBUILD krunner-4.4.0-r1.ebuild 1191 RMD160 396aa11c09ce6184f91927954993c7497ec6d668 SHA1 2baf288d2eb273d29b2e86530f878912954b782d SHA256 e030c97d4f1a829b281f0be3cef4c544f0a7da0c16c4ca7a851c6602349be775 EBUILD krunner-4.4.9999.ebuild 958 RMD160 ee9ee2c2372c865353f086b27969c65d48e34cce SHA1 ea3ef2e236e101d77877ec45560a6d3b788d0fe1 SHA256 2312a6ee87099f990f0526ab91492828bdc53af6679de56f1ef7c5866be1223c EBUILD krunner-9999.ebuild 958 RMD160 ee9ee2c2372c865353f086b27969c65d48e34cce SHA1 ea3ef2e236e101d77877ec45560a6d3b788d0fe1 SHA256 2312a6ee87099f990f0526ab91492828bdc53af6679de56f1ef7c5866be1223c MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a 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 00000000000..27c46b007f5 --- /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 00000000000..559c9d69f61 --- /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.ebuild,v 1.1 2010/02/09 00:20:23 alexxy 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 +} |