Remove unused patch.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 20 insertions, 235 deletions

diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index 15043acab8cf..9d2999ba4caf 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.167 2013/01/28 12:12:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.168 2013/01/28 13:33:44 kensington Exp $
+
+  28 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/dolphin-4.9.4-drag-and-drop-and-keyboard-focus.patch:
+  Remove unused patch.
 
   28 Jan 2013; Agostino Sarubbo <ago@gentoo.org> -dolphin-4.9.3.ebuild,
   -dolphin-4.9.4-r1.ebuild:
diff --git a/kde-base/dolphin/Manifest b/kde-base/dolphin/Manifest
index afb7ed1103ab..f8ae24d4b784 100644
--- a/kde-base/dolphin/Manifest
+++ b/kde-base/dolphin/Manifest
@@ -1,5 +1,18 @@
-AUX dolphin-4.9.4-drag-and-drop-and-keyboard-focus.patch 9035 SHA256 fee187cf6c46bc892513600f08db24cd89a20782e546d99025a3e41248cf8f6c SHA512 a66eddcd465216024e3bdbe3604758cd17cb95d6ab4e354c7e0985fecc577dbe73c52cff27e4a7ba64beacb89202bf8aa88049bee147bc4f21f74736b6871129 WHIRLPOOL eff4663992ca42622cd7477eed234006702626bb56b967c1d7ad125f616a0673e60d57d7b7ef28d19c54bc3e3023263782db18da308f3c4ac52ca43092f3f132
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST kde-baseapps-4.9.5.tar.xz 2527344 SHA256 8ebd4f005874a7818d7258575f22f35cbb57a667a36bf34301fa55d695c9b74d SHA512 a71d1953cba0996b07d630a950c8ebf4c7d0b8243bc2f9b331debc6162c0ee31f43811c8f8f90659c64ebb6c3228d750c6754f8db244884457a9cef6aa3dd804 WHIRLPOOL 1c1d6289ef8202089d7519701c3046867466d5406698e7af8d44fef8126e1689361190475dccf2cb155504c2fb0a232a7e68abc0f58a313bb3f08264ef10766f
 EBUILD dolphin-4.9.5.ebuild 1076 SHA256 ae2eb33e444b47e5a5e3366494e856927b727f19c6fc526a8ee71e9b3ba0f4a8 SHA512 a947a9a8c40e2045fb41444e2ab3644e8c299a35aa16673c77080adb954dfd5c335db393f8d2df5038fd77e1b86e466747eea03ef14361e470e621a1884b2343 WHIRLPOOL 8623003ac32c6e1112fcbef25d37654630bc4c98b9b9193134bc24db4c7c9fa0994a704633a3a3fcc0a3d2288e07d2ebca80a75002e4396c1531031c5d3e6416
-MISC ChangeLog 21860 SHA256 f22f147a03c95429b063bf6d0bac1d95efaceaa4bcadb324256b4f193f74e14f SHA512 b34d1631ab16ed2a78d3992cb5d3e35bfe46bcaf40d52e37036df03dfc5c4f250cf9b3a091848f7dd5052651f64e539fe133a16d7fb3323a94c40a4d85d4715a WHIRLPOOL 234ebb8d961d9ceed9da3931b0bf40c3ac8ba73ddb442cedcc9af2b2fbe1a71ebef6c88fed6593c2e3156b549c121669c968b939fd6b4a86ed0e92bca9226c94
+MISC ChangeLog 22010 SHA256 6587558770e43c0e581a3eeb543de10f85f58a75821d6b825c42496dd61ad21e SHA512 ef1500d6f64080af2b141da6b3e60cffa5d49f246986f400034a61dbef1542d80f405f7dac5667cc6e8715a193404617d5b0c2bdf6f553e596ca24accf32f63e WHIRLPOOL 6a9c796f227bd1123afa1d1333b315b5667723133b8537eefe9179f928ee0258706d87fc7ce6abafb2342f77bf708f0214b7807bf68445dd22813a58eb7acbca
 MISC metadata.xml 287 SHA256 f8ca0fcb27fae3e13bce985f13164013ba54c573c50a047622953f03c48a6969 SHA512 b85ce8bcdb8dd6cf4521a6e287186c1b602383172bf0d2e239a63b7f223b0b920aba517cad1e430f1bca65598d7e998f71d7e297a92b1dfb277a6609c733eb8a WHIRLPOOL bb24b57ab0aedf0b59aaf84eb7aa2b35d3997eb2e00a34eab410015b0fc889f38f3f3d7bc374985fbd5e47627067b590ca968cb82cd34e9b790edbb57872ab1e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRBn1rAAoJEMbwO6tnXQ0sxeoIAM58x2TFphBJVKr8+zoUUj/V
+M4awf/bE6DCQyym7Tz0//gVsABSmztFSxHbElom+F/4g6+/Ww/iGQvWUsHQUQ2Hd
+UoCv6RMZdf9g37JrHWaWcnV0EqJnVv+H++QvVc73/MCkQZWKuchbXtxkNDbxyXtK
+ZKyy52kXrG8AziGloNpJFrr5RSmWvnqoa5LkZqhg8iDVmAE75MqG0vLx+bnrlVvX
+K5q90+UZRwXzxkkrptlALLTcJ+bJIDB6laOscDuDRB+ICHaS+0S8Tqk47KJ/JLuk
+FrmNDgV+MxNWw7OSNDOomslulTKFYt4e4PbTZjOrgWCqCEa9Ozy3dpfWZK9bBak=
+=XXvj
+-----END PGP SIGNATURE-----
diff --git a/kde-base/dolphin/files/dolphin-4.9.4-drag-and-drop-and-keyboard-focus.patch b/kde-base/dolphin/files/dolphin-4.9.4-drag-and-drop-and-keyboard-focus.patch
deleted file mode 100644
index 9f328ec60f91..000000000000
--- a/kde-base/dolphin/files/dolphin-4.9.4-drag-and-drop-and-keyboard-focus.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-index f92cab5..af16954 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
-     m_additionalInfoTextColor(),
-     m_overlay(),
-     m_rating(),
--    m_roleEditor(0)
-+    m_roleEditor(0),
-+    m_oldRoleEditor(0)
- {
- }
- 
-@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget()
-     m_textInfo.clear();
- 
-     delete m_roleEditor;
-+    delete m_oldRoleEditor;
- }
- 
- void KStandardItemListWidget::setLayout(Layout layout)
-@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
-                        this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-             disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-                        this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--            // Do not delete the role editor using deleteLater() because we might be
--            // inside a nested event loop which has been started by one of its event
--            // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
--            m_roleEditor->deleteWhenIdle();
-+            m_oldRoleEditor = m_roleEditor;
-+            m_roleEditor->hide();
-             m_roleEditor = 0;
-         }
-         return;
-+    } else if (m_oldRoleEditor) {
-+        // Delete the old editor before constructing the new one to
-+        // prevent a memory leak.
-+        m_oldRoleEditor->deleteLater();
-+        m_oldRoleEditor = 0;
-     }
- 
-     Q_ASSERT(!m_roleEditor);
-@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
- 
- void KStandardItemListWidget::closeRoleEditor()
- {
-+    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-+               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-+    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-+               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-+
-     if (m_roleEditor->hasFocus()) {
-         // If the editing was not ended by a FocusOut event, we have
-         // to transfer the keyboard focus back to the KItemListContainer.
-         scene()->views()[0]->parentWidget()->setFocus();
-     }
- 
--    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
--               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
--    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
--               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--
--    // Do not delete the role editor using deleteLater() because we might be
--    // inside a nested event loop which has been started by one of its event
--    // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
--    m_roleEditor->deleteWhenIdle();
-+    m_oldRoleEditor = m_roleEditor;
-+    m_roleEditor->hide();
-     m_roleEditor = 0;
- }
- 
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-index 787722d..386f60e 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.h
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-@@ -241,6 +241,7 @@ private:
-     QPixmap m_rating;
- 
-     KItemListRoleEditor* m_roleEditor;
-+    KItemListRoleEditor* m_oldRoleEditor;
- 
-     friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
-                                                    // share a common layout calculation
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-index 78dbfe9..1e4b5fd 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
-     KTextEdit(parent),
-     m_index(0),
-     m_role(),
--    m_blockFinishedSignal(false),
--    m_eventHandlingLevel(0),
--    m_deleteAfterEventHandling(false)
-+    m_blockFinishedSignal(false)
- {
-     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const
-     return m_role;
- }
- 
--void KItemListRoleEditor::deleteWhenIdle()
--{
--    if (m_eventHandlingLevel > 0) {
--        // We are handling an event at the moment. It could be that we
--        // are in a nested event loop run by contextMenuEvent() or a
--        // call of mousePressEvent() which results in drag&drop.
--        // -> do not call deleteLater() to prevent a crash when we
--        //    return from the nested event loop.
--        m_deleteAfterEventHandling = true;
--    } else {
--        deleteLater();
--    }
--}
--
- bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- {
-     if (watched == parentWidget() && event->type() == QEvent::Resize) {
-@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- 
- bool KItemListRoleEditor::event(QEvent* event)
- {
--    ++m_eventHandlingLevel;
--
-     if (event->type() == QEvent::FocusOut) {
-         QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
-         if (focusEvent->reason() != Qt::PopupFocusReason) {
-             emitRoleEditingFinished();
-         }
-     }
--
--    const int result = KTextEdit::event(event);
--    --m_eventHandlingLevel;
--
--    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
--        // Schedule this object for deletion and make sure that we do not try
--        // to deleteLater() again when the DeferredDelete event is received.
--        deleteLater();
--        m_deleteAfterEventHandling = false;
--    }
--
--    return result;
--}
--
--bool KItemListRoleEditor::viewportEvent(QEvent* event)
--{
--    ++m_eventHandlingLevel;
--    const bool result = KTextEdit::viewportEvent(event);
--    --m_eventHandlingLevel;
--
--    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
--        // Schedule this object for deletion and make sure that we do not try
--        // to deleteLater() again when the DeferredDelete event is received.
--        deleteLater();
--        m_deleteAfterEventHandling = false;
--    }
--
--    return result;
-+    return KTextEdit::event(event);
- }
- 
- void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-         return;
-     case Qt::Key_Enter:
-     case Qt::Key_Return:
--        // TODO: find a better way to fix the bug 309760
--        clearFocus(); // emitRoleEditingFinished(); results in a crash
-+        emitRoleEditingFinished();
-         event->accept();
-         return;
-     default:
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-index a2f7058..aa2c977 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-@@ -47,15 +47,6 @@ public:
-     void setRole(const QByteArray& role);
-     QByteArray role() const;
- 
--    /**
--     * Calls deleteLater() if no event is being handled at the moment.
--     * Otherwise, the deletion is deferred until the event handling is
--     * finished. This prevents that the deletion happens inside a nested
--     * event loop which might be run in contextMenuEvent() or
--     * mouseMoveEvent() because this would probably cause a crash.
--     */
--    void deleteWhenIdle();
--
-     virtual bool eventFilter(QObject* watched, QEvent* event);
- 
- signals:
-@@ -64,7 +55,6 @@ signals:
- 
- protected:
-     virtual bool event(QEvent* event);
--    virtual bool viewportEvent(QEvent* event);
-     virtual void keyPressEvent(QKeyEvent* event);
- 
- private slots:
-@@ -85,8 +75,6 @@ private:
-     int m_index;
-     QByteArray m_role;
-     bool m_blockFinishedSignal;
--    int m_eventHandlingLevel;
--    bool m_deleteAfterEventHandling;
- };
- 
- #endif
-diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
-index 70a7394..0e97c5a 100644
---- a/dolphin/src/views/dolphinview.cpp
-+++ b/dolphin/src/views/dolphinview.cpp
-@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState()
- 
-         QSet<int> selectedItems = selectionManager->selectedItems();
- 
--        for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) {
-+        QList<KUrl>::iterator it = m_selectedUrls.begin();
-+        while (it != m_selectedUrls.end()) {
-             const int index = m_model->index(*it);
-             if (index >= 0) {
-                 selectedItems.insert(index);
--                m_selectedUrls.erase(it);
-+                it = m_selectedUrls.erase(it);
-+            } else {
-+                 ++it;
-             }
-         }
-