Update patch hunks

diff --git a/debian/patches/0003-Use-release-version-for-Debian.patch b/debian/patches/0003-Use-release-version-for-Debian.patch
index e7ea9808430cc5fc924d3ffbeb658c0e6452ec73..769900a604e4b8c50a3b0badf01713c9e2e5d856 100644 (file)
--- a/debian/patches/0003-Use-release-version-for-Debian.patch
+++ b/debian/patches/0003-Use-release-version-for-Debian.patch
@@ -10,10 +10,10 @@ Drop upstream git information from version output.
  2 files changed, 5 insertions(+), 17 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0176eaf..48eb717 100644
+index a32c1ce..302340b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -73,29 +73,12 @@ include(GNUInstallDirs)
+@@ -86,29 +86,12 @@ include(GNUInstallDirs)
  include(DefineInstallationPaths)
  include(GenerateExportHeader)
  
@@ -44,7 +44,7 @@ index 0176eaf..48eb717 100644
  set(SHAREDIR ${CMAKE_INSTALL_FULL_DATADIR})
  
 diff --git a/VERSION.cmake b/VERSION.cmake
-index 54dfc54..ba3acd5 100644
+index 896ac27..7028904 100644
 --- a/VERSION.cmake
 +++ b/VERSION.cmake
 @@ -29,3 +29,8 @@ set( MIRALL_VERSION_STRING "${MIRALL_VERSION}${MIRALL_VERSION_SUFFIX}" )

diff --git a/debian/patches/0004-Revert-8fb673457b42-Add-a-button-to-create-a-debug-a.patch b/debian/patches/0004-Revert-8fb673457b42-Add-a-button-to-create-a-debug-a.patch
index 102e8b8ea8d4f2b601f2ef51ff392230d997f835..e833770f45d29f1eb388be71f2768c0d29a813f6 100644 (file)
--- a/debian/patches/0004-Revert-8fb673457b42-Add-a-button-to-create-a-debug-a.patch
+++ b/debian/patches/0004-Revert-8fb673457b42-Add-a-button-to-create-a-debug-a.patch
@@ -10,7 +10,7 @@ Drop dependency on Qt5::GuiPrivate
  3 files changed, 106 deletions(-)
 
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 6ed209e..183ef28 100644
+index 5a11578..8ff443f 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
 @@ -9,10 +9,6 @@ if(QUICK_COMPILER)
@@ -24,7 +24,7 @@ index 6ed209e..183ef28 100644
  if(CMAKE_BUILD_TYPE MATCHES Debug)
      add_definitions(-DQT_QML_DEBUG)
  endif()
-@@ -536,7 +532,6 @@ target_link_libraries(nextcloudCore
+@@ -559,7 +555,6 @@ target_link_libraries(nextcloudCore
    PUBLIC
    Nextcloud::sync
    Qt5::Widgets

diff --git a/debian/patches/0005-compat-older-python3-nautilus.patch b/debian/patches/0005-compat-older-python3-nautilus.patch
index d0e64b870cce0187f426bd866923ac7a0262f958..1e2ce8ff6f096c67a90010d1a28b36fb484c0ca3 100644 (file)
--- a/debian/patches/0005-compat-older-python3-nautilus.patch
+++ b/debian/patches/0005-compat-older-python3-nautilus.patch
@@ -1,11 +1,17 @@
-Description: Compatibility with older python3-nautilus
-Author: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
+From: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
+Date: Thu, 25 Aug 2022 11:02:03 +0200
+Subject: Compatibility with older python3-nautilus
 Forwarded: https://github.com/nextcloud/desktop/pull/4870
-Last-Update: 2022-08-25
 
---- nextcloud-desktop-3.5.4.orig/shell_integration/nautilus/syncstate.py
-+++ nextcloud-desktop-3.5.4/shell_integration/nautilus/syncstate.py
-@@ -200,9 +200,10 @@ class MenuExtension_ownCloud(GObject.GOb
+---
+ shell_integration/nautilus/syncstate.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/shell_integration/nautilus/syncstate.py b/shell_integration/nautilus/syncstate.py
+index c4dacb5..9e0d51b 100644
+--- a/shell_integration/nautilus/syncstate.py
++++ b/shell_integration/nautilus/syncstate.py
+@@ -200,9 +200,10 @@ class MenuExtension_ownCloud(GObject.GObject, Nautilus.MenuProvider):
                  break
          return (topLevelFolder, internalFile)