diff --git a/debian/changelog b/debian/changelog index ce3c9eb..0932057 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libfm-qt (1.1.0-0ubuntu6) UNRELEASED; urgency=medium + + * Backport upstream patches: + - Fixed crash with empty URI scheme of folder path + + https://github.com/lxqt/libfm-qt/commit/472128 + + https://github.com/lxqt/libfm-qt/pull/808 + + -- Simon Quigley Sat, 11 Jun 2022 14:02:20 -0400 + libfm-qt (1.1.0-0ubuntu5) kinetic; urgency=medium * Add some missing Breaks/Replaces. diff --git a/debian/patches/fix-uri-scheme-crash.patch b/debian/patches/fix-uri-scheme-crash.patch new file mode 100644 index 0000000..c94a5ef --- /dev/null +++ b/debian/patches/fix-uri-scheme-crash.patch @@ -0,0 +1,25 @@ +From 472128c3bfc301f3258bd99501a88ef4097d0429 Mon Sep 17 00:00:00 2001 +From: tsujan +Date: Thu, 9 Jun 2022 01:35:27 +0430 +Subject: [PATCH] Fixed crash with empty URI scheme of folder path (#808) + +An empty URI scheme is possible when trying to open a folder with an empty path (like when the desktop path is empty and pcmanfm-qt's desktop module is started). + +Fixes https://github.com/lxqt/lxqt-session/issues/439 +--- + src/core/folder.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/folder.cpp b/src/core/folder.cpp +index 5bb40137..710a9132 100644 +--- a/src/core/folder.cpp ++++ b/src/core/folder.cpp +@@ -532,7 +532,7 @@ void Folder::onDirListFinished() { + const auto& infos = job->files(); + + // with "search://", there is no update for infos and all of them should be added +- if(strcmp(dirPath_.uriScheme().get(), "search") == 0) { ++ if(dirPath_.hasUriScheme("search")) { + files_to_add = infos; + for(auto& file: files_to_add) { + files_[file->path().baseName().get()] = file; diff --git a/debian/patches/series b/debian/patches/series index 688bca3..34b5009 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-metadata-for-trusting-executables.patch +fix-uri-scheme-crash.patch