From b15db55f03434ad6b6e284ce6d8cd9c0fcb7f10e871733b8ed00085b50491f12 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 28 Mar 2020 13:56:48 +0000 Subject: [PATCH] KDE Applications 20.03.80 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=204 --- ...osition-of-Create-New-menu-item-in-v.patch | 64 ------------------- dolphin-19.12.3.tar.xz | 3 - dolphin-19.12.3.tar.xz.sig | 11 ---- dolphin-20.03.80.tar.xz | 3 + dolphin-20.03.80.tar.xz.sig | 16 +++++ dolphin-go_up.diff | 6 +- dolphin.changes | 17 +++++ dolphin.spec | 17 +++-- 8 files changed, 47 insertions(+), 90 deletions(-) delete mode 100644 0001-Restore-former-position-of-Create-New-menu-item-in-v.patch delete mode 100644 dolphin-19.12.3.tar.xz delete mode 100644 dolphin-19.12.3.tar.xz.sig create mode 100644 dolphin-20.03.80.tar.xz create mode 100644 dolphin-20.03.80.tar.xz.sig diff --git a/0001-Restore-former-position-of-Create-New-menu-item-in-v.patch b/0001-Restore-former-position-of-Create-New-menu-item-in-v.patch deleted file mode 100644 index 3ab0aac..0000000 --- a/0001-Restore-former-position-of-Create-New-menu-item-in-v.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 4c923a531f77bc4c44b5c8687fe18dd6438eb9c5 Mon Sep 17 00:00:00 2001 -From: Nate Graham -Date: Sun, 9 Feb 2020 08:58:10 -0700 -Subject: [PATCH] Restore former position of "Create New" menu item in viewport - context menu - -Summary: -I've seem various complaints from users about the fact that the {nav Create New...} menu -item in the viewport context menu is now below {nav Open With} item. All the other -changes to menus seem to have been well-received but this one has garnered criticism. -Looking through D23757 and D11884, I can't actually see that this was intentional, so -it might even be a bug. - -Either way, this patch restores the old position of the {nav Create New} menu items at -the top of the Viewport context menu. - -BUG: 417640 -FIXED-IN: 20.04.0 - -Test Plan: {F8093605} - -Reviewers: #vdg, #dolphin, elvisangelaccio, ndavis - -Reviewed By: #vdg, ndavis - -Subscribers: asturmlechner, markuss, kfm-devel - -Tags: #dolphin - -Differential Revision: https://phabricator.kde.org/D27267 ---- - src/dolphincontextmenu.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -Index: dolphin-19.12.2/src/dolphincontextmenu.cpp -=================================================================== ---- dolphin-19.12.2.orig/src/dolphincontextmenu.cpp -+++ dolphin-19.12.2/src/dolphincontextmenu.cpp -@@ -328,12 +328,6 @@ void DolphinContextMenu::openViewportCon - fileItemActions.setParentWidget(m_mainWindow); - fileItemActions.setItemListProperties(baseUrlProperties); - -- // Don't show "Open With" menu items if the current dir is empty, because there's -- // generally no app that can do anything interesting with an empty directory -- if (view->itemsCount() != 0) { -- addOpenWithActions(fileItemActions); -- } -- - // Set up and insert 'Create New' menu - KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu(); - newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown()); -@@ -341,6 +335,12 @@ void DolphinContextMenu::openViewportCon - newFileMenu->setPopupFiles(m_baseUrl); - addMenu(newFileMenu->menu()); - -+ // Don't show "Open With" menu items if the current dir is empty, because there's -+ // generally no app that can do anything interesting with an empty directory -+ if (view->itemsCount() != 0) { -+ addOpenWithActions(fileItemActions); -+ } -+ - QAction* pasteAction = createPasteAction(); - addAction(pasteAction); - diff --git a/dolphin-19.12.3.tar.xz b/dolphin-19.12.3.tar.xz deleted file mode 100644 index 7d86497..0000000 --- a/dolphin-19.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba16f4d5be5ccc3c135a913f2e3c7dd3b7a492cfc9ec9ae518f714fcd7c2ab47 -size 4781456 diff --git a/dolphin-19.12.3.tar.xz.sig b/dolphin-19.12.3.tar.xz.sig deleted file mode 100644 index abb1baa..0000000 --- a/dolphin-19.12.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl5drUMACgkQ29LOiT4t -HIeEWQf/V4FRvOGnIhTU0DMDLOE5vDOPM+wdwiRH1TDcmS9RFsobM9G07LQXP/nk -ZD/v9IMzsCWfwyV2exUK5eHFY37xgaLc7Y+ht6rv5Kc7l8lNEIpdj1BuGaXXTgkw -K1XqyYgf0aFTEFjAFdJ8IAeZdl9o3UbGAW/5az9kRuS4yLimKdRZezcl9eO9pQIa -REFQ1tHOiCbHQras+018VbUzaNEnlTW1Inh243AZGIEfLhQ24/6j7uY7MqOGlLxH -WK7+uhA+d1BSNKUKO2Kn6WL+PolR77OA9crqFC3mTHwu0Zj+zi/Q3Aqb7D4HCd+7 -QeQdisbvct3wcA1JgzzRObw4pQ6AFQ== -=YUAT ------END PGP SIGNATURE----- diff --git a/dolphin-20.03.80.tar.xz b/dolphin-20.03.80.tar.xz new file mode 100644 index 0000000..9cd4d48 --- /dev/null +++ b/dolphin-20.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0493142287102f6ad0e6a2db940b637d4ce2749e79bd140b354d93fb9420a87 +size 4792200 diff --git a/dolphin-20.03.80.tar.xz.sig b/dolphin-20.03.80.tar.xz.sig new file mode 100644 index 0000000..12b7911 --- /dev/null +++ b/dolphin-20.03.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl50u/wACgkQOmpNuDnq +ptfM+w/8CvVMFO6pTCwpENIuBnrLqzmYeJiqC1il6Zr6cNkC3CQxGk/QVVUW5rQR +WoavOleKahrKwU6ZVezX5TTvbTr8dWG0v/dHfYfwyMCRKF9M7PEAsSyUlYPUKB0o +DStbgQ+4Y8AioPpaQBwQmxUQwbST2iuqOeD3jQUclpefu9Zn3qq1M/DnG3Z6jBo5 +cUYUwPEKxHyUpR6tM2aU4XoOEV//Etid7P37EXFwD9I14TViyDKIPf5tRy+JXapC +nT/891pGV5sMwX2WtstmWEa3NzTqst874Y/lEUzZbuB3KWQ4blu/S2fq3B86vRf5 +jVHH3vgVu+j/mtquKxDR23ijh11B+KLYD1NTuZoHS0N2R4wNg2jhLIt0tirO3pSm +8/qr/b/RYAnYBUrv8HGZLK279iVNkVHXlW+Vj/i8L5Ddc91EOMLwVLMWvonSr8ZT ++/W1g67W3N3Yl9+zVup06oFdILSNTBJzqs2y6FWTei0W97ZQimt75ql5B33YEpb7 +TFXic0WM1P0p81u/JeYtEtumJJLL7UwhGEsQjaExo+Gfp+g4ojE2vqslr+K4gByC +AGY53XNNVpFtgitZRs9fCur9Vq0mwYsTNQqyIHHZFD/k+Sd8sCCsMn5wHDDM6GMD +U/Sy1AUne33af4aAet3w0YqHs8i04umvfAKthwt+d5XdYTzHkks= +=l6Y6 +-----END PGP SIGNATURE----- diff --git a/dolphin-go_up.diff b/dolphin-go_up.diff index e52912f..90d3fcb 100644 --- a/dolphin-go_up.diff +++ b/dolphin-go_up.diff @@ -1,7 +1,7 @@ -Index: dolphin-19.12.2/src/dolphinui.rc +Index: dolphin-19.03.60git.20191013T183353~0caab3c0a/src/dolphinui.rc =================================================================== ---- dolphin-19.12.2.orig/src/dolphinui.rc -+++ dolphin-19.12.2/src/dolphinui.rc +--- dolphin-19.03.60git.20191013T183353~0caab3c0a.orig/src/dolphinui.rc 2019-10-13 18:33:53.000000000 +0200 ++++ dolphin-19.03.60git.20191013T183353~0caab3c0a/src/dolphinui.rc 2019-10-14 07:14:11.449801577 +0200 @@ -99,6 +99,7 @@ Main Toolbar diff --git a/dolphin.changes b/dolphin.changes index a9cd066..4592861 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sun Mar 22 09:16:34 UTC 2020 - Luca Beltrame + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Too many changes since 19.12.3, only listing bugfixes: + * Fixes multiple KVersionControlPlugin::fileName() calls on entering or updating directory. (kde#415698) + * Restore former position of "Create New" menu item in viewport context menu (kde#417640) + * Add natural sorting and case-insensitive sorting for all role-types (kde#406296) + * Fixes multiple VCS plugin calls on single directory update. (kde#415698) + * Use QDesktopServices to open urls not supported by dolphin (kde#372642) + * Use more conventional "Add to Places" text for that action (kde#416064) + * make link with LLVM (kde#410237) + * Allow dolphin to format DateTime at later stage than KBalooRolesProvider (kde#411173) + ------------------------------------------------------------------- Thu Mar 5 20:35:42 UTC 2020 - Luca Beltrame diff --git a/dolphin.spec b/dolphin.spec index b249087..67a8ff8 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -21,23 +21,17 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: dolphin -Version: 19.12.3 +Version: 20.03.80 Release: 0 Summary: KDE File Manager License: GPL-2.0-or-later Group: Productivity/File utilities URL: https://www.kde.org -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz Source3: dolphinsu.desktop Patch0: dolphin-go_up.diff # PATCH-FIX-OPENSUSE Patch1: 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch -# PATCH-FIX-UPSTREAM -Patch2: 0001-Restore-former-position-of-Create-New-menu-item-in-v.patch BuildRequires: extra-cmake-modules >= 1.6.0 BuildRequires: update-desktop-files BuildRequires: cmake(KF5Activities) >= 5.7.0 @@ -73,6 +67,10 @@ Requires: dolphin-part = %{version}-%{release} Recommends: kio-extras5 Recommends: konsole-part Obsoletes: dolphin5 +%if %{with lang} +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif %description This package contains the default file manager of KDE Workspaces. @@ -106,10 +104,11 @@ This package contains the libraries used by Dolphin and Konqueror. %if %{with lang} %package -n %{name}-part-lang +# FIXME: consider using %%lang_package macro Summary: Translations for package %{name} Group: System/Localization Requires: %{name}-part = %{version} -Supplements: packageand(bundle-lang-other:%{name}-part) +Supplements: (bundle-lang-other and %{name}-part) Provides: %{name}-lang = %{version} Obsoletes: %{name}-lang < %{version} Provides: %{name}-part-lang-all = %{version}