[kdebase] fix typo
Than Ngo
than at fedoraproject.org
Wed Apr 6 15:47:59 UTC 2011
commit 89f81cf15b123c918f8bd665d5d7764073db4372
Author: Than Ngo <than at redhat.com>
Date: Wed Apr 6 17:47:44 2011 +0200
fix typo
kdebase-4.6.2-konsole-kde#267896.patch | 81 ++++++++++++-------------------
kdebase.spec | 3 +-
2 files changed, 33 insertions(+), 51 deletions(-)
---
diff --git a/kdebase-4.6.2-konsole-kde#267896.patch b/kdebase-4.6.2-konsole-kde#267896.patch
index 54e05d8..be0f1fb 100644
--- a/kdebase-4.6.2-konsole-kde#267896.patch
+++ b/kdebase-4.6.2-konsole-kde#267896.patch
@@ -1,22 +1,6 @@
-commit 467fb1edcbc53081de348251cef490ed5002fa3b
-Author: Kurt Hindenburg <kurt.hindenburg at gmail.com>
-Date: Tue Apr 5 11:11:20 2011 -0400
-
- Restore 'Close Tab' on the tab context menu and the close tabbar button.
-
- These 2 options were disabled due to they messed up the menu texts
- after the fix for bko 185466.
- The close method via dbus has been disabled as it causes menu issues.
-
- Most of patch to fix 'Close Tab' by Albert Astals Cid aacid at kde.org
- BUG: 267896
- CCBUG: 185466
- FIXED-IN: 4.6.3
-
-diff --git a/konsole/src/Session.h b/konsole/src/Session.h
-index def9f92..6f16fe9 100644
---- a/konsole/src/Session.h
-+++ b/konsole/src/Session.h
+diff -up kdebase-4.6.2/konsole/src/Session.h.kde#267896 kdebase-4.6.2/konsole/src/Session.h
+--- kdebase-4.6.2/konsole/src/Session.h.kde#267896 2011-04-01 20:35:03.000000000 +0200
++++ kdebase-4.6.2/konsole/src/Session.h 2011-04-06 17:44:09.000000000 +0200
@@ -376,7 +376,8 @@ public slots:
* then the terminal connection (the pty) is closed and Konsole waits for the
* process to exit.
@@ -27,11 +11,10 @@ index def9f92..6f16fe9 100644
/**
* Changes the session title or other customizable aspects of the terminal
-diff --git a/konsole/src/ViewContainer.cpp b/konsole/src/ViewContainer.cpp
-index 7df7add..2e65f31 100644
---- a/konsole/src/ViewContainer.cpp
-+++ b/konsole/src/ViewContainer.cpp
-@@ -443,13 +443,11 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject*
+diff -up kdebase-4.6.2/konsole/src/ViewContainer.cpp.kde#267896 kdebase-4.6.2/konsole/src/ViewContainer.cpp
+--- kdebase-4.6.2/konsole/src/ViewContainer.cpp.kde#267896 2011-04-01 20:35:03.000000000 +0200
++++ kdebase-4.6.2/konsole/src/ViewContainer.cpp 2011-04-06 17:45:36.000000000 +0200
+@@ -443,13 +443,11 @@ TabbedViewContainer::TabbedViewContainer
_closeTabButton->setIcon(KIcon("tab-close"));
_closeTabButton->adjustSize();
_closeTabButton->setHidden(true);
@@ -45,20 +28,21 @@ index 7df7add..2e65f31 100644
connect( _tabBar , SIGNAL(initiateDrag(int)) , this , SLOT(startTabDrag(int)) );
connect( _tabBar, SIGNAL(contextMenu(int, const QPoint&)), this,
SLOT(openTabContextMenu(int, const QPoint&)) );
-@@ -496,9 +494,9 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject*
+@@ -495,11 +493,11 @@ TabbedViewContainer::TabbedViewContainer
+ _contextPopupMenu->addAction(KIcon(),
i18nc("@action:inmenu", "&Rename Tab..."), this,
SLOT(tabContextMenuRenameTab()));
-
--// _contextPopupMenu->addAction(KIcon("tab-close"),
--// i18nc("@action:inmenu", "&Close Tab"), this,
--// SLOT(tabContextMenuCloseTab()));
-+ _contextPopupMenu->addAction(KIcon("tab-close"),
-+ i18nc("@action:inmenu", "&Close Tab"), this,
-+ SLOT(tabContextMenuCloseTab()));
-
+-/*
++
+ _contextPopupMenu->addAction(KIcon("tab-close"),
+ i18nc("@action:inmenu", "&Close Tab"), this,
+ SLOT(tabContextMenuCloseTab()));
+-*/
++
}
void TabbedViewContainer::setNewViewMenu(QMenu* menu)
-@@ -521,16 +519,10 @@ void TabbedViewContainer::closeCurrentTab()
+ {
+@@ -521,16 +519,10 @@ void TabbedViewContainer::closeCurrentTa
{
if (_stackWidget->currentIndex() != -1)
{
@@ -77,7 +61,7 @@ index 7df7add..2e65f31 100644
void TabbedViewContainer::setTabBarVisible(bool visible)
{
_tabBar->setVisible(visible);
-@@ -655,7 +647,8 @@ void TabbedViewContainer::openTabContextMenu(int index, const QPoint& pos)
+@@ -655,7 +647,8 @@ void TabbedViewContainer::openTabContext
void TabbedViewContainer::tabContextMenuCloseTab()
{
@@ -87,10 +71,9 @@ index 7df7add..2e65f31 100644
}
void TabbedViewContainer::tabContextMenuDetachTab()
-diff --git a/konsole/src/ViewContainer.h b/konsole/src/ViewContainer.h
-index da7d598..aa512f8 100644
---- a/konsole/src/ViewContainer.h
-+++ b/konsole/src/ViewContainer.h
+diff -up kdebase-4.6.2/konsole/src/ViewContainer.h.kde#267896 kdebase-4.6.2/konsole/src/ViewContainer.h
+--- kdebase-4.6.2/konsole/src/ViewContainer.h.kde#267896 2011-02-28 13:50:53.000000000 +0100
++++ kdebase-4.6.2/konsole/src/ViewContainer.h 2011-04-06 17:44:09.000000000 +0200
@@ -427,7 +427,6 @@ private slots:
void updateIcon(ViewProperties* item);
void updateActivity(ViewProperties* item);
@@ -107,11 +90,10 @@ index da7d598..aa512f8 100644
private:
void dynamicTabBarVisibility();
-diff --git a/konsole/src/ViewManager.cpp b/konsole/src/ViewManager.cpp
-index 54d11c4..89d019e 100644
---- a/konsole/src/ViewManager.cpp
-+++ b/konsole/src/ViewManager.cpp
-@@ -639,6 +639,11 @@ ViewContainer* ViewManager::createContainer(const Profile::Ptr info)
+diff -up kdebase-4.6.2/konsole/src/ViewManager.cpp.kde#267896 kdebase-4.6.2/konsole/src/ViewManager.cpp
+--- kdebase-4.6.2/konsole/src/ViewManager.cpp.kde#267896 2011-04-06 17:44:09.000000000 +0200
++++ kdebase-4.6.2/konsole/src/ViewManager.cpp 2011-04-06 17:44:09.000000000 +0200
+@@ -639,6 +639,11 @@ ViewContainer* ViewManager::createContai
this,
SLOT(detachView(ViewContainer*, QWidget*))
);
@@ -123,7 +105,7 @@ index 54d11c4..89d019e 100644
}
break;
case NoNavigation:
-@@ -1090,5 +1095,13 @@ void ViewManager::moveSessionRight()
+@@ -1084,5 +1089,13 @@ void ViewManager::moveSessionRight()
this->moveActiveViewRight();
}
@@ -137,11 +119,10 @@ index 54d11c4..89d019e 100644
+
#include "ViewManager.moc"
-diff --git a/konsole/src/ViewManager.h b/konsole/src/ViewManager.h
-index 05f5370..538dfec 100644
---- a/konsole/src/ViewManager.h
-+++ b/konsole/src/ViewManager.h
-@@ -314,6 +314,8 @@ private slots:
+diff -up kdebase-4.6.2/konsole/src/ViewManager.h.kde#267896 kdebase-4.6.2/konsole/src/ViewManager.h
+--- kdebase-4.6.2/konsole/src/ViewManager.h.kde#267896 2011-02-28 13:50:53.000000000 +0100
++++ kdebase-4.6.2/konsole/src/ViewManager.h 2011-04-06 17:44:09.000000000 +0200
+@@ -313,6 +313,8 @@ private slots:
void detachView(ViewContainer* container, QWidget* view);
diff --git a/kdebase.spec b/kdebase.spec
index e05be2f..21fa637 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -110,7 +110,8 @@ Requires: kdelibs4-devel kdepimlibs4-devel
%patch2 -p2 -b .home-icon
%patch3 -p2 -b .kde#228593
%patch4 -p2 -b .bz#631481
-%patch100 -p1 b .kde#267896
+
+%patch100 -p1 -b .kde#267896
%build
mkdir -p %{_target_platform}
More information about the scm-commits
mailing list