OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=29

Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch

@@ -1,60 +0,0 @@
-From: Frank Reininghaus <frank78ac@googlemail.com>
-Date: Sun, 10 Jan 2016 10:18:30 +0000
-Subject: Do not delete sub menus of the control menu explicitly
-X-Git-Url: http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=ddc050f23596493e8debd2dfd523fd572c098d63
----
-Do not delete sub menus of the control menu explicitly
-
-This is not necessary because the sub menus are children of the main
-menu, such that they are deleted together with the other actions by
-QMenu::clear().
-
-This prevents a crash that can happen if a sub menu is open while
-another menu action is clicked.
-
-Thanks to Fabian Vogt and Wolfgang Bauer for investigating this issue!
-
-BUG: 354558
-FIXED-IN: 15.12.2
-REVIEW: 126693
----
-
-
---- a/src/dolphinmainwindow.cpp
-+++ b/src/dolphinmainwindow.cpp
-@@ -789,8 +789,8 @@
-     QMenu* menu = qobject_cast<QMenu*>(sender());
-     Q_ASSERT(menu);
- 
--    // All actions get cleared by QMenu::clear(). The sub-menus are deleted
--    // by connecting to the aboutToHide() signal from the parent-menu.
-+    // All actions get cleared by QMenu::clear(). This includes the sub-menus
-+    // because 'menu' is their parent.
-     menu->clear();
- 
-     KActionCollection* ac = actionCollection();
-@@ -840,7 +840,6 @@
- 
-     // Add "Go" menu
-     QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu);
--    connect(menu, &QMenu::aboutToHide, goMenu, &QMenu::deleteLater);
-     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
-     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
-     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
-@@ -850,7 +849,6 @@
- 
-     // Add "Tool" menu
-     QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);
--    connect(menu, &QMenu::aboutToHide, toolsMenu, &QMenu::deleteLater);
-     toolsMenu->addAction(ac->action("show_filter_bar"));
-     toolsMenu->addAction(ac->action("compare_files"));
-     toolsMenu->addAction(ac->action("open_terminal"));
-@@ -864,7 +862,6 @@
- 
-     // Add "Help" menu
-     QMenu* helpMenu = new QMenu(i18nc("@action:inmenu", "Help"), menu);
--    connect(menu, &QMenu::aboutToHide, helpMenu, &QMenu::deleteLater);
-     helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents)));
-     helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis)));
-     helpMenu->addSeparator();
-

dolphin.changes

@@ -6,6 +6,9 @@ Sat Feb 13 08:01:04 UTC 2016 - tittiatcoke@gmail.com
    * https://www.kde.org/announcements/announce-applications-15.12.2.php
    * boo#966605
 
+- Drop upstreamed patches:
+  * fix-check-for-session-close.patch
+  * Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch
 
 -------------------------------------------------------------------
 Thu Jan 28 20:21:17 UTC 2016 - wbauer@tmo.at

dolphin.spec

@@ -26,10 +26,6 @@ Url:            http://www.kde.org/
 Source:         dolphin-%{version}.tar.xz
 Source1:        dolphinsu.desktop
 Patch0:         dolphin-go_up.diff
-# PATCH-FIX-UPSTREAM Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch boo#952460, kde#354558 -- fixes a possible crash when closing the "Control" menu
-Patch1:         Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch
-# PATCH-FIX-UPSTREAM fix-check-for-session-close.patch boo#953014, kde#353548 -- don't ask for confirmation on logout when storing the session
-Patch2:         fix-check-for-session-close.patch
 BuildRequires:  baloo5-devel
 BuildRequires:  baloo5-widgets-devel
 BuildRequires:  extra-cmake-modules >= 1.6.0
@@ -98,8 +94,6 @@ This package contains the libraries used by Dolphin and Konqueror.
 %prep
 %setup -q -n dolphin-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
   %cmake_kf5 -d build

fix-check-for-session-close.patch

@@ -1,29 +0,0 @@
-From: Wolfgang Bauer <wbauer@tmo.at>
-Date: Thu, 28 Jan 2016 20:03:14 +0000
-Subject: Fix check whether window is closed by session management
-X-Git-Url: http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=bf1dbee1d6a709983d9f5034c61e2f005fdc6aee
----
-Fix check whether window is closed by session management
-
-qApp->isSessionRestored() specifies whether the application has been
-restored by session management. This is obviously wrong here. Use
-qApp->isSavingSession() instead.
-
-BUG: 353548
-FIXED-IN: 15.12.2
-REVIEW: 126917
----
-
-
---- a/src/dolphinmainwindow.cpp
-+++ b/src/dolphinmainwindow.cpp
-@@ -347,7 +347,7 @@
-     // Find out if Dolphin is closed directly by the user or
-     // by the session manager because the session is closed
-     bool closedByUser = true;
--    if (qApp->isSessionRestored()) {
-+    if (qApp->isSavingSession()) {
-         closedByUser = false;
-     }
- 
-