From fd97a1720297b561e046377edb20f84c6276325d7ec28705c8103d49f479432a Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Fri, 11 Nov 2022 10:25:00 +0000 Subject: [PATCH] Accepting request 1035200 from home:ecsos - Update to 3.6.2 - [stable-3.6] Fix call notification dialog buttons by @backportbot-nextcloud in #5075 - [stable-3.6] emit missing signal to update folder sync status icon by @backportbot-nextcloud in #5090 - [stable-3.6] Fix macOS autoupdater settings by @backportbot-nextcloud in #5103 - [stable-3.6] Validate and sanitise edit locally token and relpath before sending to server by @backportbot-nextcloud in #5106 - [stable-3.6] Fix compatibility with newer python3-nautilus by @backportbot-nextcloud in #5112 - [stable-3.6] Refactor FolderMan's "Edit Locally" capabilities as separate class by @backportbot-nextcloud in #5111 - [stable-3.6] use new public API to open an edit locally URL by @backportbot-nextcloud in #5117 - [stable-3.6] Use separate variable for cfg file name in CMAKE. by @backportbot-nextcloud in #5140 - Fix stable-3.6 compile on macOS by @claucambra in #5154 - Fix bad backport of CustomButton changes in Stable-3.6 by @claucambra in #5155 - Backport/5067/stable 3.6 by @allexzander in #5153 - Backport/5092/stable 3.6 by @allexzander in #5156 - [stable-3.6] properly escape a path when creating a test file during tests by @backportbot-nextcloud in #5158 - Drop fix_nautilus_ext.patch because now in upstream. OBS-URL: https://build.opensuse.org/request/show/1035200 OBS-URL: https://build.opensuse.org/package/show/network/nextcloud-desktop?expand=0&rev=82 --- fix_nautilus_ext.patch | 29 ----------------------------- nextcloud-desktop-3.6.1.tar.gz | 3 --- nextcloud-desktop-3.6.2.tar.gz | 3 +++ nextcloud-desktop.changes | 21 +++++++++++++++++++++ nextcloud-desktop.spec | 4 +--- 5 files changed, 25 insertions(+), 35 deletions(-) delete mode 100644 fix_nautilus_ext.patch delete mode 100644 nextcloud-desktop-3.6.1.tar.gz create mode 100644 nextcloud-desktop-3.6.2.tar.gz diff --git a/fix_nautilus_ext.patch b/fix_nautilus_ext.patch deleted file mode 100644 index 34e9419..0000000 --- a/fix_nautilus_ext.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 011d4b89c8bbcc6e1320b06c700c608819eaf622 Mon Sep 17 00:00:00 2001 -From: Paolo Stivanin -Date: Sat, 22 Oct 2022 16:31:24 +0200 -Subject: [PATCH] Add support for GNOME 43 (fix #5041) - -Signed-off-by: Paolo Stivanin ---- - shell_integration/nautilus/syncstate.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/shell_integration/nautilus/syncstate.py b/shell_integration/nautilus/syncstate.py -index c4dacb5b0f5..4c77fda4c9d 100644 ---- a/shell_integration/nautilus/syncstate.py -+++ b/shell_integration/nautilus/syncstate.py -@@ -200,9 +200,12 @@ def check_registered_paths(self, filename): - break - return (topLevelFolder, internalFile) - -- def get_file_items(self, window, files): -- # Show the menu extension to share a file or folder -+ def get_file_items(self, *args): -+ # `args` will be `[files: List[Nautilus.FileInfo]]` in Nautilus 4.0 API, -+ # and `[window: Gtk.Widget, files: List[Nautilus.FileInfo]]` in Nautilus 3.0 API. -+ files = args[-1] - -+ # Show the menu extension to share a file or folder - # Get usable file paths from the uris - all_internal_files = True - for i, file_uri in enumerate(files): diff --git a/nextcloud-desktop-3.6.1.tar.gz b/nextcloud-desktop-3.6.1.tar.gz deleted file mode 100644 index d5f03cf..0000000 --- a/nextcloud-desktop-3.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7ea1ed2d0f44a3b8b645a67f21af164bf1024b6872570a61c62994d2a8c1b5b -size 15346135 diff --git a/nextcloud-desktop-3.6.2.tar.gz b/nextcloud-desktop-3.6.2.tar.gz new file mode 100644 index 0000000..6dc47fd --- /dev/null +++ b/nextcloud-desktop-3.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55ddd5c3b6f7c9859416897cc89597906513e2bc62721c63fe4f1476eea27762 +size 15406717 diff --git a/nextcloud-desktop.changes b/nextcloud-desktop.changes index ab7bccc..c9dcf87 100644 --- a/nextcloud-desktop.changes +++ b/nextcloud-desktop.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Nov 10 18:58:04 UTC 2022 - ecsos + +- Update to 3.6.2 + - [stable-3.6] Fix call notification dialog buttons by @backportbot-nextcloud in #5075 + - [stable-3.6] emit missing signal to update folder sync status icon by @backportbot-nextcloud in #5090 + - [stable-3.6] Fix macOS autoupdater settings by @backportbot-nextcloud in #5103 + - [stable-3.6] Validate and sanitise edit locally token and relpath + before sending to server by @backportbot-nextcloud in #5106 + - [stable-3.6] Fix compatibility with newer python3-nautilus by @backportbot-nextcloud in #5112 + - [stable-3.6] Refactor FolderMan's "Edit Locally" capabilities + as separate class by @backportbot-nextcloud in #5111 + - [stable-3.6] use new public API to open an edit locally URL by @backportbot-nextcloud in #5117 + - [stable-3.6] Use separate variable for cfg file name in CMAKE. by @backportbot-nextcloud in #5140 + - Fix stable-3.6 compile on macOS by @claucambra in #5154 + - Fix bad backport of CustomButton changes in Stable-3.6 by @claucambra in #5155 + - Backport/5067/stable 3.6 by @allexzander in #5153 + - Backport/5092/stable 3.6 by @allexzander in #5156 + - [stable-3.6] properly escape a path when creating a test file during tests by @backportbot-nextcloud in #5158 +- Drop fix_nautilus_ext.patch because now in upstream. + ------------------------------------------------------------------- Fri Nov 4 11:41:37 UTC 2022 - ecsos diff --git a/nextcloud-desktop.spec b/nextcloud-desktop.spec index 5e02a19..ffa14dc 100644 --- a/nextcloud-desktop.spec +++ b/nextcloud-desktop.spec @@ -19,7 +19,7 @@ %define soname libnextcloudsync %define sover 0 Name: nextcloud-desktop -Version: 3.6.1 +Version: 3.6.2 Release: 0 Summary: Nextcloud desktop synchronisation client License: GPL-2.0-or-later AND LGPL-3.0-or-later @@ -29,8 +29,6 @@ Source: https://github.com/nextcloud/desktop/archive/v%{version}/%{name} Source1: sysctl-sync-inotify.conf # PATCH-FIX-OPENSUSE nextcloud-desktop-remove-datetime.patch sor.alexei@meowr.ru -- Remove __TIME__ and __DATE__. Patch1: nextcloud-desktop-remove-datetime.patch -# PATCH-FIX-UPSTREAM https://github.com/nextcloud/desktop/pull/5084 -Patch2: fix_nautilus_ext.patch BuildRequires: AppStream BuildRequires: cmake >= 3.2 BuildRequires: extra-cmake-modules