commit kdebase4 for openSUSE:12.1:Update:Test

Hello community, here is the log from the commit of package kdebase4 for openSUSE:12.1:Update:Test checked in at 2011-12-14 17:37:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/kdebase4 (Old) and /work/SRC/openSUSE:12.1:Update:Test/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/kdebase4/kdebase4.changes 2011-12-14 17:37:55.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.kdebase4.new/kdebase4.changes 2011-12-14 17:37:55.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Nov 26 20:15:01 UTC 2011 - ctrippe@opensuse.org + +- Fix crash when toggling the menu-bar visibility (bnc#720238) + +------------------------------------------------------------------- +Fri Nov 11 12:37:11 UTC 2011 - idonmez@suse.com + +- Depend on kwebkitpart instead of kwebkitpart-devel + +------------------------------------------------------------------- New: ---- fix_dolphin_crash_toggle_menubar.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.ySETCN/_old 2011-12-14 17:37:57.000000000 +0100 +++ /var/tmp/diff_new_pack.ySETCN/_new 2011-12-14 17:37:57.000000000 +0100 @@ -31,10 +31,11 @@ Patch0: 4_7_BRANCH.diff Patch1: dolphin-go_up.diff Patch2: bnc722684-fix-renaming-in-folderview.diff +Patch3: fix_dolphin_crash_toggle_menubar.diff BuildRequires: NetworkManager-devel BuildRequires: bluez-devel BuildRequires: fdupes -BuildRequires: kwebkitpart-devel +BuildRequires: kwebkitpart BuildRequires: libkde4-devel >= %{version} BuildRequires: libqimageblitz-devel BuildRequires: libraw1394-devel @@ -56,6 +57,7 @@ %patch0 -p1 %patch1 %patch2 +%patch3 -p1 %build %cmake_kde4 -d build ++++++ fix_dolphin_crash_toggle_menubar.diff ++++++ Subject: Fix crash when toggling the menu-bar visibility From: Peter Penz Bug: bnc#720238 Patch-upstream: kde >= 4.7.4 commit 4425d906427bf5138d6f26f9ca7d3deabd0659ee Author: Peter Penz Date: Sat Nov 19 06:49:32 2011 +0100 Fix crash when toggling the menu-bar visibility Use a queued connection to prevent that the menu gets hidden during it is still open. Thanks to Christoph Feck for the hint! Frank and I could not reproduce the issue in our environments even when following the steps from bug 278366, however Christoph's hint sounds sane and let's hope it works (leaves a bad gut feeling to "fix" bugs without being able to verify them). BUG: 286822 CCBUG: 278366 FIXED-IN: 4.7.4 diff --git a/dolphin/src/dolphinmainwindow.cpp b/dolphin/src/dolphinmainwindow.cpp index 407cb4b..12f867c 100644 --- a/dolphin/src/dolphinmainwindow.cpp +++ b/dolphin/src/dolphinmainwindow.cpp @@ -1712,7 +1712,9 @@ void DolphinMainWindow::setupActions() connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal())); // setup 'Settings' menu - KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection()); + KToggleAction* showMenuBar = KStandardAction::showMenubar(0, 0, actionCollection()); + connect(showMenuBar, SIGNAL(triggered(bool)), // Fixes #286822 + this, SLOT(toggleShowMenuBar()), Qt::QueuedConnection); KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); // not in menu actions -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org