From c8f21a8ab3a16d407066e3da4db511893962b6fffa8b6a68326131af29d240b4 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 23 Dec 2020 07:32:14 +0000 Subject: [PATCH] Accepting request 858221 from home:luca_b:branches:KDE:Applications - Add upstream patch to fix crash on launch (kde#429628, kde#430434): * 0001-Fix-access-url-navigator-while-creating-new-tab-in-f.patch OBS-URL: https://build.opensuse.org/request/show/858221 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=236 --- ...avigator-while-creating-new-tab-in-f.patch | 27 +++++++++++++++++++ dolphin.changes | 7 +++++ dolphin.spec | 1 + 3 files changed, 35 insertions(+) create mode 100644 0001-Fix-access-url-navigator-while-creating-new-tab-in-f.patch diff --git a/0001-Fix-access-url-navigator-while-creating-new-tab-in-f.patch b/0001-Fix-access-url-navigator-while-creating-new-tab-in-f.patch new file mode 100644 index 0000000..86c27f8 --- /dev/null +++ b/0001-Fix-access-url-navigator-while-creating-new-tab-in-f.patch @@ -0,0 +1,27 @@ +From c95d7fae79a309ed7f2df393fa20257cb20d54a8 Mon Sep 17 00:00:00 2001 +From: Anthony Fieroni +Date: Sat, 12 Dec 2020 12:36:23 +0200 +Subject: [PATCH] Fix access url navigator while creating new tab in filename + search view BUG: 429628 BUG: 430434 + +Signed-off-by: Anthony Fieroni +--- + src/dolphinviewcontainer.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp +index 7260d2c4c..8dd309314 100644 +--- a/src/dolphinviewcontainer.cpp ++++ b/src/dolphinviewcontainer.cpp +@@ -390,7 +390,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled) + m_searchBox->setVisible(enabled); + + if (enabled) { +- const QUrl& locationUrl = m_urlNavigatorConnected->locationUrl(); ++ const QUrl& locationUrl = m_urlNavigator->locationUrl(); + m_searchBox->fromSearchUrl(locationUrl); + } + +-- +2.29.2 + diff --git a/dolphin.changes b/dolphin.changes index 22b6323..9100ade 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 22 21:59:29 UTC 2020 - Luca Beltrame + +- Add upstream patch to fix crash on launch (kde#429628, + kde#430434): + * 0001-Fix-access-url-navigator-while-creating-new-tab-in-f.patch + ------------------------------------------------------------------- Thu Dec 10 19:14:25 UTC 2020 - Fabian Vogt diff --git a/dolphin.spec b/dolphin.spec index 8154fa3..c09f4b8 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -32,6 +32,7 @@ Source3: dolphinsu.desktop Patch0: dolphin-go_up.diff # PATCH-FIX-UPSTREAM Patch1: 0001-Update-cached-viewContainer-geometry-every-time-they.patch +Patch2: 0001-Fix-access-url-navigator-while-creating-new-tab-in-f.patch # PATCH-FIX-OPENSUSE Patch100: 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch BuildRequires: extra-cmake-modules >= 1.6.0