pool/krusader
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 726075 from KDE:Extra

Browse Source 
- Update to 2.7.2
  * FIXED: Memory leak in the Locate dialog
  * FIXED: UDSEntry::insert deprecation warnings
  * FIXED: synchronize directory window: column widths 
    are incorrect (kde#167410)
  * FIXED: Context menu item "copy selected to clipboard" copies
    all result items (kde#328918)
  * FIXED: "Information - Krusader" dialog does not fit to screen
    width; text non-copyable (kde#330788)
  * FIXED: After trying to rename the file that's being updated,
    rename function stops working on any file on this tab
    (kde#392750)
  * FIXED: New Text File is created with 600 (-rw-------)
    permissions (kde#395609)
  * FIXED: Misleading ‘Created’ date in file properties
    (kde#397398)
  * FIXED: Compilation error because of QOverload usage
    (kde#405212)
  * FIXED: The list of search results doesn't get the focus
    (kde#410118)
  * FIXED: Krusader does not search correctly if the "Follow links"
    checkbox is disabled (kde#410120)
  * FIXED: Okteta support for versions >= 0.26 (due to oktetapart
    file layout change)
- Drop Prefer-to-find-oktetapart-by-desktop-file.patch, merged
  upstream
- Don't add -fpermissive to compiler options, no longer necessary
- Run spec-cleaner (forwarded request 726070 from wolfi323)

OBS-URL: https://build.opensuse.org/request/show/726075
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krusader?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2019-08-27 08:24:10 +00:00 committed by Git OBS Bridge
commit c9d195cb13
5 changed files with 40 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Prefer-to-find-oktetapart-by-desktop-file.patch
View File

@ -1,51 +0,0 @@
From 796b33f0e6c8b8545f7eb3bba8f6eb6f373e41c8 Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Sat, 9 Feb 2019 18:36:30 +0100
Subject: Prefer to find oktetapart by desktop file, not binary name
Summary:
Okteta >= 0.26 installs the oktetapart binary in the kf5/parts subdir
of the plugins, so the old check will not find it.
But that version also installs a desktop file again, so prefer to use that.
Test Plan:
Okteta KParts plugin is found also with devel version of what will be 0.26
in some weeks.
Reviewers: #krusader, nmel
Reviewed By: #krusader, nmel
Subscribers: nmel, yurchor
Differential Revision: https://phabricator.kde.org/D18881
---
krusader/KViewer/panelviewer.cpp | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/krusader/KViewer/panelviewer.cpp b/krusader/KViewer/panelviewer.cpp
index c6c6df1..80e69d8 100644
--- a/krusader/KViewer/panelviewer.cpp
+++ b/krusader/KViewer/panelviewer.cpp
@@ -146,8 +146,16 @@ KParts::ReadOnlyPart* PanelViewer::getHexPart()
if (KConfigGroup(krConfig, "General").readEntry("UseOktetaViewer", _UseOktetaViewer)) {
if (mimes->find("oktetapart") == mimes->end()) {
- KPluginLoader loader("oktetapart");
- if (KPluginFactory *factory = loader.factory()) {
+ KPluginFactory* factory = nullptr;
+ // Okteta >= 0.26 provides a desktop file, prefer that as the binary changes name
+ KService::Ptr service = KService::serviceByDesktopName("oktetapart");
+ if (service) {
+ factory = KPluginLoader(*service.data()).factory();
+ } else {
+ // fallback to search for desktopfile-less old variant
+ factory = KPluginLoader("oktetapart").factory();
+ }
+ if (factory) {
if ((part = factory->create<KParts::ReadOnlyPart>(this, this)))
mimes->insert("oktetapart", part);
}
--
cgit v1.1

3
krusader-2.7.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5c14d7e0698b84a1285efe7058074f760924d13d0823e1b5123fbe771907deb
size 2889568

3
krusader-2.7.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41a39a43b3c42dd1d1ecaea86df30caff6a061fecc1d66f60859b2a3ca976109
size 2912396

32
krusader.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Aug 26 07:18:41 UTC 2019 - wbauer@tmo.at
- Update to 2.7.2
* FIXED: Memory leak in the Locate dialog
* FIXED: UDSEntry::insert deprecation warnings
* FIXED: synchronize directory window: column widths
are incorrect (kde#167410)
* FIXED: Context menu item "copy selected to clipboard" copies
all result items (kde#328918)
* FIXED: "Information - Krusader" dialog does not fit to screen
width; text non-copyable (kde#330788)
* FIXED: After trying to rename the file that's being updated,
rename function stops working on any file on this tab
(kde#392750)
* FIXED: New Text File is created with 600 (-rw-------)
permissions (kde#395609)
* FIXED: Misleading ‘Created’ date in file properties
(kde#397398)
* FIXED: Compilation error because of QOverload usage
(kde#405212)
* FIXED: The list of search results doesn't get the focus
(kde#410118)
* FIXED: Krusader does not search correctly if the "Follow links"
checkbox is disabled (kde#410120)
* FIXED: Okteta support for versions >= 0.26 (due to oktetapart
file layout change)
- Drop Prefer-to-find-oktetapart-by-desktop-file.patch, merged
upstream
- Don't add -fpermissive to compiler options, no longer necessary
- Run spec-cleaner
-------------------------------------------------------------------
Tue Mar 12 06:41:59 UTC 2019 - wbauer@tmo.at

19
krusader.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package krusader
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,22 +12,20 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: krusader
Version: 2.7.1
Version: 2.7.2
Release: 0
Summary: A File Manager
License: GPL-2.0-or-later
Group: Productivity/File utilities
Url: https://krusader.org/
URL: https://krusader.org/
Source: http://download.kde.org/stable/krusader/%{version}/%{name}-%{version}.tar.xz
Source1: krusader_browse_iso.desktop
Source2: org.kde.krusader.root-mode.desktop
# PATCH-FIX-UPSTREAM
Patch0: Prefer-to-find-oktetapart-by-desktop-file.patch
BuildRequires: extra-cmake-modules >= 1.7.0
BuildRequires: fdupes
BuildRequires: libacl-devel
@ -62,7 +60,6 @@ BuildRequires: cmake(Qt5Widgets) >= 5.5.0
BuildRequires: cmake(Qt5Xml) >= 5.5.0
Requires: kio_iso = %{version}
Suggests: %{name}-doc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
An advanced twin panel (commander style) file manager for KDE.
@ -85,11 +82,9 @@ Group: Productivity/File utilities
An advanced twin panel (commander style) file manager for KDE.
%prep
%setup -q -n %{name}-%{version}
%autopatch -p1
%setup -q
%build
export RPM_OPT_FLAGS="%{optflags} -fpermissive"
%cmake_kf5 -d build
%make_jobs
@ -103,11 +98,9 @@ cp %{SOURCE2} %{buildroot}%{_kf5_applicationsdir}/
%fdupes %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root)
%license COPYING
%doc README AUTHORS ChangeLog TODO
%{_kf5_applicationsdir}/org.kde.krusader*.desktop
@ -126,7 +119,6 @@ cp %{SOURCE2} %{buildroot}%{_kf5_applicationsdir}/
%{_kf5_appstreamdir}/org.kde.krusader.appdata.xml
%files -n kio_iso
%defattr(-,root,root)
%config %{_kf5_configdir}/kio_isorc
%{_kf5_plugindir}/kio_iso.so*
%{_kf5_servicesdir}/iso.protocol
@ -134,7 +126,6 @@ cp %{SOURCE2} %{buildroot}%{_kf5_applicationsdir}/
%{_kf5_servicesdir}/ServiceMenus/krusader_browse_iso.desktop
%files doc
%defattr(-,root,root)
%doc %lang(en) %{_kf5_htmldir}/en/krusader
%doc %lang(uk) %{_kf5_htmldir}/uk/krusader
%doc %lang(sv) %{_kf5_htmldir}/sv/krusader