From 087fcd4e4f584f84ec9f6b79ea6bbfbc68ced02d49ed8d87ed6a9a6e1165e3e1 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 28 Jan 2016 21:29:20 +0000 Subject: [PATCH 1/4] Accepting request 356598 from home:wolfi323:branches:KDE:Applications - Added fix-check-for-session-close.patch: don't ask for confirmation on logout when storing the session (boo#953014, kde#353548) OBS-URL: https://build.opensuse.org/request/show/356598 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=26 --- dolphin.changes | 7 +++++++ dolphin.spec | 3 +++ fix-check-for-session-close.patch | 29 +++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 fix-check-for-session-close.patch diff --git a/dolphin.changes b/dolphin.changes index 10e6692..7d900b3 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 28 20:21:17 UTC 2016 - wbauer@tmo.at + +- Added fix-check-for-session-close.patch: don't ask for + confirmation on logout when storing the session + (boo#953014, kde#353548) + ------------------------------------------------------------------- Thu Jan 14 19:55:08 UTC 2016 - wbauer@tmo.at diff --git a/dolphin.spec b/dolphin.spec index f45d7ac..dc412e1 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -28,6 +28,8 @@ 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 @@ -97,6 +99,7 @@ This package contains the libraries used by Dolphin and Konqueror. %setup -q -n dolphin-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake_kf5 -d build diff --git a/fix-check-for-session-close.patch b/fix-check-for-session-close.patch new file mode 100644 index 0000000..778b8a1 --- /dev/null +++ b/fix-check-for-session-close.patch @@ -0,0 +1,29 @@ +From: Wolfgang Bauer +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; + } + + From 8081940a135cbd06c7ddcc5c767d4e11a6e4c33766e0e337bc372cebfc4d9295 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 13 Feb 2016 08:01:07 +0000 Subject: [PATCH 2/4] update to (15.12.2) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=27 --- dolphin-15.12.1.tar.xz | 3 --- dolphin-15.12.2.tar.xz | 3 +++ dolphin.changes | 9 +++++++++ dolphin.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 dolphin-15.12.1.tar.xz create mode 100644 dolphin-15.12.2.tar.xz diff --git a/dolphin-15.12.1.tar.xz b/dolphin-15.12.1.tar.xz deleted file mode 100644 index 1ba583a..0000000 --- a/dolphin-15.12.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdeabaad25d7bc2480fa226ce326db2a39bdb8b612016d151344f0b65410ec52 -size 658300 diff --git a/dolphin-15.12.2.tar.xz b/dolphin-15.12.2.tar.xz new file mode 100644 index 0000000..258d912 --- /dev/null +++ b/dolphin-15.12.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6387ea81bec8f3a0c35fe9e319450bcb234127516e77198fbbbc4eb062c60231 +size 658360 diff --git a/dolphin.changes b/dolphin.changes index 7d900b3..65e58a9 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Feb 13 08:01:04 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.12.2 + * KDE Applications 15.12.2 + * https://www.kde.org/announcements/announce-applications-15.12.2.php + * boo#961265 + + ------------------------------------------------------------------- Thu Jan 28 20:21:17 UTC 2016 - wbauer@tmo.at diff --git a/dolphin.spec b/dolphin.spec index dc412e1..ec591ef 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -17,7 +17,7 @@ Name: dolphin -Version: 15.12.1 +Version: 15.12.2 Release: 0 Summary: KDE File Manager License: GPL-2.0+ From 64a430dc2f3edd5f829a3bb6dc902120290b35f6676e53106093ffdf35ef1d67 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 13 Feb 2016 11:29:23 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=28 --- dolphin.changes | 2 +- dolphin.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dolphin.changes b/dolphin.changes index 65e58a9..3313ab6 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -4,7 +4,7 @@ Sat Feb 13 08:01:04 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.2 * KDE Applications 15.12.2 * https://www.kde.org/announcements/announce-applications-15.12.2.php - * boo#961265 + * boo#966605 ------------------------------------------------------------------- diff --git a/dolphin.spec b/dolphin.spec index ec591ef..92289cc 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -1,7 +1,7 @@ # # spec file for package dolphin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,12 +39,12 @@ BuildRequires: kcmutils-devel >= 5.7.0 BuildRequires: kcompletion-devel >= 5.7.0 BuildRequires: kconfig-devel >= 5.7.0 BuildRequires: kcoreaddons-devel >= 5.7.0 +BuildRequires: kcrash-devel BuildRequires: kdbusaddons-devel >= 5.7.0 BuildRequires: kdoctools-devel >= 5.7.0 BuildRequires: kfilemetadata5-devel BuildRequires: ki18n-devel >= 5.7.0 BuildRequires: kiconthemes-devel >= 5.7.0 -BuildRequires: kcrash-devel BuildRequires: kinit-devel >= 5.7.0 BuildRequires: kio-devel >= 5.7.0 BuildRequires: knewstuff-devel >= 5.7.0 From e4d4254bc7b8898c71737b840a9048ea07437dcb43fa1087dbd227bbfdbe0f8b Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 13 Feb 2016 12:57:10 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=29 --- ...menus-of-the-control-menu-explicitly.patch | 60 ------------------- dolphin.changes | 3 + dolphin.spec | 6 -- fix-check-for-session-close.patch | 29 --------- 4 files changed, 3 insertions(+), 95 deletions(-) delete mode 100644 Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch delete mode 100644 fix-check-for-session-close.patch diff --git a/Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch b/Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch deleted file mode 100644 index 95f6ac0..0000000 --- a/Do-not-delete-sub-menus-of-the-control-menu-explicitly.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Frank Reininghaus -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(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(); - diff --git a/dolphin.changes b/dolphin.changes index 3313ab6..9309831 100644 --- a/dolphin.changes +++ b/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 diff --git a/dolphin.spec b/dolphin.spec index 92289cc..7f0f2a7 100644 --- a/dolphin.spec +++ b/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 diff --git a/fix-check-for-session-close.patch b/fix-check-for-session-close.patch deleted file mode 100644 index 778b8a1..0000000 --- a/fix-check-for-session-close.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Wolfgang Bauer -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; - } - -