backported kpart fix, http://bugs.kde.org/show_bug.cgi?id=186745

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 84 insertions, 1 deletions

diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index 0de52a34c2f6..d611d5fdb9fe 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.134 2009/09/01 15:46:05 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.135 2009/09/02 17:37:12 wired Exp $
+
+*konsole-4.3.1-r1 (02 Sep 2009)
+
+  02 Sep 2009; Alex Alexander <wired@gentoo.org> +konsole-4.3.1-r1.ebuild,
+  +files/konsole-4.3.1-kpart-backport-fix.patch:
+  backported kpart fix, http://bugs.kde.org/show_bug.cgi?id=186745
 
 *konsole-4.3.1 (01 Sep 2009)
 
diff --git a/kde-base/konsole/files/konsole-4.3.1-kpart-backport-fix.patch b/kde-base/konsole/files/konsole-4.3.1-kpart-backport-fix.patch
new file mode 100644
index 000000000000..5c87ee6a76d6
--- /dev/null
+++ b/kde-base/konsole/files/konsole-4.3.1-kpart-backport-fix.patch
@@ -0,0 +1,49 @@
+diff -ur kdebase-4.3.1-orig/apps/konsole/src/SessionController.cpp kdebase-4.3.1/apps/konsole/src/SessionController.cpp
+--- kdebase-4.3.1-orig/apps/konsole/src/SessionController.cpp	2009-04-28 16:46:08.000000000 +0300
++++ kdebase-4.3.1/apps/konsole/src/SessionController.cpp	2009-09-02 20:16:47.393341281 +0300
+@@ -95,12 +95,10 @@
+     Q_ASSERT( view );
+ 
+     // handle user interface related to session (menus etc.)
+-
+-#ifdef KONSOLE_PART
+-    setXMLFile("konsole/partui.rc");
+-#else
+-    setXMLFile("konsole/sessionui.rc");
+-#endif
++    if (isKonsolePart())
++        setXMLFile("konsole/partui.rc");
++    else
++        setXMLFile("konsole/sessionui.rc");
+ 
+     setupActions();
+     actionCollection()->addAssociatedWidget(view);
+@@ -1041,6 +1039,15 @@
+     }
+ }
+ 
++bool SessionController::isKonsolePart() const
++{
++    // Check to see if we are being called from Konsole or a KPart
++    if (QString(kapp->metaObject()->className()) == "Konsole::Application")
++        return false;
++    else
++        return true;
++}
++
+ SessionTask::SessionTask(QObject* parent)
+     :  QObject(parent)
+     ,  _autoDelete(false)
+diff -ur kdebase-4.3.1-orig/apps/konsole/src/SessionController.h kdebase-4.3.1/apps/konsole/src/SessionController.h
+--- kdebase-4.3.1-orig/apps/konsole/src/SessionController.h	2009-04-15 13:25:25.000000000 +0300
++++ kdebase-4.3.1/apps/konsole/src/SessionController.h	2009-09-02 20:16:50.539589477 +0300
+@@ -209,6 +209,9 @@
+ 
+     void updateSearchFilter();
+ 
++    /* Returns true if called within a KPart; false if called within Konsole. */
++    bool isKonsolePart() const;
++
+ private:
+     // begins the search
+     // text - pattern to search for
\ No newline at end of file
diff --git a/kde-base/konsole/konsole-4.3.1-r1.ebuild b/kde-base/konsole/konsole-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..43eaa9694383
--- /dev/null
+++ b/kde-base/konsole/konsole-4.3.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.3.1-r1.ebuild,v 1.1 2009/09/02 17:37:12 wired Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-apps"
+inherit kde4-meta
+
+DESCRIPTION="X terminal for use with KDE."
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug +handbook"
+
+COMMONDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	>=x11-libs/libxklavier-3.2
+	x11-libs/libXrender
+	x11-libs/libXtst
+"
+DEPEND="${COMMONDEPEND}
+	x11-apps/bdftopcf
+	x11-proto/kbproto
+	x11-proto/renderproto
+"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-kpart-backport-fix.patch" )