From 662f7e32ca3d8632246b90cdaa1d833a76eca7e2 Mon Sep 17 00:00:00 2001
From: luca_b <>
Date: Jan 08 2021 16:36:48 +0000
Subject: Update dolphin to version 20.12.1 / rev 76 via SR 861115
https://build.opensuse.org/request/show/861115
by user luca_b + dimstar_suse
KDE Applications 20.12.1
---
diff --git a/.files b/.files
index 6310212..0b8c828 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 4cfedfe..f370182 100644
--- a/.rev
+++ b/.rev
@@ -604,4 +604,12 @@
858303
+
+ 843984f8cca1d25420e6f1c9a511b6ee
+ 20.12.1
+
+ dimstar_suse
+ KDE Applications 20.12.1
+ 861115
+
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
deleted file mode 100644
index d0b97ba..0000000
--- a/0001-Fix-access-url-navigator-while-creating-new-tab-in-f.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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-20.12.0.tar.xz b/dolphin-20.12.0.tar.xz
deleted file mode 120000
index 4a338b6..0000000
--- a/dolphin-20.12.0.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeib6tv56h62asxjoy6axwl445znq6rktpn2tmz4on6kuqt6da6d7pi
\ No newline at end of file
diff --git a/dolphin-20.12.0.tar.xz.sig b/dolphin-20.12.0.tar.xz.sig
deleted file mode 100644
index c6b9d69..0000000
--- a/dolphin-20.12.0.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/JhHYACgkQ29LOiT4t
-HIcwhwf+I4NyFYL+4Gl0V+qlR81gC810WSjiy6LzdT93KrFlNbLgiuNU/diHg6Ft
-+dOiY7xPISE36EV8FkmU5PqieJuYeTEj3wjpJHre/pTOsc8gaduQCK7F5QqjwHv7
-0qwbystclUskQeAhaqVYhiCbnf9fC5YqSkPNg7w5OamzS97zUjTn+Cn+QeNHBHG4
-QZt0QVbNRytQ71LMQpG1jNhXdDXXIbUip7HMzWdV9J9wwcp1PHEKRvuccnYFmzRg
-4PC9qFo2n8t7RO8taprkq1biyHNnQoksxagQg0AdKndDHhVyJYt/YFy1ncnhA3SU
-YKSfDNLbBBFXHJPC2qvylh1aCZLKmQ==
-=QFk+
------END PGP SIGNATURE-----
diff --git a/dolphin-20.12.1.tar.xz b/dolphin-20.12.1.tar.xz
new file mode 120000
index 0000000..37b1aba
--- /dev/null
+++ b/dolphin-20.12.1.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeidpo453fgnbu5b4geo5yv4lvz4lgxi6khgg2vwlxbdpmv7dj2crfi
\ No newline at end of file
diff --git a/dolphin-20.12.1.tar.xz.sig b/dolphin-20.12.1.tar.xz.sig
new file mode 100644
index 0000000..1b48c61
--- /dev/null
+++ b/dolphin-20.12.1.tar.xz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/zwesACgkQ29LOiT4t
+HIf8nAgAjfji+qi0SQInjutZdaLqgVo1ghYeohUNue4FZetfg/HIJpxiW9/7+zo9
+BC05auzKZr92Y+yi17GOSO+cq6A/iQgjvM9TzP8ng09gz9hCe15c2cDfKrKwz8gG
+dUMtvhILgf6lpWhJFzPT4Bn937O2pVBpojwZha7Cg/dPiItqMFKKiXlcfc9ywaZ2
+x2fqXTtiVcm0ixszICBFC6Gn27v2HtIdhv48pm1rxEvikxp/MQPGl4wVlGDKWGfq
+I2iGQQcWZT/mQ5y3KXQRX+eAeUYMfDT9mdzCvrrLz090205epnyeDBFSLT+tD/SY
+atu3UIEe6FimIft+mN0SKj3FYnYKtg==
+=odj1
+-----END PGP SIGNATURE-----
diff --git a/dolphin.changes b/dolphin.changes
index 48c1d9a..bd229e5 100644
--- a/dolphin.changes
+++ b/dolphin.changes
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Tue Jan 5 12:24:43 UTC 2021 - Luca Beltrame
+
+- Update to 20.12.1
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2021-01-apps-update
+- Changes since 20.12.0:
+ * Fix vertical scroll with horizontal component not being recognized properly (kde#430532)
+ * DolphinContextMenu: drop wrong assert
+ * Fix crash when device with capacitybar is dragged (kde#430441)
+ * Use setShowOpenOrExecuteDialog(true) with OpenUrlJob
+ * Fix access url navigator while creating new tab in filename search view (kde#429628, kde#430434)
+ * Fix KIO warning when URL is empty
+ * servicemenuinstaller: Remove file if it already exists
+ * Fix PlacesItemModelTest, 2nd try
+- Dropped patches, now upstream:
+ * 0001-Fix-access-url-navigator-while-creating-new-tab-in-f.patch
+
+-------------------------------------------------------------------
Tue Dec 22 21:59:29 UTC 2020 - Luca Beltrame
- Add upstream patch to fix crash on launch (kde#429628,
diff --git a/dolphin.spec b/dolphin.spec
index af84273..6e118b5 100644
--- a/dolphin.spec
+++ b/dolphin.spec
@@ -1,7 +1,7 @@
#
# spec file for package dolphin
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: dolphin
-Version: 20.12.0
+Version: 20.12.1
Release: 0
Summary: KDE File Manager
License: GPL-2.0-or-later
@@ -32,7 +32,6 @@ 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