Hello community, here is the log from the commit of package krusader for openSUSE:Factory checked in at 2019-03-13 09:14:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krusader (Old) and /work/SRC/openSUSE:Factory/.krusader.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krusader" Wed Mar 13 09:14:01 2019 rev:52 rq:684305 version:2.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/krusader/krusader.changes 2018-08-15 10:35:54.772020232 +0200 +++ /work/SRC/openSUSE:Factory/.krusader.new.28833/krusader.changes 2019-03-13 09:14:04.119393927 +0100 @@ -1,0 +2,6 @@ +Tue Mar 12 06:41:59 UTC 2019 - [email protected] + +- Add Prefer-to-find-oktetapart-by-desktop-file.patch to make it + compatible with the upcoming okteta 0.26 release + +------------------------------------------------------------------- @@ -588 +594 @@ -Sat Apr 18 12:16:01 CET 2009 - bitshuffler #[email protected] +Sat Apr 18 12:16:01 CEST 2009 - bitshuffler #[email protected] New: ---- Prefer-to-find-oktetapart-by-desktop-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krusader.spec ++++++ --- /var/tmp/diff_new_pack.inFvZL/_old 2019-03-13 09:14:04.935393843 +0100 +++ /var/tmp/diff_new_pack.inFvZL/_new 2019-03-13 09:14:04.935393843 +0100 @@ -20,12 +20,14 @@ Version: 2.7.1 Release: 0 Summary: A File Manager -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/File utilities 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 @@ -84,6 +86,7 @@ %prep %setup -q -n %{name}-%{version} +%autopatch -p1 %build export RPM_OPT_FLAGS="%{optflags} -fpermissive" ++++++ Prefer-to-find-oktetapart-by-desktop-file.patch ++++++ >From 796b33f0e6c8b8545f7eb3bba8f6eb6f373e41c8 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" <[email protected]> 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
