diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-12-10 23:06:17 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-12-10 23:06:17 +0000 |
| commit | e3f053527236d78657fe176e16e4917b924d1a1b (patch) | |
| tree | a82b551b6fc9485e199a61fdbe9b73728730feaa | |
| parent | Drop KDE SC-4.3.1. (diff) | |
| download | gentoo-2-e3f053527236d78657fe176e16e4917b924d1a1b.tar.gz gentoo-2-e3f053527236d78657fe176e16e4917b924d1a1b.tar.bz2 gentoo-2-e3f053527236d78657fe176e16e4917b924d1a1b.zip | |
Drop old patch
(Portage version: -svn/cvs/Linux i686)
| -rw-r--r-- | kde-base/konsole/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/konsole/files/konsole-4.3.1-kpart-backport-fix.patch | 49 |
2 files changed, 5 insertions, 50 deletions
diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog index 4c4a2aa81ff8..1e95517fb10c 100644 --- a/kde-base/konsole/ChangeLog +++ b/kde-base/konsole/ChangeLog @@ -1,6 +1,10 @@ # 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.150 2009/12/10 21:58:09 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.151 2009/12/10 23:06:16 abcd Exp $ + + 10 Dec 2009; Jonathan Callen <abcd@gentoo.org> + -files/konsole-4.3.1-kpart-backport-fix.patch: + Drop old patch 10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -konsole-4.3.1.ebuild, -konsole-4.3.1-r1.ebuild: 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 deleted file mode 100644 index 5c87ee6a76d6..000000000000 --- a/kde-base/konsole/files/konsole-4.3.1-kpart-backport-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 |