rpm/libfm-qt
SHA256
1
0
Fork 0
forked from pool/libfm-qt
Code Pull Requests Activity

Accepting request 797593 from home:gmbr3:branches:X11:LXQt

Browse Source 
- Remove fix_query_cancellation_error.patch: contained in upstream
- Update to version 0.15.0
  * Opening of remote links in desktop entries is made possible.
  * Better drag-and-drop from remote folders to external apps.
  * SMB and FTP recursive copy/paste is fixed.
  * Lack of file monitoring in remote folders and some file systems is worked around as far as possible.
  * Richer file tooltips.
  * Easier and richer auto-completion.
  * Row-by-row scrolling inside view when Shift is pressed.
  * Smarter extension handling on saving with LXQt file dialog.
  * Deletion time is added to Trash.
  * Drag-and-drop to side-pane is supported.
  * Bookmark drag-and-drop is improved.
  * An option is added to show hidden files after others.
  * Disabled Create New in context menu when not possible.
  * Selected items are activated with Enter/Return.
  * The order of files is respected on launching multiple files.
  * Mount passwords can be saved (temporarily or permanently) if gnome-keyring is present.
  * Many fixes and enhancements.

OBS-URL: https://build.opensuse.org/request/show/797593
OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/libfm-qt?expand=0&rev=21
This commit is contained in:
Michael Vetter 2020-04-25 13:47:12 +00:00 committed by Git OBS Bridge
parent 08de5e9fc7
commit e3b2b22d61
7 changed files with 58 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fix_query_cancellation_error.patch
View File

@ -1,33 +0,0 @@
From 4b7896836e868f069009e65ab75051ab64a1d583 Mon Sep 17 00:00:00 2001
From: Tsu Jan <tsujan2000@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;

3
libfm-qt-0.14.1.tar.xz
View File

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

16
libfm-qt-0.14.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEfHM7pfWFqtZp5NI6QsnI069epeMFAlxy05IACgkQQsnI069e
peMYPBAAhdTD2ImY82XN6yheGyf5bhFjG59OpXDyW3Pi6Bx914VA7c0BIgEOFrJO
d2ZqCNDLEsk0Cs8z6altbNF08bxo6eVGAmQmU/FzaEma4Wh526q/4RJ5yKWJC1TQ
vDVHdSpBU92kDapEgyBZWO+dF2+7E7mNpqdJb573zZJA3v0mPTDCtGiThQ4A5AWu
oynDGVI2ScTqelxhb6Y46dQXpvv7mwUhZXfAsJ8Z2hNGAjQJH8WUFXWWJZX/I30l
/pAIehVmvy2BXzGs+VR4rKozHA3RXHSfX21RXCW9zvf1fj6IrX8291qqEVT82JWA
zkc0T71USZm4CVgfCyX7nt4J9mv0RiwW3fN46T0W9mYgRzuOYMzMaOcNIBqEeJ8J
zb/wp1D+siYBczap9gEX35DNpnYNEIR/yT45APbpJYdr2ThpN8zDYrTWxPLK15u1
tADqPcBs1joUbJM2aN6fiIVONgO/XEAHs0PuwOxwoa9exxp4gQDzEZGDRUBlzYJA
8i/vW06eqYCujbpO2F2iCfaNnkmxD6ZgTaFKabIujrmQzdkiLM7CkXvzuOjnz2Yu
O0yKfnpf9PSzPoCp0Y/ocOJ2PLkhnnguiAJRt4lp6mckPr6dwqnzzpux9uXKO6e4
DhVXfRPYjYQVnM8eVfZxDiJJelDG1d6BS9Ur2/pOaTXRDGdx5Fk=
=3LFp
-----END PGP SIGNATURE-----

3
libfm-qt-0.15.0.tar.xz Normal file
View File

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

17
libfm-qt-0.15.0.tar.xz.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAl6jBlgVHHRzdWphbjIw
MDBAZ21haWwuY29tAAoJEL55MAetIt9+ohYQAMur9unNPM+qHCsRkTHnTpza2uOw
N0fFgmgLAeVzAo2UGXrs1douwJuawzYplNOHEWlnneb3tuFg6T5UcC2VcTI6IOHv
rBkaNNEnXV30m27Bb0xKJCo7Z5QXSbwKzXPFPR/5wPj8Zx26PyR+hjSfidGbAJc/
EJsTAkXKR3Yule5SXgbqbw9//LxTSZLLaT02zoUbVjHj9N6FQVJ+uu5csLkazArv
eaA2Tpk7vrfHDbRjHYcF816SdXm3TWmYGdrct3KOsZcPirmaj9JtaEm8YO0LPW4L
VBmSLhPM+netMOqOL3yv0PD9aJDEaZRomeXVDVCgXv7c54EgEHFFVoIaV9P4caUj
c1eDZD+zh/gxh9YN/Ur8r/d56TwcS297SQJ/2CIHPUItbpsUYsmvK2tJFg20Q5pX
fmgGSmbmC15BUjuHgJx+rUEBbWXuPfb10SuoZKEACDKgBqjlVsGVE5B6Q8G1fWOM
0vGdyNB0a0pFgY4jQFtE9XhniAAAvsUv54VSCWyoHX5F6bVHgjZVgT8xwc/Kv1ut
IuGTgwGOEaiJdSWwBmreRVe8VbVJkLo7LT3GjXcmgb2y+ase/hQSKSRH5gvWn80A
aZTNf2wtZusyF2JNSlLWX0Uz3UzQqzuqXOItkYM07c58yuivOcjM+eOyaFfKE1v3
HKohb0bo2lBmQVun
=3xxu
-----END PGP SIGNATURE-----

23
libfm-qt.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Apr 24 20:38:08 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Remove fix_query_cancellation_error.patch: contained in upstream
- Update to version 0.15.0
* Opening of remote links in desktop entries is made possible.
* Better drag-and-drop from remote folders to external apps.
* SMB and FTP recursive copy/paste is fixed.
* Lack of file monitoring in remote folders and some file systems is worked around as far as possible.
* Richer file tooltips.
* Easier and richer auto-completion.
* Row-by-row scrolling inside view when Shift is pressed.
* Smarter extension handling on saving with LXQt file dialog.
* Deletion time is added to Trash.
* Drag-and-drop to side-pane is supported.
* Bookmark drag-and-drop is improved.
* An option is added to show hidden files after others.
* Disabled Create New in context menu when not possible.
* Selected items are activated with Enter/Return.
* The order of files is respected on launching multiple files.
* Mount passwords can be saved (temporarily or permanently) if gnome-keyring is present.
* Many fixes and enhancements.
-------------------------------------------------------------------
Sun Jan 5 13:22:07 UTC 2020 - Namor Barcode <gutaper@gmail.com>

33
libfm-qt.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libfm-qt
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 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
@ -17,28 +17,25 @@
Name: libfm-qt
Version: 0.14.1
Version: 0.15.0
Release: 0
Summary: Library providing components to build desktop file managers
License: LGPL-2.1-or-later AND GPL-2.0-or-later
Group: Development/Libraries/C and C++
URL: http://lxqt.org
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
Source: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Source1: https://github.com/lxqt/%{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
BuildRequires: libqt5-qttools-devel
BuildRequires: lxqt-build-tools-devel >= 0.6.0
BuildRequires: lxqt-build-tools-devel >= 0.7.0
BuildRequires: pkgconfig
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: pkgconfig(Qt5Widgets) >= 5.7.1
BuildRequires: pkgconfig(Qt5X11Extras) >= 5.7.1
BuildRequires: pkgconfig(Qt5Widgets) >= 5.10
BuildRequires: pkgconfig(Qt5X11Extras) >= 5.10
BuildRequires: pkgconfig(Qt5Xdg)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
@ -53,22 +50,22 @@ Provides: libfm-qt
libfm-qt is the Qt port of libfm, a library providing components to
build desktop file managers.
%{lang_package -r libfm-qt6}
%{lang_package -r libfm-qt7}
%package -n libfm-qt6
%package -n libfm-qt7
Summary: Library providing components to build desktop file managers
Group: System/Libraries
Recommends: %{name}-lang
Conflicts: pcmanfm <= 0.10.0
%description -n libfm-qt6
%description -n libfm-qt7
libfm-qt is the Qt port of libfm, a library providing components to
build desktop file managers.
%package -n libfm-qt-devel
Summary: Development files for libfm-qt
Group: Development/Libraries/C and C++
Requires: libfm-qt6 >= %{version}
Requires: libfm-qt7 >= %{version}
Requires: pkgconfig
# libfm-qt has an -I on a path from menu-cache-devel
Requires: pkgconfig(libmenu-cache) >= 0.4.0
@ -78,7 +75,6 @@ Libfm-Qt libraries for development
%prep
%setup -q
%patch0 -p1
%build
%cmake -DPULL_TRANSLATIONS=No
@ -89,10 +85,10 @@ make %{?_smp_mflags}
%find_lang %{name} --with-qt
%post -n libfm-qt6 -p /sbin/ldconfig
%postun -n libfm-qt6 -p /sbin/ldconfig
%post -n libfm-qt7 -p /sbin/ldconfig
%postun -n libfm-qt7 -p /sbin/ldconfig
%files -n libfm-qt6
%files -n libfm-qt7
%license LICENSE
%doc README.md
%dir %{_datadir}/libfm-qt/
@ -114,5 +110,6 @@ make %{?_smp_mflags}
%files lang -f %{name}.lang
%dir %{_datadir}/libfm-qt
%dir %{_datadir}/libfm-qt/translations
%{_datadir}/libfm-qt/translations/*
%changelog