Added an upstream patch (thanks, Eike, for providing it only *minutes* after the report) to avoid a crash if konsole is not installed. Fixes bug 189057.

(Portage version: 2.1.3.5)

4 files changed, 111 insertions, 1 deletions

diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index 2e0f5c049421..d5cc7eeba0b7 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/konversation
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.54 2007/06/27 12:17:46 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.55 2007/08/16 16:20:19 philantrop Exp $
+
+*konversation-1.0.1-r2 (16 Aug 2007)
+
+  16 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/konversation-1.0.1-konsolepanel.patch,
+  +konversation-1.0.1-r2.ebuild:
+  Added an upstream patch (thanks, Eike, for providing it only *minutes* after
+  the report) to avoid a crash if konsole is not installed. Fixes bug 189057.
 
   27 Jun 2007; Lars Weiler <pylon@gentoo.org> konversation-1.0.1-r1.ebuild:
   Stable on ppc; bug #182589.
diff --git a/net-irc/konversation/files/digest-konversation-1.0.1-r2 b/net-irc/konversation/files/digest-konversation-1.0.1-r2
new file mode 100644
index 000000000000..f5304937b259
--- /dev/null
+++ b/net-irc/konversation/files/digest-konversation-1.0.1-r2
@@ -0,0 +1,3 @@
+MD5 60c2c5f94d4a916055db09728304b19f konversation-1.0.1.tar.bz2 5848563
+RMD160 1cf79a87f451aa2718560f00ddf987b68938310a konversation-1.0.1.tar.bz2 5848563
+SHA256 8be736289c52c21fe5ada7dd153767abd5155424a510ab9781b9d2f585cc00fd konversation-1.0.1.tar.bz2 5848563
diff --git a/net-irc/konversation/files/konversation-1.0.1-konsolepanel.patch b/net-irc/konversation/files/konversation-1.0.1-konsolepanel.patch
new file mode 100644
index 000000000000..42f08c19ca5e
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.0.1-konsolepanel.patch
@@ -0,0 +1,63 @@
+--- /var/tmp/portage/net-irc/konversation-1.0.1-r2/work/konversation-1.0.1/konversation/src/konsolepanel.h	2006-10-06 18:43:29.000000000 +0200
++++ konversation/src/konsolepanel.h	2007-08-16 16:25:09.000000000 +0200
+@@ -13,8 +13,10 @@
+ #define KONSOLE_PANEL_H
+ 
+ #include "chatwindow.h"
++
+ #include <kparts/part.h>
+ 
++
+ class KonsolePanel : public ChatWindow
+ {
+     Q_OBJECT
+@@ -25,6 +27,8 @@
+ 
+         virtual void setName(const QString& newName) { ChatWindow::setName(newName); }
+ 
++        QWidget* getWidget();
++
+     signals:
+         void closeView(ChatWindow* view);
+ 
+--- /var/tmp/portage/net-irc/konversation-1.0.1-r2/work/konversation-1.0.1/konversation/src/konsolepanel.cpp	2006-10-06 18:43:29.000000000 +0200
++++ konversation/src/konsolepanel.cpp	2007-08-16 16:25:09.000000000 +0200
+@@ -9,15 +9,16 @@
+   Copyright (C) 2003 Mickael Marchand <marchand@kde.org>
+ */
+ 
++#include "konsolepanel.h"
++#include "common.h"
++#include "viewcontainer.h"
++
+ #include <kdebug.h>
+ #include <klibloader.h>
+ #include <klocale.h>
+ 
+-#include "konsolepanel.h"
+-#include "common.h"
+-#include "viewcontainer.h"
+ 
+-KonsolePanel::KonsolePanel(QWidget *p) : ChatWindow( p )
++KonsolePanel::KonsolePanel(QWidget *p) : ChatWindow( p ), k_part (0)
+ {
+     setName(i18n("Konsole"));
+     setType(ChatWindow::Konsole);
+@@ -46,8 +47,17 @@
+     }
+ }
+ 
++QWidget* KonsolePanel::getWidget()
++{
++    if (k_part)
++        return k_part->widget();
++    else
++        return 0;
++}
++
+ void KonsolePanel::childAdjustFocus()
+ {
++    if (k_part) k_part->widget()->setFocus();
+ }
+ 
+ void KonsolePanel::partDestroyed()
diff --git a/net-irc/konversation/konversation-1.0.1-r2.ebuild b/net-irc/konversation/konversation-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..da4a70176140
--- /dev/null
+++ b/net-irc/konversation/konversation-1.0.1-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.0.1-r2.ebuild,v 1.1 2007/08/16 16:20:19 philantrop Exp $
+
+LANGS="bg ca da de el en_GB es et fi fr hu it ja ka ko nl pt ru sr sr@Latn sv tr zh_TW
+	ar cs gl he lt pa pt_BR ta"
+LANGS_DOC="da es et it nl pt ru sv"
+
+USE_KEG_PACKAGING=1
+
+inherit kde
+
+DESCRIPTION="A user friendly IRC Client for KDE3.x"
+HOMEPAGE="http://konversation.kde.org/"
+SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+need-kde 3
+
+PATCHES="${FILESDIR}/${P}-crash.patch
+		${FILESDIR}/${P}-konsolepanel.patch"
+
+pkg_postinst() {
+	kde_pkg_postinst
+
+	if ! has_version kde-base/konsole && ! has_version kde-base/kdebase; then
+		echo
+		elog "If you want to be able to use Konsole from inside ${PN}, please emerge either"
+		elog "kde-base/konsole or kde-base/kdebase."
+		echo
+	fi
+}