From 07803be7f6e672adf2f849d1330c3aa1c937ac1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Sat, 14 Sep 2024 20:40:33 +0000 Subject: [PATCH] nextcloud-desktop: remove custom patches now applied upstream. --- helpers/DATA/nextcloud-desktop/7081.patch | 35 ----------------------- helpers/make-nextcloud-desktop | 4 --- 2 files changed, 39 deletions(-) delete mode 100644 helpers/DATA/nextcloud-desktop/7081.patch diff --git a/helpers/DATA/nextcloud-desktop/7081.patch b/helpers/DATA/nextcloud-desktop/7081.patch deleted file mode 100644 index d8e0a71..0000000 --- a/helpers/DATA/nextcloud-desktop/7081.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a1a56edccd2943e6f81465b3dfa6c703726fb0fa Mon Sep 17 00:00:00 2001 -From: Matthieu Gallien -Date: Fri, 6 Sep 2024 16:02:38 +0200 -Subject: [PATCH] add missing exception handling - -Signed-off-by: Matthieu Gallien ---- - src/libsync/filesystem.cpp | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp -index 0eb66c4f29fa..9df128682f86 100644 ---- a/src/libsync/filesystem.cpp -+++ b/src/libsync/filesystem.cpp -@@ -484,11 +484,15 @@ bool FileSystem::isFolderReadOnly(const std::filesystem::path &path) noexcept - FileSystem::FilePermissionsRestore::FilePermissionsRestore(const QString &path, FolderPermissions temporaryPermissions) - : _path(path) - { -- const auto stdStrPath = _path.toStdWString(); -- _initialPermissions = FileSystem::isFolderReadOnly(stdStrPath) ? OCC::FileSystem::FolderPermissions::ReadOnly : OCC::FileSystem::FolderPermissions::ReadWrite; -- if (_initialPermissions != temporaryPermissions) { -- _rollbackNeeded = true; -- FileSystem::setFolderPermissions(_path, temporaryPermissions); -+ try { -+ const auto stdStrPath = _path.toStdWString(); -+ _initialPermissions = FileSystem::isFolderReadOnly(stdStrPath) ? OCC::FileSystem::FolderPermissions::ReadOnly : OCC::FileSystem::FolderPermissions::ReadWrite; -+ if (_initialPermissions != temporaryPermissions) { -+ _rollbackNeeded = true; -+ FileSystem::setFolderPermissions(_path, temporaryPermissions); -+ } -+ } catch (const std::filesystem::filesystem_error &e) { -+ qCWarning(lcFileSystem()) << "exception when modifying folder permissions" << e.what() << e.path1().c_str() << e.path2().c_str(); - } - } - diff --git a/helpers/make-nextcloud-desktop b/helpers/make-nextcloud-desktop index b767fb4..ad2e72d 100644 --- a/helpers/make-nextcloud-desktop +++ b/helpers/make-nextcloud-desktop @@ -29,10 +29,6 @@ sed -i "s|Utility|Network|" mirall.desktop.in #Prevent ppc64el arch since qtwebengine is not build for ppc64el. sed -i 's|Architecture: any|Architecture: amd64 arm64 armhf i386 mips64el mipsel|g' debian/control -# Apply fix for: -# [Bug]: filesystem error with multi-byte character leads to crash on Ubuntu 22.04 #7026 -patch_p1 $DATA/7081.patch - changelog "Imported into Trisquel" package