From 2044116828628ec89883d0e3bad797555213300d Mon Sep 17 00:00:00 2001
From: Mukundan Ragavan <nonamedotc@gmail.com>
Date: Thu, 24 Nov 2022 12:58:52 -0600
Subject: [PATCH] update to v3.6.2

---
 .gitignore                         |  1 +
 nautilus_43.patch                  | 64 ------------------------------
 nextcloud-client.spec              |  7 +---
 sources                            |  2 +-
 xcb_3.6.1.patch => xcb_3.6.2.patch |  0
 5 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 nautilus_43.patch
 rename xcb_3.6.1.patch => xcb_3.6.2.patch (100%)

diff --git a/.gitignore b/.gitignore
index 13f85aa..ee33a96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /desktop-3.5.4.tar.gz
 /desktop-3.6.0.tar.gz
 /desktop-3.6.1.tar.gz
+/desktop-3.6.2.tar.gz
diff --git a/nautilus_43.patch b/nautilus_43.patch
deleted file mode 100644
index 4fa2dea..0000000
--- a/nautilus_43.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 7d40ea421f25f816fe3c780c7ebefeabff9617a9 Mon Sep 17 00:00:00 2001
-From: Gabriele Musco <emaildigabry@gmail.com>
-Date: Mon, 3 Oct 2022 13:46:18 +0200
-Subject: [PATCH 1/2] feat: support Nautilus 4.0 API
-
-As explained in the comment, the Nautilus 4.0 API just passes files without the window object (which was unused anyway). This small fix keeps compatibility with the 3.0 API and checks the number of arguments.
-
-Would be really nice if you could make this count towards hacktoberfest as well!
-
-Signed-off-by: Gabriele Musco <emaildigabry@gmail.com>
----
- 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..5733cf69d88 100644
---- a/shell_integration/nautilus/syncstate.py
-+++ b/shell_integration/nautilus/syncstate.py
-@@ -26,7 +26,7 @@
- import tempfile
- import time
- 
--from gi.repository import GObject, Nautilus
-+from repository import GObject, Nautilus
- 
- # Note: setappname.sh will search and replace 'ownCloud' on this file to update this line and other
- # occurrences of the name
-@@ -200,8 +200,11 @@ def check_registered_paths(self, filename):
-                 break
-         return (topLevelFolder, internalFile)
- 
--    def get_file_items(self, window, files):
-+    def get_file_items(self, *args):
-         # Show the menu extension to share a file or folder
-+        
-+        # Nautilus 3.0 API passes args (window, files), 4.0 API just passes files
-+        files = args[0] if len(args) == 1 else args[1]
- 
-         # Get usable file paths from the uris
-         all_internal_files = True
-
-From 2543329741b731ef01e03d24683efa73da4b3f82 Mon Sep 17 00:00:00 2001
-From: Gabriele Musco <emaildigabry@gmail.com>
-Date: Mon, 3 Oct 2022 21:09:26 +0200
-Subject: [PATCH 2/2] fix import
-
-Signed-off-by: Gabriele Musco <emaildigabry@gmail.com>
----
- shell_integration/nautilus/syncstate.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shell_integration/nautilus/syncstate.py b/shell_integration/nautilus/syncstate.py
-index 5733cf69d88..b6141e00102 100644
---- a/shell_integration/nautilus/syncstate.py
-+++ b/shell_integration/nautilus/syncstate.py
-@@ -26,7 +26,7 @@
- import tempfile
- import time
- 
--from repository import GObject, Nautilus
-+from gi.repository import GObject, Nautilus
- 
- # Note: setappname.sh will search and replace 'ownCloud' on this file to update this line and other
- # occurrences of the name
diff --git a/nextcloud-client.spec b/nextcloud-client.spec
index 5ee1333..7ed42b7 100644
--- a/nextcloud-client.spec
+++ b/nextcloud-client.spec
@@ -4,7 +4,7 @@
 %endif
 
 Name:           nextcloud-client
-Version:        3.6.1
+Version:        3.6.2
 Release:        %autorelease
 Summary:        The Nextcloud Client
 
@@ -17,10 +17,6 @@ Source1:        com.nextcloud.desktopclient.nextcloud.metainfo.xml
 # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/3BVLBS4B3XHJEXFVGD7RK2ZMXZG6JQZT/
 Patch0:         xcb_%{version}.patch
 
-# Nautilus 43 support
-# https://github.com/nextcloud/desktop/pull/5001
-Patch1:         nautilus_43.patch
-
 %if 0%{?rhel}
 BuildRequires:  rpmautospec-rpm-macros
 BuildRequires:  policycoreutils
@@ -158,7 +154,6 @@ The nextcloud desktop client dolphin extension.
 %prep
 %setup -n desktop-%{version}
 %patch0 -p1
-%patch1 -p1
 
 # change compiler flag
 sed -i 's/-fPIE/-fPIC/g' src/gui/CMakeLists.txt
diff --git a/sources b/sources
index 6850ae9..cd4cd74 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (desktop-3.6.1.tar.gz) = 444062440570efd82b8cd9acf85dcc5826552c86c31edc19ae2f87d9fdf23afa501aac03e4b8135bb037feb523fdcbc230339387acbf56c0ca6e5df3e7bae583
+SHA512 (desktop-3.6.2.tar.gz) = 1baae103c08a981e86aee74550d31a195f639fef830d0a78213f7890b820ddf2cd39fa742b99c9222930a4ef9587acc820678c56527e98ca482689b3bffd14ff
diff --git a/xcb_3.6.1.patch b/xcb_3.6.2.patch
similarity index 100%
rename from xcb_3.6.1.patch
rename to xcb_3.6.2.patch