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
commit83c21ef4afbf6a59dbf22319793d45fcdf7906d5 (patch)
treee64695a3146739d3180dd3aae7b0e91283128619 /kde-base
parentMasked app-emulation/mol. (diff)
downloadhistorical-83c21ef4afbf6a59dbf22319793d45fcdf7906d5.tar.gz
historical-83c21ef4afbf6a59dbf22319793d45fcdf7906d5.tar.bz2
historical-83c21ef4afbf6a59dbf22319793d45fcdf7906d5.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 Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/krunner/ChangeLog10
-rw-r--r--kde-base/krunner/Manifest14
-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
4 files changed, 119 insertions, 12 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/Manifest b/kde-base/krunner/Manifest
index 828aaa831372..5dad8f999552 100644
--- a/kde-base/krunner/Manifest
+++ b/kde-base/krunner/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX krunner-4.4.0_lock_dialog_crash.patch 1348 RMD160 b540e35a3abac3e60acdf5db60ecbebaeadeb6d3 SHA1 586181bb85ea8f44454080dc399cc98d46e44c2d SHA256 a79972c4d1835a35e7b901ee3e00782d172bc98dd7b1b02e4dbfb2635c02d19b
DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa SHA1 2839e913cecef8ead0685bd50e9515ccd8bc0a9d SHA256 b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
DIST kdebase-workspace-4.3.4.tar.bz2 62517195 RMD160 665b49b9dd03408ef9ec50e7bd5eb50b993d6138 SHA1 5b43447139d22247d5bc2deee8e3a944447f0bbf SHA256 ea12e04eb402f1257b483b541df5d77b885407bd02992bcb496ccd3335b203c3
DIST kdebase-workspace-4.3.5.tar.bz2 62525359 RMD160 dcf04a40412ba236365423afc877ea0c2066f972 SHA1 703582cb8a3471c5821986dbdfc3c6deedac0ff3 SHA256 7985634ed1f87889bcd6613ef41127196df442017bf895be6fb2afb196ce149b
@@ -8,13 +6,7 @@ DIST kdebase-workspace-4.4.0.tar.bz2 76893149 RMD160 e93e0517d944add5711768141da
EBUILD krunner-4.3.3.ebuild 1079 RMD160 d4fe96259d70406dabfb5e90bc4d8739cd555708 SHA1 18f9d5a035eebb30e712d3ffb91538b8b42d7768 SHA256 0b70dcee7b77d24cdbd9d41a7f749b71ace7553cd776af6ddcf18daeedbf8441
EBUILD krunner-4.3.4.ebuild 1137 RMD160 9421408fcdb0ccb155c0b0daded2499adb4de653 SHA1 8bb30fa1083f2cc81612098643fc04cca1590ef9 SHA256 a24580ad1d3c3dd818fd2de0e73c0f9110eaeafe42854bdd51cd778c5ec94f54
EBUILD krunner-4.3.5.ebuild 1139 RMD160 1d36d18be06cabd7648be7d860a9473ddff2fdb4 SHA1 09c3dbc1dc09f23c6965ae5b63bdf27b62e7c699 SHA256 a0a9da8ae970d52995881fcd3540ef54974263e82c3dd7ca1dc7f377d457d81f
+EBUILD krunner-4.4.0-r1.ebuild 1199 RMD160 eb1999c7d51dd27d955632a1f9e416bc85002bc8 SHA1 b35c4ac9ca9c13533f3bccd31572f5d810839fd3 SHA256 7225547d3f6afca3ca545392ac26968e70bb42ee2e9308998a8fe8c35cf3e246
EBUILD krunner-4.4.0.ebuild 1135 RMD160 4569f0ff665d10275f8d731a08809ee78f18155a SHA1 5db0d46130362a26a785141615fe19ba9bfec7bc SHA256 57b28128bcc0dcf4080f7c65e78474663ab10addf0be015748ed2ecfbe916b25
-MISC ChangeLog 7857 RMD160 869fc0a92789b2c6b379c0102048b3fff67a79b8 SHA1 30cb62e60e96abd3df41ce7743b461d14da84c1f SHA256 f815fa9bf246ec9ac6baeb5ba13d799d0d84b63d28a9e74895402adc93f0ff48
+MISC ChangeLog 8210 RMD160 cef9e3b58531f0fd93bc75019040cc02be3306bb SHA1 ffacdf19cd2da550f9543817a851b0fb8486cd47 SHA256 1e02e782c94a9a076991e5184285aae3378908edb954b8f5f6617a990ece2c67
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktwqk8ACgkQ5BmOA85PVLjpiwCfTLrvhYHn4nP7RVrnRFCDtHcl
-upsAnA6uf/AvaAwaYgK7CoM5cjhJ6FU+
-=mlV7
------END PGP SIGNATURE-----
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
+}