diff options
Diffstat (limited to 'source/kde/kdebase')
| -rwxr-xr-x | source/kde/kdebase/kdebase.SlackBuild | 6 | ||||
| -rw-r--r-- | source/kde/kdebase/konsole_right_click-185466.patch | 99 | ||||
| -rw-r--r-- | source/kde/kdebase/konsole_right_click-185466.patch.patch | 11 | ||||
| -rw-r--r-- | source/kde/kdebase/local.options | 1 | ||||
| -rw-r--r-- | source/kde/kdebase/module_manager_include.diff | 19 |
5 files changed, 116 insertions, 20 deletions
diff --git a/source/kde/kdebase/kdebase.SlackBuild b/source/kde/kdebase/kdebase.SlackBuild index 89ff3a503..53732fb50 100755 --- a/source/kde/kdebase/kdebase.SlackBuild +++ b/source/kde/kdebase/kdebase.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -54,6 +54,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# patch a problem where closing a konsole tab breaks the right-click context menu: +zcat $CWD/konsole_right_click-185466.patch.gz | patch --verbose -p2 || exit 1 +zcat $CWD/konsole_right_click-185466.patch.patch.gz | patch --verbose -p1 || exit 1 + mkdir -p build cd build cmake \ diff --git a/source/kde/kdebase/konsole_right_click-185466.patch b/source/kde/kdebase/konsole_right_click-185466.patch new file mode 100644 index 000000000..a3e19ab58 --- /dev/null +++ b/source/kde/kdebase/konsole_right_click-185466.patch @@ -0,0 +1,99 @@ +Index: tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp +=================================================================== +--- tmp.orig/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp ++++ tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp +@@ -86,6 +86,8 @@ MainWindow::MainWindow() + connect( _viewManager , SIGNAL(empty()) , this , SLOT(close()) ); + connect( _viewManager , SIGNAL(activeViewChanged(SessionController*)) , this , + SLOT(activeViewChanged(SessionController*)) ); ++ connect( _viewManager , SIGNAL(unplugController(SessionController*)) , this , ++ SLOT(disconnectController(SessionController*)) ); + connect( _viewManager , SIGNAL(viewPropertiesChanged(const QList<ViewProperties*>&)) , + bookmarkHandler() , SLOT(setViews(const QList<ViewProperties*>&)) ); + +Index: tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.h +=================================================================== +--- tmp.orig/kdebase-4.5.5/apps/konsole/src/MainWindow.h ++++ tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.h +@@ -161,6 +161,7 @@ class MainWindow : public KXmlGuiWindow + void showShortcutsDialog(); + void newFromProfile(Profile::Ptr profile); + void activeViewChanged(SessionController* controller); ++ void disconnectController(SessionController* controller); + void activeViewTitleChanged(ViewProperties*); + + void sessionListChanged(const QList<QAction*>& actions); +@@ -179,7 +180,6 @@ class MainWindow : public KXmlGuiWindow + void setupActions(); + void setupWidgets(); + QString activeSessionDir() const; +- void disconnectController(SessionController* controller); + + // sets the active shortcuts of actions in 'dest' to the shortcuts of actions + // with the same name in 'source' (see KAction::ActiveShortcut) +Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp +=================================================================== +--- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp ++++ tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp +@@ -376,6 +376,10 @@ void ViewManager::sessionFinished() + } + } + ++ // This is needed to remove this controller from factory() in ++ // order to prevent BUG: 185466 - disappearing menu popup ++ if (_pluggedController) ++ emit unplugController(_pluggedController); + } + + void ViewManager::focusActiveView() +@@ -744,6 +748,9 @@ void ViewManager::viewCloseRequest(QWidg + focusActiveView(); + updateDetachViewState(); + } ++ if (_pluggedController) ++ emit unplugController(_pluggedController); ++ + } + + TerminalDisplay* ViewManager::createTerminalDisplay(Session* session) +Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.h +=================================================================== +--- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewManager.h ++++ tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.h +@@ -175,6 +175,12 @@ signals: + void activeViewChanged(SessionController* controller); + + /** ++ * Emitted when the current session needs to be unplugged from factory(). ++ * @param controller The controller associated with the view ++ */ ++ void unplugController(SessionController* controller); ++ ++ /** + * Emitted when the list of view properties ( as returned by viewProperties() ) changes. + * This occurs when views are added to or removed from the active container, or + * if the active container is changed. +Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp +=================================================================== +--- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp ++++ tmp/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp +@@ -448,6 +448,7 @@ TabbedViewContainer::TabbedViewContainer + _closeTabButton->setIcon(KIcon("tab-close")); + _closeTabButton->adjustSize(); + _closeTabButton->setHidden(true); ++ _closeTabButton->setEnabled(false); + + connect( _tabBar , SIGNAL(currentChanged(int)) , this , SLOT(currentTabChanged(int)) ); + connect( _tabBar , SIGNAL(tabDoubleClicked(int)) , this , SLOT(tabDoubleClicked(int)) ); +@@ -500,9 +501,11 @@ TabbedViewContainer::TabbedViewContainer + i18nc("@action:inmenu", "&Rename Tab..."), this, + SLOT(tabContextMenuRenameTab())); + ++/* bug 185466 + _contextPopupMenu->addAction(KIcon("tab-close"), + i18nc("@action:inmenu", "&Close Tab"), this, + SLOT(tabContextMenuCloseTab())); ++*/ + + } + void TabbedViewContainer::setNewViewMenu(QMenu* menu) diff --git a/source/kde/kdebase/konsole_right_click-185466.patch.patch b/source/kde/kdebase/konsole_right_click-185466.patch.patch new file mode 100644 index 000000000..8e6f6c682 --- /dev/null +++ b/source/kde/kdebase/konsole_right_click-185466.patch.patch @@ -0,0 +1,11 @@ +--- ./apps/konsole/src/ViewContainer.cpp.orig 2011-04-04 15:05:38.000000000 -0500 ++++ ./apps/konsole/src/ViewContainer.cpp 2011-04-04 15:08:58.000000000 -0500 +@@ -448,7 +448,7 @@ + _closeTabButton->setIcon(KIcon("tab-close")); + _closeTabButton->adjustSize(); + _closeTabButton->setHidden(true); +- _closeTabButton->setEnabled(false); ++ _closeTabButton->setEnabled(true); + + connect( _tabBar , SIGNAL(currentChanged(int)) , this , SLOT(currentTabChanged(int)) ); + connect( _tabBar , SIGNAL(tabDoubleClicked(int)) , this , SLOT(tabDoubleClicked(int)) ); diff --git a/source/kde/kdebase/local.options b/source/kde/kdebase/local.options new file mode 100644 index 000000000..a837340db --- /dev/null +++ b/source/kde/kdebase/local.options @@ -0,0 +1 @@ +BUILD=3 diff --git a/source/kde/kdebase/module_manager_include.diff b/source/kde/kdebase/module_manager_include.diff deleted file mode 100644 index 498b2afb0..000000000 --- a/source/kde/kdebase/module_manager_include.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- trunk/KDE/kdebase/apps/konqueror/sidebar/module_manager.h 2009/11/13 18:46:51 1048689 -+++ trunk/KDE/kdebase/apps/konqueror/sidebar/module_manager.h 2010/01/07 20:09:11 1071281 -@@ -18,6 +18,9 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifndef MODULE_MANAGER_H -+#define MODULE_MANAGER_H -+ - #include <QStringList> - #include <kservice.h> - class KConfigGroup; -@@ -74,3 +77,5 @@ - KConfigGroup *m_config; // owned by SidebarWidget - QString m_localPath; // local path - }; -+ -+#endif - |