Compare commits

..

100 Commits

Author SHA1 Message Date
Simon Quigley c3075b3182 Upload to Plucky
1 month ago
Simon Quigley a90ab52cb3 Make the package Lintian-clean.
2 months ago
Simon Quigley a7c55cca9d Add new build dependencies from the CMake output.
2 months ago
Simon Quigley 49541811db New upstream release.
2 months ago
Rik Mills 017f7c8a4d No-change rebuild against Qt 6.7.2 private-abi.
2 months ago
Aaron Rainbolt b26925ea07 Tell the symbols to get back in shape
4 months ago
Aaron Rainbolt 802f5579bb Release to Oracular
4 months ago
Aaron Rainbolt 0f9f5df868 Symbols file update
6 months ago
Aaron Rainbolt 1db48c93b7 Much package name tweaking
6 months ago
Aaron Rainbolt 644c99327e Bump build deps and soname
6 months ago
Aaron Rainbolt ea95d92cfa Update copyright file
6 months ago
Aaron Rainbolt 2c7d5a99f5 Bump Standards-Version
6 months ago
Aaron Rainbolt b2307df376 Bump version for new upstream release
6 months ago
Aaron Rainbolt d327b18479 Adjust changelog wording
1 year ago
Aaron Rainbolt c5f0c347e1 Update symbols
1 year ago
Aaron Rainbolt fa8e6fa423 Soname bump
1 year ago
Aaron Rainbolt d5ecfb6681 Add lxqt-menu-data as a build dep
1 year ago
Aaron Rainbolt 6dab1b3af8 Reorganize and fix copyright file
1 year ago
Aaron Rainbolt b2487aad6c Bump version for new upstream release
1 year ago
Simon Quigley a575de56f8 Update symbols from build logs.
1 year ago
Simon Quigley c3f4fc8b10 Bump build dependency accordingly.
1 year ago
Simon Quigley 40e11089cc Rename binary package for SONAME change, update symbols accordingly.
1 year ago
Simon Quigley 98f5f397dc New upstream release.
1 year ago
Aaron Rainbolt d0c06c5d6b Ran wrap-and-sort.
2 years ago
Aaron Rainbolt 052a556bc0 Symbols defeated.
2 years ago
Aaron Rainbolt 83c034bd6f Bumped Standards-Version to 4.6.2
2 years ago
Aaron Rainbolt 900d477f1d Updated copyright file.
2 years ago
Aaron Rainbolt e251a6aa32 Prepare for new release
2 years ago
Aaron Rainbolt a273e1567d Sync with archive.
2 years ago
Aaron Rainbolt eb615c3512 Revert "Typo fix"
2 years ago
Aaron Rainbolt 0672e46c73 Revert "Set release codename."
2 years ago
Aaron Rainbolt cbe58deaea Set release codename.
2 years ago
Aaron Rainbolt f0df77303e Typo fix
2 years ago
Simon Quigley d6371bc277 Upload to Lunar.
2 years ago
Simon Quigley 5fd9107a93 Update symbols from amd64 build logs.
2 years ago
Simon Quigley f10ba18860 Rename libfm-qt11 -> libfm-qt12 and add necessary Breaks/Replaces.
2 years ago
Simon Quigley 1e0ecbdf79 Bump build dependencies to the latest upstream LXQt versions.
2 years ago
Simon Quigley c98bcd1948 Remove reverse-applicable upstream patches.
2 years ago
Simon Quigley 1fa81fcbb4 Lubuntuify the package slightly, to make debhelper happy.
2 years ago
Simon Quigley 2602979b29 Fix the watch file, for real this time.
2 years ago
Simon Quigley 0f65b41150 New upstream release.
2 years ago
Simon Quigley be07f15a59 Sync with Ubuntu upload 1.1.0-3ubuntu1.
2 years ago
Simon Quigley 0a196e7e16 Sync with Debian version 1.1.0-3.
2 years ago
Simon Quigley 944ca043e5 Sync with Ubuntu upload 1.1.0-2ubuntu1.
2 years ago
Simon Quigley b6b785512d Sync with Debian version 1.1.0-2.
2 years ago
Simon Quigley 0db4d62f51 Sync with Debian version 1.1.0-1.
2 years ago
Simon Quigley 6a7fd542a9 Upload to Kinetic.
3 years ago
Simon Quigley 1cb774dd2e Fix upgrades from 22.04 by providing an additional Breaks/Replaces on libfm-qt9.
3 years ago
Simon Quigley 9f419a4e10 Release to Kinetic.
3 years ago
Simon Quigley 84bf4caa68 Add upstream feature patch.
3 years ago
Simon Quigley c5631d7a2d Backport upstream patch fixing a crash.
3 years ago
Simon Quigley 8654c7904b Add some missing Breaks/Replaces.
3 years ago
Simon Quigley ce2f4feab5 Upload to Kinetic.
3 years ago
Simon Quigley 755cf858f6 Split common files out into a different package.
3 years ago
Simon Quigley 32558ac832 Upload to Kinetic.
3 years ago
Simon Quigley 817faa5457 Even moar symbols. 😦
3 years ago
Simon Quigley f4f7453d4f Upload to Kinetic.
3 years ago
Simon Quigley dbe70dd76e Symbols. ❤️
3 years ago
Simon Quigley 1bb5e074ae Release to Kinetic.
3 years ago
Simon Quigley 1c098568f3 Note: Breaks/Replaces dropped because 22.04 was an LTS.
3 years ago
Simon Quigley 0888e2bed8 Symbols. ❤️
3 years ago
Simon Quigley fa135f8e2a Bump package name from libfm-qt9 to libfm-qt11. Tried to be somewhat consistent with the upstream versioning scheme.
3 years ago
Simon Quigley 5eca821f28 New upstream release.
3 years ago
Dmitry Shachnev 748c733729 No-change rebuild against Qt 5.15.4.
3 years ago
Dmitry Shachnev f1cccbe4e1 No-change rebuild against Qt 5.15.3.
3 years ago
apt-ghetto 8e2977cd88 New upstream version for libfm-qt
3 years ago
Raman Sarda 24b035552e Fix s90x and riscv64 errors
4 years ago
Raman Sarda 1215d360d8 New upstream version
4 years ago
Simon Quigley c448ea0a2f Merge branch 'ubuntu/focal' into ubuntu/groovy
5 years ago
Gianfranco Costamagna 19d5b222af Refresh symbol files for riscv64
5 years ago
Simon Quigley a56d40dc0a Upload to Groovy.
5 years ago
Simon Quigley 70bbac5c92 Bump to 0.15.1.
5 years ago
Simon Quigley 54b50f5152 Remove obsolete patches from debian/patches/.
5 years ago
Simon Quigley f742be6a17 Update symbols from amd64 build logs.
5 years ago
Simon Quigley ac41f3a96b Update the last dependency of libfm-qt6.
5 years ago
Simon Quigley a084e5bb86 Rename the install file as well.
5 years ago
Simon Quigley c1ffd9db39 Rename libfm-qt6 -> libfm-qt7 for SONAME bump.
5 years ago
Simon Quigley 251d898efc Merge branch 'ubuntu/groovy' into ci/stable
5 years ago
Rik Mills b671b41618 sync with groovy archive
5 years ago
Rik Mills 6df0173c9b sync with focal archive
5 years ago
Simon Quigley 370ce0986a Bump LXQt build dependencies.
5 years ago
Simon Quigley ff3efabd56 Full copyright update.
5 years ago
Simon Quigley 897e1d1d5f Run wrap-and-sort.
5 years ago
Simon Quigley b3e9f2e54d Bump Standards-version to 4.5.0, no changes needed.
5 years ago
Simon Quigley c4a6bb316b Update upstream signing key.
5 years ago
Simon Quigley ea2f48482a New upstream release.
5 years ago
Simon Quigley d1c409451e Merge branch 'ci/stable' into ci/unstable
5 years ago
Rik Mills b75411bb14 merge from debian 0.14.1-12
5 years ago
apt-ghetto bc3e4bc2b2 Fix symbols
5 years ago
apt-ghetto 4d37efb21b Update symbols
5 years ago
Rik Mills e8e7d9bd5a No-change rebuild against qtbase-abi-5-12-5
5 years ago
apt-ghetto ba535b4af8 Fix updated symbols
5 years ago
apt-ghetto 53e5a55691 Update symbols
5 years ago
apt-ghetto 89d37d65c4 Update symbols
6 years ago
apt-ghetto 5e3b197f0d Update symbols
6 years ago
apt-ghetto bdd05e9657 Update symbols
6 years ago
apt-ghetto cd3ad840e2 Drop patch
6 years ago
apt-ghetto ac1face24d Update changelog
6 years ago
Rik Mills 9e81f0eb04 merge with debian and release to eoan
6 years ago
apt-ghetto 5d2a1fd479 Remove patches
6 years ago

337
debian/changelog vendored

@ -1,29 +1,191 @@
libfm-qt (0.14.1-9ubuntu3) eoan; urgency=medium
libfm-qt (2.1.0-0ubuntu1) plucky; urgency=medium
* Fixed DND not working for mtp:// mounted folders
* New upstream release.
- Bump build dependencies.
- Update symbols from amd64 build logs.
* Add new build dependencies from the CMake output.
* Make the package Lintian-clean.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 15 Nov 2024 15:31:59 -0600
libfm-qt (2.0.2-0ubuntu3) plucky; urgency=medium
* No-change rebuild against Qt 6.7.2 private-abi.
-- Rik Mills <rikmills@kde.org> Thu, 17 Oct 2024 17:52:48 +0100
libfm-qt (2.0.2-0ubuntu2) oracular; urgency=medium
* Fix symbols file.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Sun, 25 Aug 2024 22:22:47 -0500
libfm-qt (2.0.2-0ubuntu1) oracular; urgency=medium
* New upstream release.
* Bump Standards-Version to 4.7.0, no changes necessary.
* Update copyright file.
* Bump build deps.
* Change binary package name to libfm-qt6.
* Update symbols file.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 15 Aug 2024 16:06:46 -0500
libfm-qt (1.4.0-0ubuntu1) noble; urgency=medium
* New upstream release.
* Reorganized and fixed copyright file.
* Added lxqt-menu-data as a build dependency.
* Bumped soname to libfm-qt14.
* Updated symbols file.
-- Aaron Rainbolt <arraybolt3@gmail.com> Sun, 05 Nov 2023 17:15:40 -0600
libfm-qt (1.3.0-0ubuntu2) mantic; urgency=medium
* Update symbols from build logs.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 11 Aug 2023 10:16:27 -0500
libfm-qt (1.3.0-0ubuntu1) mantic; urgency=medium
* New upstream release.
- Bump build dependency accordingly.
* Rename binary package for SONAME change, update symbols accordingly.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 26 Jul 2023 16:25:53 -0500
libfm-qt (1.2.1-0ubuntu1) lunar; urgency=medium
* New upstream release.
* Updated copyright file.
* Bumped Standards-Version to 4.6.2, no changes necessary.
* Updated symbols file.
* Ran wrap-and-sort.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 26 Jan 2023 20:18:59 -0600
libfm-qt (1.2.0-0ubuntu3) lunar; urgency=medium
* No-change rebuild against Qt 5.15.8.
-- Dmitry Shachnev <mitya57@ubuntu.com> Sat, 14 Jan 2023 10:19:25 +0300
libfm-qt (1.2.0-0ubuntu2) lunar; urgency=medium
* No-change rebuild against Qt 5.15.7.
-- Dmitry Shachnev <mitya57@ubuntu.com> Sat, 10 Dec 2022 12:50:58 +0300
libfm-qt (1.2.0-0ubuntu1) lunar; urgency=medium
* New upstream release.
* Fix the watch file, for real this time.
* Lubuntuify the package slightly, to make debhelper happy.
* Remove reverse-applicable upstream patches.
* Bump build dependencies to the latest upstream LXQt versions.
* Rename libfm-qt11 -> libfm-qt12 and add necessary Breaks/Replaces.
* Update symbols from amd64 build logs.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 16 Nov 2022 19:21:46 -0600
libfm-qt (1.1.0-3ubuntu1) kinetic; urgency=medium
* Revert the previous upload.
* Make Breaks/Replaces stricter for libfm-qt11 on libfm-qt-common due to the
nature of the reverted upload.
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 10 Oct 2022 11:06:03 -0500
libfm-qt (1.1.0-2ubuntu1) kinetic; urgency=medium
* Update debian/libfm-qt11.symbols for GCC 12.
-- Dmitry Shachnev <mitya57@ubuntu.com> Sat, 13 Aug 2022 21:37:11 +0300
libfm-qt (1.1.0-2) experimental; urgency=medium
* Upstreamed compatible changes from Ubuntu, modifying the following files:
- control
- copyright
- libfm-qt11.symbols
- libfm-qt-common.install
- libfm-qt-dev.install
- rules
- upstream/*
- patches directory
-- Aaron Rainbolt <arraybolt3@gmail.com> Thu, 14 Jul 2022 15:45:41 -0500
libfm-qt (1.1.0-1) experimental; urgency=medium
* debian/changelog: fix a typo.
* New upstream version 1.0.0
* Add debian/salsa-ci.yml file.
* Update debian/upstream/signing-key.asc.
* New upstream version 1.1.0
* debian/control: build-deps on lxqt-build-tools (>=0.11.0~).
* Bump to libfm-qt11 to match soname changes.
* debian/libfm-qt11.shlibs: Added, restrict to latest upstream version.
* Drop C++ symbols according to
https://wiki.debian.org/UsingSymbolsFiles.
-- Andrew Lee (李健秋) <ajqlee@debian.org> Tue, 12 Jul 2022 22:33:35 +0800
libfm-qt (0.16.0-3) unstable; urgency=high
* Update symbols for armel, armhf, i386, mipsel and s390x to fix FTBFS.
-- Andrew Lee (李健秋) <ajqlee@debian.org> Sat, 09 Jan 2021 03:15:46 +0800
libfm-qt (0.16.0-2) unstable; urgency=medium
* Source only upload.
-- Andrew Lee (李健秋) <ajqlee@debian.org> Wed, 06 Jan 2021 21:31:49 +0800
libfm-qt (0.16.0-1) unstable; urgency=medium
* New upstream release. (Closes: #978219)
* Drop fixed upstream patches.
* Bump to libfm-qt8 to match soname changes.
* Refresh debian/libfm-qt8.symbols file.
-- Raman Sarda <theloudspeaker@lubuntu.me> Sat, 17 Aug 2019 10:11:52 +0530
-- Andrew Lee (李健秋) <ajqlee@debian.org> Wed, 06 Jan 2021 04:30:38 +0800
libfm-qt (0.14.1-9ubuntu2) eoan; urgency=medium
libfm-qt (0.14.1-12.2) unstable; urgency=medium
* Rebuild against Qt 5.12.4.
* Update symbols files from the current build logs.
* Non-maintainer upload.
* Update symbols files from buildds logs to fix FTBFS on armel.
-- Dmitry Shachnev <mitya57@ubuntu.com> Fri, 12 Jul 2019 23:28:09 +0300
-- Dmitry Shachnev <mitya57@debian.org> Fri, 23 Oct 2020 20:28:57 +0300
libfm-qt (0.14.1-9ubuntu1) eoan; urgency=medium
libfm-qt (0.14.1-12.1) unstable; urgency=medium
* Merge from Debian unstable. Remaining changes:
- debian/control:
+ Update Vcs-* and maintainer for maintaining by Lubuntu.
+ Add Breaks/Replaces on old libfm-qt-l10n.
- debian/libfmqt-qt6.symbols
+ Retain and update Lubuntu generated symbols file.
- debian/patches: fix-metadata-for-trusting-executables.patch
+ Fix metadata for trusting executables. Use Ubuntu standard for
trusting executables.
* Non-maintainer upload.
* Update symbols files for GCC 10 (closes: #957436).
-- Rik Mills <rikmills@kubuntu.org> Sun, 09 Jun 2019 22:20:26 +0100
-- Dmitry Shachnev <mitya57@debian.org> Sat, 17 Oct 2020 20:11:39 +0300
libfm-qt (0.14.1-12) unstable; urgency=medium
* Fixed symbol QRegEx -> QRegularExpression
-- Alf Gaida <agaida@siduction.org> Tue, 22 Oct 2019 23:52:39 +0200
libfm-qt (0.14.1-11) unstable; urgency=medium
* Bumped Standards to 4.4.1, no changes needed
* Switched to gbp, gbp.conf added
-- Alf Gaida <agaida@siduction.org> Sat, 05 Oct 2019 12:56:09 +0200
libfm-qt (0.14.1-10) unstable; urgency=medium
* Fixed symbols for gcc 9.2.1 (Closes: #925742)
* Bumped Standards to 4.4.0, no changes needed
-- Alf Gaida <agaida@siduction.org> Sat, 17 Aug 2019 13:00:08 +0200
libfm-qt (0.14.1-9) unstable; urgency=medium
@ -33,20 +195,6 @@ libfm-qt (0.14.1-9) unstable; urgency=medium
-- Alf Gaida <agaida@siduction.org> Sat, 08 Jun 2019 16:39:11 +0200
libfm-qt (0.14.1-8ubuntu1) eoan; urgency=medium
* Merge from Debian unstable. Remaining changes:
- debian/control:
+ Update Vcs-* and maintainer for maintaining by Lubuntu.
+ Add Breaks/Replaces on old libfm-qt-l10n.
- debian/libfmqt-qt6.symbols
+ Retain Lubuntu generated symbols file.
- debian/patches: fix-metadata-for-trusting-executables.patch
+ Fix metadata for trusting executables. Use Ubuntu standard for
trusting executables.
-- Rik Mills <rikmills@kubuntu.org> Fri, 24 May 2019 10:16:20 +0100
libfm-qt (0.14.1-8) unstable; urgency=medium
* Removed the wrongly introduced build dependency on lxqt-qtplugin
@ -98,22 +246,6 @@ libfm-qt (0.14.1-1) unstable; urgency=medium
-- Alf Gaida <agaida@siduction.org> Sun, 24 Feb 2019 19:31:01 +0100
libfm-qt (0.14.1-0ubuntu2) disco; urgency=medium
* Rebuild against qtbase-abi-5-12-2.
* Update symbols from build logs for all architectures.
-- Rik Mills <rikmills@kubuntu.org> Sun, 31 Mar 2019 10:52:00 +0100
libfm-qt (0.14.1-0ubuntu1) disco; urgency=medium
* New upstream release.
* Update standard executable trusting patch to use the new upstream macro
instead of individual inline replacements.
* Update symbols from build logs.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 08 Mar 2019 11:28:38 -0600
libfm-qt (0.14.0-3) unstable; urgency=medium
* Switched to unstable
@ -146,55 +278,6 @@ libfm-qt (0.14.0-1) experimental; urgency=medium
-- Alf Gaida <agaida@siduction.org> Wed, 30 Jan 2019 20:32:59 +0100
libfm-qt (0.14.0-0ubuntu3) disco; urgency=medium
* Fix metadata for trusting executables.
- Use Ubuntu standard for trusting executables.
-- Dan Simmons <monetaryabyss@protonmail.com> Tue, 29 Jan 2019 20:32:19 -0500
libfm-qt (0.14.0-0ubuntu2) disco; urgency=medium
* Add Breaks/Replaces on old libfm-qt-l10n.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 26 Jan 2019 10:15:13 -0600
libfm-qt (0.14.0-0ubuntu1) disco; urgency=medium
* New upstream release.
- Remove reverse-applicable patches.
- Bump build dependencies.
- Install new files.
* Bump Standards-version to 4.3.0, no changes needed.
* Bump debhelper compat to 12, no changes needed.
* Add new binary package libfm-qt-l10n.
* libfm-qt5 -> libfm-qt6.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 25 Jan 2019 23:15:39 -0600
libfm-qt (0.13.1-10ubuntu1) disco; urgency=medium
* Merge with Debian unstable, remaining changes:
- debian/control:
+ Update Vcs-* and maintainer for maintaining by Lubuntu.
- debian/patches/add-lxqt-archiver-integration.patch:
+ Add LXQt Archiver integration.
- debian/patches/add-metadata-for-trusting-executables.patch:
+ Support adding metadata for trusting executables.
- debian/patches/fix-incorrect-file-info-handling-1.patch,
debian/patches/fix-incorrect-file-info-handling-2.patch:
+ Fix failure to open smb:// caused by incorrect file info handling.
- debian/patches/fix-launching-desktop-files.patch:
+ Fix launching desktop files.
- debian/patches/fix-places-font-color.patch:
+ Use the window text color for the places pane.
- debian/patches/move-in-file-dialog.patch:
+ Move in the file dialog from lxqt-qtplugin for better platform
integration.
* Update debian/libfm-qt5.symbols from the current build logs.
-- Dmitry Shachnev <mitya57@ubuntu.com> Fri, 04 Jan 2019 14:47:29 +0300
libfm-qt (0.13.1-10) unstable; urgency=medium
* Added Build-Depends-Package: libfm-qt-dev to libfm-qt-dev.symbols
@ -227,66 +310,6 @@ libfm-qt (0.13.1-6) unstable; urgency=medium
-- Alf Gaida <agaida@siduction.org> Tue, 31 Jul 2018 18:15:12 +0200
libfm-qt (0.13.1-5ubuntu9) disco; urgency=medium
* Fix launching desktop files.
-- Dan Simmons <monetaryabyss@protonmail.com> Wed, 21 Nov 2018 23:40:15 -0500
libfm-qt (0.13.1-5ubuntu8) disco; urgency=medium
* No-change rebuild against qtbase-abi-5-11-2.
-- Simon Quigley <tsimonq2@ubuntu.com> Tue, 13 Nov 2018 17:29:45 -0600
libfm-qt (0.13.1-5ubuntu7) cosmic; urgency=medium
* Check (and set) metadata::trusted instead of metadata::trust.
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 15 Oct 2018 10:11:59 -0500
libfm-qt (0.13.1-5ubuntu6) cosmic; urgency=medium
* Update symbols from build logs.
-- Simon Quigley <tsimonq2@ubuntu.com> Tue, 09 Oct 2018 13:57:26 -0500
libfm-qt (0.13.1-5ubuntu5) cosmic; urgency=medium
* Support adding metadata for trusting executables (LP: #1795537).
-- Walter Lapchynski <wxl@ubuntu.com> Sat, 06 Oct 2018 08:55:46 -0700
libfm-qt (0.13.1-5ubuntu4) cosmic; urgency=medium
* Change Uploaders to Ubuntu uploaders.
* Change the debhelper dependency to 11.
* Move in the file dialog from lxqt-qtplugin for better platform
integration.
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 30 Jul 2018 19:25:14 -0500
libfm-qt (0.13.1-5ubuntu3) cosmic; urgency=medium
* Update symbols from build logs.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 18 Jul 2018 04:32:54 -0500
libfm-qt (0.13.1-5ubuntu2) cosmic; urgency=medium
* No-change rebuild against qtbase-abi-5-11-0.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 18 Jul 2018 03:18:08 -0500
libfm-qt (0.13.1-5ubuntu1) cosmic; urgency=medium
* Update Vcs-* and maintainer for maintaining by Lubuntu.
* Add LXQt Archiver integration.
* Fix failure to open smb:// caused by incorrect file info handling.
* Use the window text color for the places pane.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 14 Jul 2018 01:18:40 -0500
libfm-qt (0.13.1-5) unstable; urgency=medium
* Switch to unstable

116
debian/control vendored

@ -1,44 +1,72 @@
Source: libfm-qt
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
Uploaders: Alf Gaida <agaida@siduction.org>,
ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>,
Shih-Yuan Lee (FourDollars) <fourdollars@gmail.com>,
Simon Quigley <tsimonq2@debian.org>,
Aaron Rainbolt <arraybolt3@gmail.com>
Section: x11
Priority: optional
Build-Depends: debhelper-compat (= 12),
Build-Depends: debhelper-compat (= 13),
libexif-dev,
libkf5windowsystem-dev,
libmenu-cache-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
libx11-dev,
lxqt-build-tools (>= 0.6.0~),
qtbase5-private-dev
Standards-Version: 4.3.0
Vcs-Browser: https://phab.lubuntu.me/source/libfm-qt/
Vcs-Git: https://phab.lubuntu.me/source/libfm-qt.git
XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/libfm-qt
XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/libfm-qt.git
libxcb-composite0-dev,
libxcb-cursor-dev,
libxcb-damage0-dev,
libxcb-dpms0-dev,
libxcb-dri2-0-dev,
libxcb-dri3-dev,
libxcb-ewmh-dev,
libxcb-glx0-dev,
libxcb-icccm4-dev,
libxcb-image0-dev,
libxcb-keysyms1-dev,
libxcb-present-dev,
libxcb-randr0-dev,
libxcb-record0-dev,
libxcb-render-util0-dev,
libxcb-render0-dev,
libxcb-res0-dev,
libxcb-screensaver0-dev,
libxcb-shape0-dev,
libxcb-shm0-dev,
libxcb-sync-dev,
libxcb-util-dev,
libxcb-xf86dri0-dev,
libxcb-xfixes0-dev,
libxcb-xinerama0-dev,
libxcb-xinput-dev,
libxcb-xkb-dev,
libxcb-xtest0-dev,
libxcb-xv0-dev,
libxcb-xvmc0-dev,
lxqt-build-tools (>= 2.1.0),
lxqt-menu-data (>= 2.1.0),
qt6-base-private-dev (>= 6.6.0),
qt6-svg-dev (>= 6.6.0)
Standards-Version: 4.7.0
Vcs-Browser: https://git.lubuntu.me/Lubuntu/libfm-qt-packaging
Vcs-Git: https://git.lubuntu.me/Lubuntu/libfm-qt-packaging.git
Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/libfm-qt
Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/libfm-qt.git
Homepage: https://github.com/lxqt/libfm-qt
Rules-Requires-Root: no
Package: libfm-qt6
Provides: libfm-qt
Conflicts: libfm-qt
Replaces: libfm-qt5-2,
libfm-qt5,
libfm-qt3,
libfm-qt2
Breaks: libfm-qt5-2,
libfm-qt5,
libfm-qt3,
libfm-qt2
Package: libfm-qt6-15
Replaces: libfm-qt14, libfm-qt6-14
Breaks: libfm-qt14, libfm-qt6-14
Architecture: any
Multi-Arch: same
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends},
Depends: libfm-qt6-common,
libglib2.0-bin,
shared-mime-info
Recommends: libfm-qt-l10n
shared-mime-info,
${misc:Depends},
${shlibs:Depends}
Recommends: libfm-qt6-l10n
Pre-Depends: ${misc:Pre-Depends}
Description: file management support for pcmanfm-qt
Libfm-Qt is a companion library providing components to build desktop file
@ -46,29 +74,37 @@ Description: file management support for pcmanfm-qt
.
This package contains helper library libfm-qt for pcmanfm-qt.
Package: libfm-qt-dev
Replaces: libfm-qt5-dev
Breaks: libfm-qt5-dev
Package: libfm-qt6-common
Architecture: all
Multi-Arch: foreign
Section: libs
Depends: ${misc:Depends}
Breaks: libfm-qt14
Replaces: libfm-qt14
Description: Common files for libfm-qt
Libfm-Qt is a companion library providing components to build desktop file
managers.
.
This package contains common files for libfm-qt.
Package: libfm-qt6-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends},
libexif-dev,
libfm-qt6 (= ${binary:Version}),
libmenu-cache-dev
Depends: libexif-dev,
libfm-qt6-15 (= ${binary:Version}),
libmenu-cache-dev,
${misc:Depends}
Description: file management support library for pcmanfm-qt (development files)
Libfm-Qt is a companion library providing components to build desktop file
managers.
.
This package contains development files for helper library libfm-qt.
Package: libfm-qt-l10n
Package: libfm-qt6-l10n
Architecture: all
Multi-Arch: foreign
Section: localization
Depends: ${misc:Depends},
qttranslations5-l10n
Breaks: libfm-qt3 (<< 0.11.1), libfm-qt-l10n (<< 0.14.0)
Replaces: libfm-qt3 (<< 0.11.1), libfm-qt-l10n (<< 0.14.0)
Depends: qt6-translations-l10n, ${misc:Depends}
Description: Language package for libfm-qt
Libfm-Qt is a companion library providing components to build desktop file
managers.

22
debian/copyright vendored

@ -3,10 +3,13 @@ Upstream-Name: libfm-qt
Source: https://github.com/lxqt/libfm-qt
Files: *
Copyright: 2013-2019 LXQt team
2013-2019 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
2012-2014 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
Copyright: 2013-2024 LXQt team
2009 Juergen Hoetzel <juergen@archlinux.org>
2010 Shae Smittle <starfall87@gmail.com>
2014 Kuzma Shapran <kuzma.shapran@gmail.com>
2016 Mamoru TASAKA <mtasaka@fedoraproject.org>
2012-2016 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
2009-2019 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
License: LGPL-2.1+
Files: cmake/fm-qt-config.cmake.in
@ -14,10 +17,18 @@ Copyright: 2015 Luís Pereira <luis.artur.pereira@gmail.com>
License: BSD-3-Clause
Files: debian/*
Copyright: 2014-2015 Wen Liao <wen.cf83@gmail.com>
Copyright: 2015 Andrew Lee (李健秋) <ajqlee@debian.org>
2014-2015 Wen Liao <wen.cf83@gmail.com>
2014-2016 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
2019 Rik Mills <rikmills@kubuntu.org>
2013-2019 Alf Gaida <agaida@siduction.org>
2015 Andrew Lee (李健秋) <ajqlee@debian.org>
2018-2019 Walter Lapchynski <wxl@ubuntu.com>
2018-2019 Dan Simmons <monetaryabyss@protonmail.com>
2020 Gianfranco Costamagna <locutusofborg@debian.org>
2019-2021 Raman Sarda <ramansarda2000@gmail.com>
2019-2021 apt-ghetto <apt-ghetto@protonmail.com>
2018-2023 Simon Quigley <tsimonq2@ubuntu.com>
2022-2024 Aaron Rainbolt <arraybolt3@gmail.com>
License: LGPL-2.1+
License: BSD-3-Clause
@ -59,4 +70,3 @@ License: LGPL-2.1+
On Debian systems, the complete text of the GNU Lesser General
Public License version 2.1 can be found in
"/usr/share/common-licenses/LGPL-2.1".

6
debian/gbp.conf vendored

@ -0,0 +1,6 @@
[DEFAULT]
debian-branch = debian/sid
upstream-branch = upstream/latest
pristine-tar = True
compression = xz

@ -1,10 +0,0 @@
usr/include/libfm-qt/*.h
usr/include/libfm-qt/customactions/*.h
usr/include/libfm-qt/core/*.h
usr/include/libfm-qt/core/legacy/*.h
usr/include/libfm-qt/core/vfs/*.h
usr/lib/*/*.so
usr/lib/*/pkgconfig/*
usr/share/cmake/fm-qt/*.cmake

@ -1 +0,0 @@
usr/share/libfm-qt/translations

@ -0,0 +1 @@
usr/lib/*/*.so.*

File diff suppressed because it is too large Load Diff

@ -0,0 +1,3 @@
usr/share/libfm-qt6/archivers.list
usr/share/libfm-qt6/terminals.list
usr/share/mime/packages/libfm-qt6-mimetypes.xml

@ -0,0 +1,8 @@
usr/include/libfm-qt6/*.h
usr/include/libfm-qt6/core/*.h
usr/include/libfm-qt6/core/legacy/*.h
usr/include/libfm-qt6/core/vfs/*.h
usr/include/libfm-qt6/customactions/*.h
usr/lib/*/*.so
usr/lib/*/pkgconfig/*
usr/share/cmake/fm-qt6/*.cmake

@ -0,0 +1 @@
usr/share/libfm-qt6/translations

@ -1,4 +0,0 @@
usr/lib/*/*.so.*
usr/share/libfm-qt/terminals.list
usr/share/libfm-qt/archivers.list
usr/share/mime/packages/libfm-qt-mimetypes.xml

File diff suppressed because it is too large Load Diff

@ -1,115 +0,0 @@
From 7e79e591eb536603da92ee537bf949490b1259fc Mon Sep 17 00:00:00 2001
From: Tsu Jan <tsujan2000@gmail.com>
Date: Sun, 21 Apr 2019 14:11:14 +0430
Subject: [PATCH] Don't ignore creation-deletion sequences
Fixes https://github.com/lxqt/pcmanfm-qt/issues/944
Previously, if a file was in addition queue and then it came into the deletion
queue, its addition and deletion were both ignored. That was wrong and could
result in showing nonexistent files because addition can also happen in
directory list job before being processed by file info job.
Also process accumulated changes only after finishing the current info job and
don't clear all deletion paths after processing them (because, logically, only
those paths that can be deleted should be removed).
---
src/core/folder.cpp | 60 +++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 29 deletions(-)
diff --git a/src/core/folder.cpp b/src/core/folder.cpp
index 6c2b27d..2385a8b 100644
--- a/src/core/folder.cpp
+++ b/src/core/folder.cpp
@@ -228,16 +228,6 @@ void Folder::onFileInfoFinished() {
return;
}
- // process the changes accumulated during this info job
- if(filesystem_info_pending // means a pending change; see "onFileSystemInfoFinished()"
- || !paths_to_update.empty() || !paths_to_add.empty() || !paths_to_del.empty()) {
- QTimer::singleShot(0, this, &Folder::processPendingChanges);
- }
- // there's no pending change at the moment; let the next one be processed
- else {
- has_idle_update_handler = false;
- }
-
FileInfoList files_to_add;
FileInfoList files_to_delete;
std::vector<FileInfoPair> files_to_update;
@@ -271,6 +261,16 @@ void Folder::onFileInfoFinished() {
Q_EMIT filesChanged(files_to_update);
}
Q_EMIT contentChanged();
+
+ // process the changes accumulated during this info job
+ if(filesystem_info_pending // means a pending change; see "onFileSystemInfoFinished()"
+ || !paths_to_update.empty() || !paths_to_add.empty() || !paths_to_del.empty()) {
+ QTimer::singleShot(0, this, &Folder::processPendingChanges);
+ }
+ // there's no pending change at the moment; let the next one be processed
+ else {
+ has_idle_update_handler = false;
+ }
}
void Folder::processPendingChanges() {
@@ -314,21 +314,24 @@ void Folder::processPendingChanges() {
}
// process deletion
- if(!paths_to_del.empty()) {
- FileInfoList deleted_files;
- for(const auto &path: paths_to_del) {
- auto name = path.baseName();
- auto it = files_.find(name.get());
- if(it != files_.end()) {
- deleted_files.push_back(it->second);
- files_.erase(it);
- }
+ FileInfoList deleted_files;
+ auto path_it = paths_to_del.begin();
+ while(path_it != paths_to_del.end()) {
+ const auto& path = *path_it;
+ auto name = path.baseName();
+ auto it = files_.find(name.get());
+ if(it != files_.end()) {
+ deleted_files.push_back(it->second);
+ files_.erase(it);
+ path_it = paths_to_del.erase(path_it);
}
- if(!deleted_files.empty()) {
- Q_EMIT filesRemoved(deleted_files);
- Q_EMIT contentChanged();
+ else {
+ ++path_it;
}
- paths_to_del.clear();
+ }
+ if(!deleted_files.empty()) {
+ Q_EMIT filesRemoved(deleted_files);
+ Q_EMIT contentChanged();
}
if(pending_change_notify) {
@@ -404,13 +407,12 @@ void Folder::eventFileDeleted(const FilePath& path) {
bool deleted = true;
// qDebug() << "delete " << path.baseName().get();
// G_LOCK(lists);
- if(std::find(paths_to_add.cbegin(), paths_to_add.cend(), path) != paths_to_add.cend()) {
- // if the file was going to be added, just remove it from the addition queue
- paths_to_add.erase(std::remove(paths_to_add.begin(), paths_to_add.end(), path), paths_to_add.cend());
- }
- else if(std::find(paths_to_del.cbegin(), paths_to_del.cend(), path) == paths_to_del.cend()) {
+ /* WARNING: If the file is in the addition queue, we shouldn not remove it from that queue
+ and ignore its deletion because it may have been added by the directory list job, in
+ which case, ignoring an addition-deletion sequence would result in a nonexistent file. */
+ if(std::find(paths_to_del.cbegin(), paths_to_del.cend(), path) == paths_to_del.cend()) {
paths_to_del.push_back(path);
- // the update queue should be cancelled for a file that is going to be deleted
+ // the update queue can be cancelled for a file that is going to be deleted
paths_to_update.erase(std::remove(paths_to_update.begin(), paths_to_update.end(), path), paths_to_update.cend());
}
else {

@ -1,49 +0,0 @@
Description: Fix DND for MTP mounted folders
Author: Tsu Jan <tsujan2000@gmail.com>
Bug-Upstream: https://github.com/lxqt/pcmanfm-qt/issues/301
Applied-Upstream: https://github.com/lxqt/libfm-qt/commit/7de18bc89b9b47f66de54a7e347bf8d391d44a48
Last-Update: 2019-08-17
--- a/src/foldermodel.cpp
+++ b/src/foldermodel.cpp
@@ -384,7 +384,7 @@ QStringList FolderModel::mimeTypes() con
// the real implementation is in FolderView::childDropEvent().
types << "XdndDirectSave0";
types << "text/uri-list";
- // types << "x-special/gnome-copied-files";
+ types << QStringLiteral("libfm/files"); // see FolderModel::mimeData() below
return types;
}
@@ -407,6 +407,9 @@ QMimeData* FolderModel::mimeData(const Q
}
}
data->setData("text/uri-list", urilist);
+ // NOTE: The mimetype "text/uri-list" changes the list in QMimeData::setData() to get URLs
+ // but some protocols (like MTP) may need the original list to query file info.
+ data->setData(QStringLiteral("libfm/files"), urilist);
return data;
}
@@ -442,10 +445,19 @@ bool FolderModel::dropMimeData(const QMi
destPath = path();
}
+ Fm::FilePathList srcPaths;
+ // try to get paths from the original data
+ if(data->hasFormat(QStringLiteral("libfm/files"))) {
+ QByteArray _data = data->data(QStringLiteral("libfm/files"));
+ srcPaths = pathListFromUriList(_data.data());
+ }
+ if(srcPaths.empty() && data->hasUrls()) {
+ srcPaths = Fm::pathListFromQUrls(data->urls());
+ }
+
// FIXME: should we put this in dropEvent handler of FolderView instead?
- if(data->hasUrls()) {
+ if(!srcPaths.empty()) {
//qDebug("drop action: %d", action);
- auto srcPaths = pathListFromQUrls(data->urls());
switch(action) {
case Qt::CopyAction:
FileOperation::copyFiles(srcPaths, destPath);

@ -1,97 +0,0 @@
From 3d23ec7f0857cbc1ae8e42bdd27ab179a7e8344f Mon Sep 17 00:00:00 2001
From: "Hong Jen Yee (PCMan)" <pcman.tw@gmail.com>
Date: Fri, 19 Apr 2019 01:19:08 +0800
Subject: [PATCH] Fix the license header of code we took from libfm (they
should use LGPL2 instead of GPL2). - src/core/vfs/vfs-menu.c -
src/core/vfs/vfs-search.c These files are taken from libfm which has been
relicensed to LGPL 2 on 2014-09-05 by Andrey N. Gritsenko after consulting
other contributors.
---
src/core/vfs/vfs-menu.c | 21 ++++++++++-----------
src/core/vfs/vfs-search.c | 37 +++++++++++++++++--------------------
2 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/src/core/vfs/vfs-menu.c b/src/core/vfs/vfs-menu.c
index c541159..069b1bc 100644
--- a/src/core/vfs/vfs-menu.c
+++ b/src/core/vfs/vfs-menu.c
@@ -4,20 +4,19 @@
*
* Copyright 2012-2014 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/core/vfs/vfs-search.c b/src/core/vfs/vfs-search.c
index 0a64fb6..92b932c 100644
--- a/src/core/vfs/vfs-search.c
+++ b/src/core/vfs/vfs-search.c
@@ -1,25 +1,22 @@
/*
- * fm-vfs-search.c
- *
- * Copyright 2012 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
- * Copyright 2010 Shae Smittle <starfall87@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
+ * fm-vfs-search.c
*
+ * Copyright 2012 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+ * Copyright 2010 Shae Smittle <starfall87@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H

@ -1,36 +0,0 @@
From 6cb5f38d2c1261b782b16da45bb323b069db94fe Mon Sep 17 00:00:00 2001
From: Tsu Jan <tsujan2000@gmail.com>
Date: Mon, 8 Apr 2019 07:13:09 +0430
Subject: [PATCH] Fixed SMB recursive copy
Fixes https://github.com/lxqt/libfm-qt/issues/385 by trying to set dir permissions only once and ignoring possible errors (that happen with SMB and, maybe, other protocols).
---
src/core/filetransferjob.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/core/filetransferjob.cpp b/src/core/filetransferjob.cpp
index 4039c58..6b44576 100644
--- a/src/core/filetransferjob.cpp
+++ b/src/core/filetransferjob.cpp
@@ -279,16 +279,17 @@ bool FileTransferJob::makeDir(const FilePath& srcPath, GFileInfoPtr srcInfo, Fil
mode, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
cancellable().get(), &err);
if(!chmod_done) {
- ErrorAction act = emitError(err, ErrorSeverity::MODERATE);
+ /* NOTE: Some filesystems may not support this. So, ignore errors for now. */
+ break;
+ /*ErrorAction act = emitError(err, ErrorSeverity::MODERATE);
if(act != ErrorAction::RETRY) {
break;
- }
- /* FIXME: some filesystems may not support this. */
+ }*/
}
} while(!chmod_done && !isCancelled());
}
}
- return mkdir_done && chmod_done;
+ return mkdir_done/* && chmod_done*/;
}
bool FileTransferJob::handleError(GErrorPtr &err, const FilePath &srcPath, const GFileInfoPtr &srcInfo, FilePath &destPath, int& flags) {

@ -1,7 +1 @@
fix-metadata-for-trusting-executables.patch
fix-smb-recursive-copy.patch
fix-license-headers.patch
dont-ignore-crea-del-sequences.patch
workaround-glib-recursive-moving-error.patch
workaround-missed-file-monitoring.patch
fix-dnd-mtp.patch

@ -1,33 +0,0 @@
From 476dded99de11a57c64103b4610f0de3dbdbc769 Mon Sep 17 00:00:00 2001
From: Tsu Jan <tsujan2000@gmail.com>
Date: Mon, 22 Apr 2019 00:07:07 +0430
Subject: [PATCH] Workaround for GLib's recursive moving error, e.g. with bound
mounts
`g_file_move()` may not work recursively on the same filesystem, especially
with bound mounts (to `/mnt`, for example) and give the `G_IO_ERROR_WOULD_RECURSE`
error. This patch ignores the error and tries our `FileTransferJob::copyFile()`.
Closes https://github.com/lxqt/pcmanfm-qt/issues/943
---
src/core/filetransferjob.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/core/filetransferjob.cpp b/src/core/filetransferjob.cpp
index c3d5851..32f0f89 100644
--- a/src/core/filetransferjob.cpp
+++ b/src/core/filetransferjob.cpp
@@ -83,6 +83,13 @@ bool FileTransferJob::moveFileSameFs(const FilePath& srcPath, const GFileInfoPtr
// do the file operation
if(!g_file_move(srcPath.gfile().get(), destPath.gfile().get(), GFileCopyFlags(flags), cancellable().get(),
nullptr, this, &err)) {
+ // Specially with mounts bound to /mnt, g_file_move() may give the recursive error
+ // and fail, in which case, we ignore the error and try copying and deleting.
+ if(err.code() == G_IO_ERROR_WOULD_RECURSE) {
+ if(auto parent = destPath.parent()) {
+ return copyFile(srcPath, srcInfo, parent, destPath.baseName().get());
+ }
+ }
retry = handleError(err, srcPath, srcInfo, destPath, flags);
}
else {

@ -1,143 +0,0 @@
Description: Realod folder after transfer job if it lacks file monitoring
Closes https://github.com/lxqt/pcmanfm-qt/issues/933 and closes
https://github.com/lxqt/libfm-qt/issues/280. After a file transfer job is
finished inside a directory, if it is the path of an open folder that lacks
file monitoring, this patch reloads its corresponding folder. In this way, the
lack of file monitoring is partially compensated for.
Please note that this doesn't work with `search://` because the files inside
`search://` don't belong to it. By covering file creation, renaming, moving
from one shared folder to another and deleting after trying to move into Trash.
Last-Update: 2019-06-08
--- libfm-qt-0.14.1.orig/src/core/folder.cpp
+++ libfm-qt-0.14.1/src/core/folder.cpp
@@ -112,6 +112,20 @@ std::shared_ptr<Folder> Folder::fromPath
return folder;
}
+// static
+// Checks if this is the path of a folder in use.
+std::shared_ptr<Folder> Folder::findByPath(const FilePath& path) {
+ std::lock_guard<std::mutex> lock{mutex_};
+ auto it = cache_.find(path);
+ if(it != cache_.end()) {
+ auto folder = it->second.lock();
+ if(folder) {
+ return folder;
+ }
+ }
+ return nullptr;
+}
+
bool Folder::makeDirectory(const char* /*name*/, GError** /*error*/) {
// TODO:
// FIXME: what the API is used for in the original libfm C API?
@@ -142,6 +156,10 @@ bool Folder::isEmpty() const {
return files_.empty();
}
+bool Folder::hasFileMonitor() const {
+ return (dirMonitor_ != nullptr);
+}
+
FileInfoList Folder::files() const {
FileInfoList ret;
ret.reserve(files_.size());
--- libfm-qt-0.14.1.orig/src/core/folder.h
+++ libfm-qt-0.14.1/src/core/folder.h
@@ -56,6 +56,8 @@ public:
static std::shared_ptr<Folder> fromPath(const FilePath& path);
+ static std::shared_ptr<Folder> findByPath(const FilePath& path);
+
bool makeDirectory(const char* name, GError** error);
void queryFilesystemInfo();
@@ -74,6 +76,8 @@ public:
bool isEmpty() const;
+ bool hasFileMonitor() const;
+
FileInfoList files() const;
const FilePath& path() const;
--- libfm-qt-0.14.1.orig/src/fileoperation.cpp
+++ libfm-qt-0.14.1/src/fileoperation.cpp
@@ -298,6 +298,8 @@ void FileOperation::onJobFinish() {
}
Q_EMIT finished();
+ bool tryReload = true;
+
// special handling for trash job
if(type_ == Trash && !job_->isCancelled()) {
auto trashJob = static_cast<Fm::TrashJob*>(job_);
@@ -313,6 +315,26 @@ void FileOperation::onJobFinish() {
"Do you want to delete them instead?")) == QMessageBox::Yes) {
deleteFiles(std::move(unsupportedFiles), false);
}
+ tryReload = false;
+ }
+ }
+
+ // reload the containing folder if it is in use but does not have a file monitor
+ if(tryReload) {
+ if(!srcPaths_.empty() && (type_ == Trash || type_ == Delete || type_ == Move)) {
+ auto parent_path = srcPaths_[0].parent();
+ if(parent_path != destPath_) { // otherwise, it will be done below
+ auto folder = Fm::Folder::findByPath(parent_path);
+ if(folder && folder->isValid() && folder->isLoaded() && !folder->hasFileMonitor()) {
+ folder->reload();
+ }
+ }
+ }
+ if(destPath_) {
+ auto folder = Fm::Folder::findByPath(destPath_);
+ if(folder && folder->isValid() && folder->isLoaded() && !folder->hasFileMonitor()) {
+ folder->reload();
+ }
}
}
--- libfm-qt-0.14.1.orig/src/utilities.cpp
+++ libfm-qt-0.14.1/src/utilities.cpp
@@ -157,7 +157,8 @@ bool isCurrentPidClipboardData(const QMi
}
bool changeFileName(const Fm::FilePath& filePath, const QString& newName, QWidget* parent, bool showMessage) {
- auto dest = filePath.parent().child(newName.toLocal8Bit().constData());
+ auto parent_path = filePath.parent();
+ auto dest = parent_path.child(newName.toLocal8Bit().constData());
Fm::GErrorPtr err;
if(!g_file_move(filePath.gfile().get(), dest.gfile().get(),
GFileCopyFlags(G_FILE_COPY_ALL_METADATA |
@@ -170,6 +171,13 @@ bool changeFileName(const Fm::FilePath&
}
return false;
}
+
+ // reload the containing folder if it is in use but does not have a file monitor
+ auto folder = Fm::Folder::findByPath(parent_path);
+ if(folder && folder->isValid() && folder->isLoaded() && !folder->hasFileMonitor()) {
+ folder->reload();
+ }
+
return true;
}
@@ -263,6 +271,12 @@ _retry:
QMessageBox::critical(parent ? parent->window() : nullptr, QObject::tr("Error"), err.message());
}
+ else { // reload the containing folder if it is in use but does not have a file monitor
+ auto folder = Fm::Folder::findByPath(parentDir);
+ if(folder && folder->isValid() && folder->isLoaded() && !folder->hasFileMonitor()) {
+ folder->reload();
+ }
+ }
}
uid_t uidFromName(QString name) {

1
debian/rules vendored

@ -2,7 +2,6 @@
# export DH_VERBOSE = 1
export LC_ALL=C.UTF-8
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:

@ -0,0 +1,12 @@
# For more information on what jobs are run see:
# https://salsa.debian.org/salsa-ci-team/pipeline
#
# To enable the jobs, go to your repository (at salsa.debian.org)
# and click over Settings > CI/CD > Expand (in General pipelines).
# In "Custom CI config path" write debian/salsa-ci.yml and click
# in "Save Changes". The CI tests will run after the next commit.
---
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml

@ -0,0 +1,5 @@
# This list will always be very long, it's okay
libfm-qt source: very-long-line-length-in-source-file * > 512 [data/archivers.list:*]
# Long lines in the upstream changelog are okay
libfm-qt source: very-long-line-length-in-source-file * > 512 [CHANGELOG:*]

@ -3,5 +3,3 @@ Bug-Database: https://github.com/lxqt/libfm-qt/issues
Bug-Submit: https://github.com/lxqt/libfm-qt/issues/new
Changelog: https://github.com/lxqt/libfm-qt/blob/master/CHANGELOG
Repository: https://github.com/lxqt/libfm-qt
Repository-Browser: https://github.com/lxqt/libfm-qt

@ -1,50 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
=h7ww
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
sw==
=gSIv
-----END PGP PUBLIC KEY BLOCK-----

6
debian/watch vendored

@ -1,3 +1,5 @@
version=4
opts="pgpsigurlmangle=s/$/.asc/" \
https://github.com/lxqt/libfm-qt/releases .*/libfm-qt-([\d\.]+).tar.xz
opts="searchmode=plain, \
pgpsigurlmangle=s/$/.asc/, \
uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz

Loading…
Cancel
Save