forked from pool/krusader
Accepting request 610720 from KDE:Extra
- Update to 2.7.0 * New feature: Quick Search in Bookmark menu * New feature: Tab pinning * New feature: Tooltip with file information when you hover a file name * New feature: Extended options for Tree Panel * New feature: Debug output option * Improved icon theme handling * Fixed 40+ issues including some regressions - Drop patches merged upstream: * fix-build-with-gcc48.patch * Panel-fixed-actions-in-PanelContextMenu-ignored.patch - Mark license file as %license instead of %doc - Adjust file lists OBS-URL: https://build.opensuse.org/request/show/610720 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krusader?expand=0&rev=50
This commit is contained in:
commit
bf277901f4
@ -1,115 +0,0 @@
|
|||||||
From 3ec61a42eaf842a4ceec11aed5cf6c6154f7cd07 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexander Bikadorov <alex.bikadorov@kdemail.net>
|
|
||||||
Date: Sun, 20 Aug 2017 21:20:28 +0200
|
|
||||||
Subject: Panel: fixed actions in PanelContextMenu ignored if ".." is current
|
|
||||||
|
|
||||||
FIXED: [ 383544 ] Unable to create new folder/file if '..' item is selected in current folder
|
|
||||||
BUG: 383544
|
|
||||||
---
|
|
||||||
krusader/Panel/krpopupmenu.cpp | 38 +++++++++++++++++--------------------
|
|
||||||
1 file changed, 17 insertions(+), 21 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/krusader/Panel/panelcontextmenu.cpp b/krusader/Panel/panelcontextmenu.cpp
|
|
||||||
index 22f05bb..241d996 100644
|
|
||||||
--- a/krusader/Panel/krpopupmenu.cpp
|
|
||||||
+++ b/krusader/Panel/krpopupmenu.cpp
|
|
||||||
@@ -320,24 +320,21 @@ void KrPopupMenu::addCreateNewMenu()
|
|
||||||
|
|
||||||
void KrPopupMenu::performAction(int id)
|
|
||||||
{
|
|
||||||
- if (_items.isEmpty())
|
|
||||||
- return; // sanity check, empty file list
|
|
||||||
-
|
|
||||||
- KFileItem *item = &_items.first();
|
|
||||||
+ const QUrl singleURL = _items.isEmpty() ? QUrl() : _items.first().url();
|
|
||||||
|
|
||||||
switch (id) {
|
|
||||||
case - 1 : // the user clicked outside of the menu
|
|
||||||
return ;
|
|
||||||
case OPEN_TAB_ID :
|
|
||||||
// assuming only 1 file is selected (otherwise we won't get here)
|
|
||||||
- panel->manager()->newTab(item->url(), panel);
|
|
||||||
+ panel->manager()->newTab(singleURL, panel);
|
|
||||||
break;
|
|
||||||
case OPEN_ID :
|
|
||||||
foreach(const KFileItem &fi, _items)
|
|
||||||
panel->func->execute(fi.name());
|
|
||||||
break;
|
|
||||||
case BROWSE_ID :
|
|
||||||
- panel->func->goInside(item->url().fileName());
|
|
||||||
+ panel->func->goInside(singleURL.fileName());
|
|
||||||
break;
|
|
||||||
case COPY_ID :
|
|
||||||
panel->func->copyFiles();
|
|
||||||
@@ -355,7 +352,7 @@ void KrPopupMenu::performAction(int id)
|
|
||||||
panel->func->deleteFiles(false);
|
|
||||||
break;
|
|
||||||
case EJECT_ID :
|
|
||||||
- krMtMan.eject(item->url().adjusted(QUrl::StripTrailingSlash).path());
|
|
||||||
+ krMtMan.eject(singleURL.adjusted(QUrl::StripTrailingSlash).path());
|
|
||||||
break;
|
|
||||||
/* case SHRED_ID :
|
|
||||||
if ( KMessageBox::warningContinueCancel( krApp,
|
|
||||||
@@ -364,13 +361,13 @@ void PanelContextMenu::performAction(int id)
|
|
||||||
KShred::shred( panel->func->files() ->getFile( item->name() ).adjusted(QUrl::RemoveTrailingSlash).path() );
|
|
||||||
break;*/
|
|
||||||
case OPEN_KONQ_ID :
|
|
||||||
- KToolInvocation::startServiceByDesktopName("konqueror", item->url().toDisplayString(QUrl::PreferLocalFile));
|
|
||||||
+ KToolInvocation::startServiceByDesktopName("konqueror", singleURL.toDisplayString(QUrl::PreferLocalFile));
|
|
||||||
break;
|
|
||||||
case CHOOSE_ID : // open-with dialog
|
|
||||||
panel->func->displayOpenWithDialog(_items.urlList());
|
|
||||||
break;
|
|
||||||
case MOUNT_ID :
|
|
||||||
- krMtMan.mount(item->url().adjusted(QUrl::StripTrailingSlash).path());
|
|
||||||
+ krMtMan.mount(singleURL.adjusted(QUrl::StripTrailingSlash).path());
|
|
||||||
break;
|
|
||||||
case NEW_LINK_ID :
|
|
||||||
panel->func->krlink(false);
|
|
||||||
@@ -388,7 +385,7 @@ void PanelContextMenu::performAction(int id)
|
|
||||||
KrTrashHandler::restoreTrashedFiles(_items.urlList());
|
|
||||||
break;
|
|
||||||
case UNMOUNT_ID :
|
|
||||||
- krMtMan.unmount(item->url().adjusted(QUrl::StripTrailingSlash).path());
|
|
||||||
+ krMtMan.unmount(singleURL.adjusted(QUrl::StripTrailingSlash).path());
|
|
||||||
break;
|
|
||||||
case COPY_CLIP_ID :
|
|
||||||
panel->func->copyToClipboard();
|
|
||||||
@@ -412,16 +409,15 @@ void KrPopupMenu::performAction(int id)
|
|
||||||
#ifdef SYNCHRONIZER_ENABLED
|
|
||||||
case SYNC_SELECTED_ID : {
|
|
||||||
QStringList selectedNames;
|
|
||||||
- foreach(const KFileItem &item, _items)
|
|
||||||
- selectedNames << item.name();
|
|
||||||
- if (panel->otherPanel()->view->numSelected()) {
|
|
||||||
- KrViewItemList otherItems;
|
|
||||||
- panel->otherPanel()->view->getSelectedKrViewItems(&otherItems);
|
|
||||||
-
|
|
||||||
- for (KrViewItemList::Iterator it2 = otherItems.begin(); it2 != otherItems.end(); ++it2) {
|
|
||||||
- QString name = (*it2) ->name();
|
|
||||||
- if (!selectedNames.contains(name))
|
|
||||||
- selectedNames.append(name);
|
|
||||||
+ for (const KFileItem item : _items) {
|
|
||||||
+ selectedNames.append(item.name());
|
|
||||||
+ }
|
|
||||||
+ KrViewItemList otherItems;
|
|
||||||
+ panel->otherPanel()->view->getSelectedKrViewItems(&otherItems);
|
|
||||||
+ for (KrViewItem *otherItem : otherItems) {
|
|
||||||
+ const QString name = otherItem->name();
|
|
||||||
+ if (!selectedNames.contains(name)) {
|
|
||||||
+ selectedNames.append(name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
SLOTS->slotSynchronizeDirs(selectedNames);
|
|
||||||
@@ -429,7 +425,7 @@ void KrPopupMenu::performAction(int id)
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case OPEN_TERM_ID :
|
|
||||||
- SLOTS->runTerminal(item->url().path());
|
|
||||||
+ SLOTS->runTerminal(singleURL.path());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
cgit v0.11.2
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
|||||||
From 846658caafc012d9706d0c6517195fcdb95c2f9a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Wolfgang Bauer <wbauer@tmo.at>
|
|
||||||
Date: Sun, 7 May 2017 22:42:57 +0200
|
|
||||||
Subject: Fix build with gcc 4.8
|
|
||||||
|
|
||||||
When trying to build krusader 2.6.0 with gcc 4.8, I got this error
|
|
||||||
message:
|
|
||||||
/home/abuild/rpmbuild/BUILD/krusader-2.6.0/krusader/FileSystem/sizecalculator.cpp:
|
|
||||||
In member function 'void SizeCalculator::slotStatResult(KJob*)':
|
|
||||||
/home/abuild/rpmbuild/BUILD/krusader-2.6.0/krusader/FileSystem/sizecalculator.cpp:139:98:
|
|
||||||
error: no matching function for call to
|
|
||||||
'SizeCalculator::connect(QPointer<KIO::DirectorySizeJob>&, void
|
|
||||||
(KJob::*)(KJob*, KJob::QPrivateSignal), SizeCalculator* const, void
|
|
||||||
(SizeCalculator::*)(KJob*))'
|
|
||||||
connect(m_directorySizeJob, &KIO::Job::result, this,
|
|
||||||
&SizeCalculator::slotDirectorySizeResult);
|
|
||||||
^
|
|
||||||
This patch fixes the problem.
|
|
||||||
|
|
||||||
Differential Revision: https://phabricator.kde.org/D5714
|
|
||||||
---
|
|
||||||
krusader/FileSystem/sizecalculator.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/krusader/FileSystem/sizecalculator.cpp b/krusader/FileSystem/sizecalculator.cpp
|
|
||||||
index aabe63d..eeb050f 100644
|
|
||||||
--- a/krusader/FileSystem/sizecalculator.cpp
|
|
||||||
+++ b/krusader/FileSystem/sizecalculator.cpp
|
|
||||||
@@ -151,7 +151,7 @@ void SizeCalculator::slotStatResult(KJob *job)
|
|
||||||
m_totalDirs++;
|
|
||||||
|
|
||||||
m_directorySizeJob = KIO::directorySize(url);
|
|
||||||
- connect(m_directorySizeJob, &KIO::Job::result, this, &SizeCalculator::slotDirectorySizeResult);
|
|
||||||
+ connect(m_directorySizeJob.data(), &KIO::Job::result, this, &SizeCalculator::slotDirectorySizeResult);
|
|
||||||
}
|
|
||||||
|
|
||||||
void SizeCalculator::slotDirectorySizeResult(KJob *)
|
|
||||||
--
|
|
||||||
cgit v0.11.2
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:7061a43cada6bd7df991ed2e3e5193b1d99144fa426c8331a2b54170b79b3a39
|
|
||||||
size 2726928
|
|
3
krusader-2.7.0.tar.xz
Normal file
3
krusader-2.7.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:8b41522b3b1297d5f293f4fe9becaf255bc06b16d5b19b220653da5e951e9a27
|
||||||
|
size 2875080
|
@ -1,3 +1,21 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 14 10:27:09 UTC 2018 - wbauer@tmo.at
|
||||||
|
|
||||||
|
- Update to 2.7.0
|
||||||
|
* New feature: Quick Search in Bookmark menu
|
||||||
|
* New feature: Tab pinning
|
||||||
|
* New feature: Tooltip with file information when you hover a
|
||||||
|
file name
|
||||||
|
* New feature: Extended options for Tree Panel
|
||||||
|
* New feature: Debug output option
|
||||||
|
* Improved icon theme handling
|
||||||
|
* Fixed 40+ issues including some regressions
|
||||||
|
- Drop patches merged upstream:
|
||||||
|
* fix-build-with-gcc48.patch
|
||||||
|
* Panel-fixed-actions-in-PanelContextMenu-ignored.patch
|
||||||
|
- Mark license file as %license instead of %doc
|
||||||
|
- Adjust file lists
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jan 12 18:30:27 UTC 2018 - wbauer@tmo.at
|
Fri Jan 12 18:30:27 UTC 2018 - wbauer@tmo.at
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package krusader
|
# spec file for package krusader
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: krusader
|
Name: krusader
|
||||||
Version: 2.6.0
|
Version: 2.7.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A File Manager
|
Summary: A File Manager
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
@ -26,10 +26,6 @@ Url: https://krusader.org/
|
|||||||
Source: http://download.kde.org/stable/krusader/%{version}/%{name}-%{version}.tar.xz
|
Source: http://download.kde.org/stable/krusader/%{version}/%{name}-%{version}.tar.xz
|
||||||
Source1: krusader_browse_iso.desktop
|
Source1: krusader_browse_iso.desktop
|
||||||
Source2: org.kde.krusader.root-mode.desktop
|
Source2: org.kde.krusader.root-mode.desktop
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch: fix-build-with-gcc48.patch
|
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch1: Panel-fixed-actions-in-PanelContextMenu-ignored.patch
|
|
||||||
BuildRequires: extra-cmake-modules >= 1.7.0
|
BuildRequires: extra-cmake-modules >= 1.7.0
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: libacl-devel
|
BuildRequires: libacl-devel
|
||||||
@ -88,8 +84,6 @@ An advanced twin panel (commander style) file manager for KDE.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch -p1
|
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export RPM_OPT_FLAGS="%{optflags} -fpermissive"
|
export RPM_OPT_FLAGS="%{optflags} -fpermissive"
|
||||||
@ -111,7 +105,8 @@ cp %{SOURCE2} %{buildroot}%{_kf5_applicationsdir}/
|
|||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc README AUTHORS COPYING ChangeLog TODO SVNNEWS
|
%license COPYING
|
||||||
|
%doc README AUTHORS ChangeLog TODO
|
||||||
%{_kf5_applicationsdir}/org.kde.krusader*.desktop
|
%{_kf5_applicationsdir}/org.kde.krusader*.desktop
|
||||||
%{_kf5_appsdir}/krusader
|
%{_kf5_appsdir}/krusader
|
||||||
%{_kf5_bindir}/krusader
|
%{_kf5_bindir}/krusader
|
||||||
@ -140,7 +135,5 @@ cp %{SOURCE2} %{buildroot}%{_kf5_applicationsdir}/
|
|||||||
%doc %lang(en) %{_kf5_htmldir}/en/krusader
|
%doc %lang(en) %{_kf5_htmldir}/en/krusader
|
||||||
%doc %lang(uk) %{_kf5_htmldir}/uk/krusader
|
%doc %lang(uk) %{_kf5_htmldir}/uk/krusader
|
||||||
%doc %lang(sv) %{_kf5_htmldir}/sv/krusader
|
%doc %lang(sv) %{_kf5_htmldir}/sv/krusader
|
||||||
%dir %{_kf5_htmldir}/pt_BR
|
|
||||||
%doc %lang(pt_BR) %{_kf5_htmldir}/pt_BR/krusader
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user