Hello community, here is the log from the commit of package libfm-qt for openSUSE:Factory checked in at 2020-01-12 23:24:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libfm-qt (Old) and /work/SRC/openSUSE:Factory/.libfm-qt.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libfm-qt" Sun Jan 12 23:24:32 2020 rev:7 rq:763661 version:0.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libfm-qt/libfm-qt.changes 2019-02-25 17:58:57.494201870 +0100 +++ /work/SRC/openSUSE:Factory/.libfm-qt.new.6675/libfm-qt.changes 2020-01-12 23:26:21.098859788 +0100 @@ -1,0 +2,6 @@ +Sun Jan 5 13:22:07 UTC 2020 - Namor Barcode <guta...@gmail.com> + +- Add patch "fix_query_cancellation_error.patch" from upstream, + fixed harmless pop-up error message (See https://github.com/lxqt/pcmanfm-qt/issues/1041) + +------------------------------------------------------------------- New: ---- fix_query_cancellation_error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfm-qt.spec ++++++ --- /var/tmp/diff_new_pack.Jcj8nZ/_old 2020-01-12 23:26:21.534859949 +0100 +++ /var/tmp/diff_new_pack.Jcj8nZ/_new 2020-01-12 23:26:21.538859950 +0100 @@ -26,6 +26,9 @@ Source: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: libfm-qt.keyring +# Fixed in upstream https://github.com/lxqt/libfm-qt/commit/4b7896836e868f069009e65ab75051ab64a1d583 +# Drop the patch after new version release. +Patch0: fix_query_cancellation_error.patch BuildRequires: cmake >= 3.1.0 # Needs private headers, see xdndworkaround.cpp BuildRequires: libQt5Gui-private-headers-devel @@ -75,6 +78,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake -DPULL_TRANSLATIONS=No ++++++ fix_query_cancellation_error.patch ++++++ >From 4b7896836e868f069009e65ab75051ab64a1d583 Mon Sep 17 00:00:00 2001 From: Tsu Jan <tsujan2...@gmail.com> Date: Fri, 6 Dec 2019 02:53:33 +0330 Subject: [PATCH] Set info query cancellation error to mild in dir list job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes https://github.com/lxqt/pcmanfm-qt/issues/1041 For some reason, that error may happen with MTP, in which case, pcmanfm-qt shouldn't show an annoying and useless error message (pcmanfm-qt only shows errors with severalties greater than `ErrorSeverity::MILD`). Moreover, if it happens in another case, the message will be useless — although I haven't encountered it without MTP. SIDE NOTE: The current patch can be seen as the followup of an old patch, which fixed a similar issue: https://github.com/lxqt/libfm-qt/commit/670d80631b20f74eec9ffc984baf12c353398783 --- src/core/dirlistjob.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/dirlistjob.cpp b/src/core/dirlistjob.cpp index d3058b1..5a7bba4 100644 --- a/src/core/dirlistjob.cpp +++ b/src/core/dirlistjob.cpp @@ -30,7 +30,9 @@ void DirListJob::exec() { false }; if(!dir_inf) { - ErrorAction act = emitError(err, ErrorSeverity::MODERATE); + ErrorAction act = emitError(err, err.domain() == G_IO_ERROR && err.code() == G_IO_ERROR_CANCELLED + ? ErrorSeverity::MILD // may happen with MTP + : ErrorSeverity::MODERATE); if(act == ErrorAction::RETRY) { err.reset(); goto _retry;
