diff options
| author |   Matteo Azzali <mattepiu@gentoo.org> | 2006-06-09 21:34:04 +0000 |
|---|---|---|
| committer | Matteo Azzali <mattepiu@gentoo.org> | 2006-06-09 21:34:04 +0000 |
| commit | 57751a513dae8852d4ff0203bcbb12aed291d4f4 (patch) | |
| tree | 9faaeab8ad32d0bfb8d3e1302c3619cae6c7f7a6 /net-im | |
| parent | add patch to fix segfault (diff) | |
| download | gentoo-2-57751a513dae8852d4ff0203bcbb12aed291d4f4.tar.gz gentoo-2-57751a513dae8852d4ff0203bcbb12aed291d4f4.tar.bz2 gentoo-2-57751a513dae8852d4ff0203bcbb12aed291d4f4.zip | |
patched for bug #136167 , with maintainer permission
(Portage version: 2.1_rc4-r5)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/kopete/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/kopete/files/kopete-0.12-away.diff | 30 | ||||
| -rw-r--r-- | net-im/kopete/kopete-0.12.0.ebuild | 3 |
3 files changed, 37 insertions, 2 deletions
diff --git a/net-im/kopete/ChangeLog b/net-im/kopete/ChangeLog index 440e150f93b4..8fd5fe761d22 100644 --- a/net-im/kopete/ChangeLog +++ b/net-im/kopete/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/kopete # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.61 2006/06/07 20:46:07 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.62 2006/06/09 21:34:04 mattepiu Exp $ + + 09 Jun 2006; Matteo Azzali <mattepiu@gentoo.org> + +files/kopete-0.12-away.diff, kopete-0.12.0.ebuild: + patched for bug #136167 , with Flameeyes permission 07 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-0.12.0.ebuild: Add missing slp flag to IUSE. Thanks to Jakub Moc in bug #135988. diff --git a/net-im/kopete/files/kopete-0.12-away.diff b/net-im/kopete/files/kopete-0.12-away.diff new file mode 100644 index 000000000000..30df5084542f --- /dev/null +++ b/net-im/kopete/files/kopete-0.12-away.diff @@ -0,0 +1,30 @@ +--- kopete/libkopete/kopeteaway.cpp.orig 2006-05-31 02:24:05.000000000 +0200 ++++ kopete/libkopete/kopeteaway.cpp 2006-06-09 21:40:45.000000000 +0200 +@@ -198,6 +198,8 @@ + + Kopete::Away::~Away() + { ++ if(this == instance) ++ instance = 0L; + delete d; + } + +@@ -325,8 +327,17 @@ + // activity while locked never matters (if there is any, it's probably just + // the cleaner wiping the keyboard :). + ++ ++ /* we should be able to respond to KDesktop queries to avoid a deadlock, so we allow the event loop to be called */ ++ static bool rentrency_protection=false; ++ if(rentrency_protection) ++ return; ++ rentrency_protection=true; + DCOPRef screenSaver("kdesktop", "KScreensaverIface"); +- DCOPReply isBlanked = screenSaver.call("isBlanked"); ++ DCOPReply isBlanked = screenSaver.callExt("isBlanked" , DCOPRef::UseEventLoop, 10); ++ rentrency_protection=false; ++ if(!instance) //this may have been deleted in the event loop ++ return; + if (!(isBlanked.isValid() && isBlanked.type == "bool" && ((bool)isBlanked))) + { + // DCOP failed, or returned something odd, or the screensaver is diff --git a/net-im/kopete/kopete-0.12.0.ebuild b/net-im/kopete/kopete-0.12.0.ebuild index 110cf9f73676..fc9d21ff0d23 100644 --- a/net-im/kopete/kopete-0.12.0.ebuild +++ b/net-im/kopete/kopete-0.12.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12.0.ebuild,v 1.4 2006/06/07 20:46:07 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12.0.ebuild,v 1.5 2006/06/09 21:34:04 mattepiu Exp $ inherit kde eutils @@ -62,6 +62,7 @@ need-kde 3.4 src_unpack() { kde_src_unpack epatch "${FILESDIR}/${PN}-0.12_alpha1-xscreensaver.patch" + epatch "${FILESDIR}/${PN}-0.12-away.diff" rm -f ${S}/configure } |