pool/dolphin
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 359676 from KDE:Applications

Browse Source 
Update to KDE Apps 15.12.2

OBS-URL: https://build.opensuse.org/request/show/359676
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dolphin?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2016-02-22 09:14:22 +00:00 committed by Git OBS Bridge
commit d93a6a02de
5 changed files with 25 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();

3
dolphin-15.12.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fdeabaad25d7bc2480fa226ce326db2a39bdb8b612016d151344f0b65410ec52
size 658300

3
dolphin-15.12.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6387ea81bec8f3a0c35fe9e319450bcb234127516e77198fbbbc4eb062c60231
size 658360

19
dolphin.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
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#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
- 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

9
dolphin.spec
View File

@ -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
@ -17,7 +17,7 @@
Name: dolphin
Version: 15.12.1
Version: 15.12.2
Release: 0
Summary: KDE File Manager
License: GPL-2.0+
@ -26,8 +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
BuildRequires: baloo5-devel
BuildRequires: baloo5-widgets-devel
BuildRequires: extra-cmake-modules >= 1.6.0
@ -37,12 +35,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
@ -96,7 +94,6 @@ This package contains the libraries used by Dolphin and Konqueror.
%prep
%setup -q -n dolphin-%{version}
%patch0 -p1
%patch1 -p1
%build
%cmake_kf5 -d build