Update patch hunks.

diff --git a/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch b/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch
index 789e06c51e87c2685ecc556207fba60b9924c394..b8adf148b47cdf33c133aec6d5aea519ba04a20b 100644 (file)
--- a/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch
+++ b/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch
@@ -9,14 +9,14 @@ Last-Update: 2021-01-03
 Inside debian we want that the kde plugins are directly found,
 so we need to push them to known places.
 ---
- shell_integration/dolphin/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ shell_integration/dolphin/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/shell_integration/dolphin/CMakeLists.txt b/shell_integration/dolphin/CMakeLists.txt
-index 1642c80..e97f08a 100644
+index 07e6096..ada94fd 100644
 --- a/shell_integration/dolphin/CMakeLists.txt
 +++ b/shell_integration/dolphin/CMakeLists.txt
-@@ -31,13 +31,14 @@ add_library(${OWNCLOUDDOLPHINHELPER} SHARED
+@@ -31,18 +31,21 @@ add_library(${OWNCLOUDDOLPHINHELPER} SHARED
      ownclouddolphinpluginhelper.cpp)
  target_link_libraries(${OWNCLOUDDOLPHINHELPER} Qt5::Network)
  generate_export_header(${OWNCLOUDDOLPHINHELPER} BASE_NAME ownclouddolphinpluginhelper)
@@ -32,8 +32,10 @@ index 1642c80..e97f08a 100644
  
  #---ACTION PLUGIN---
  set(OWNCLOUDDOLPHINACTIONPLUGIN ${APPLICATION_EXECUTABLE}dolphinactionplugin)
-@@ -46,3 +47,4 @@ target_link_libraries(${OWNCLOUDDOLPHINACTIONPLUGIN} KF5::CoreAddons KF5::KIOCor
  configure_file(ownclouddolphinactionplugin.desktop.in ${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop ESCAPE_QUOTES @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
- install(TARGETS ${OWNCLOUDDOLPHINACTIONPLUGIN} DESTINATION ${KDE_INSTALL_PLUGINDIR})
++<<<<<<< HEAD
+ kcoreaddons_add_plugin(${OWNCLOUDDOLPHINACTIONPLUGIN} INSTALL_NAMESPACE "kf5/kfileitemaction"
+                        SOURCES ownclouddolphinactionplugin.cpp)
+ target_link_libraries(${OWNCLOUDDOLPHINACTIONPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ${OWNCLOUDDOLPHINHELPER})
 +set_target_properties(${OWNCLOUDDOLPHINACTIONPLUGIN} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
+ kcoreaddons_desktop_to_json(${OWNCLOUDDOLPHINACTIONPLUGIN} ${CMAKE_CURRENT_BINARY_DIR}/${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop)

diff --git a/debian/patches/0003-Use-release-version-for-Debian.patch b/debian/patches/0003-Use-release-version-for-Debian.patch
index fda2837b4f31b3e7fdccbfe6762c5e7057a818c5..4ffd62d068d6f2ae28d704c7e50d279f7bca14d8 100644 (file)
--- a/debian/patches/0003-Use-release-version-for-Debian.patch
+++ b/debian/patches/0003-Use-release-version-for-Debian.patch
@@ -1,19 +1,20 @@
 From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>
 Date: Mon, 4 Jan 2021 14:15:00 +0100
-Forwarded: not-needed
 Subject: Use release version for Debian
 
 Drop upstream git information from version output.
+
+Forwarded: not-needed
 ---
  CMakeLists.txt | 17 -----------------
  VERSION.cmake  |  5 +++++
  2 files changed, 5 insertions(+), 17 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a32c1ce..302340b 100644
+index 475cef0..0ae0cd4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -86,29 +86,12 @@ include(GNUInstallDirs)
+@@ -90,29 +90,12 @@ include(GNUInstallDirs)
  include(DefineInstallationPaths)
  include(GenerateExportHeader)
  
@@ -44,7 +45,7 @@ index a32c1ce..302340b 100644
  set(SHAREDIR ${CMAKE_INSTALL_FULL_DATADIR})
  
 diff --git a/VERSION.cmake b/VERSION.cmake
-index 7056946..8896d75 100644
+index 3a2ad05..c759939 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 b8c2beeb85b5cdff52ceb8133ea03a8d278a6440..05d3c9c6969c1a8efee4d90a1fa01b639f34924f 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
@@ -4,16 +4,16 @@ Subject: Revert: 8fb673457b42 ("Add a button to create a debug archive")
 
 Drop dependency on Qt5::GuiPrivate
 ---
- src/gui/CMakeLists.txt      |   5 ---
- src/gui/generalsettings.cpp | 100 --------------------------------------------
- src/gui/generalsettings.h   |   1 -
- 3 files changed, 106 deletions(-)
+ src/gui/CMakeLists.txt      |  5 ---
+ src/gui/generalsettings.cpp | 95 ---------------------------------------------
+ src/gui/generalsettings.h   |  1 -
+ 3 files changed, 101 deletions(-)
 
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index b9a1778..ab4e985 100644
+index 7639f95..481a8f5 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
-@@ -9,10 +9,6 @@ if(QUICK_COMPILER)
+@@ -10,10 +10,6 @@ if(QUICK_COMPILER)
          )
  endif()
  
@@ -24,7 +24,7 @@ index b9a1778..ab4e985 100644
  if(CMAKE_BUILD_TYPE MATCHES Debug)
      add_definitions(-DQT_QML_DEBUG)
  endif()
-@@ -563,7 +559,6 @@ target_link_libraries(nextcloudCore
+@@ -513,7 +509,6 @@ target_link_libraries(nextcloudCore
    PUBLIC
    Nextcloud::sync
    Qt5::Widgets
@@ -33,10 +33,10 @@ index b9a1778..ab4e985 100644
    Qt5::Network
    Qt5::Xml
 diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
-index 235f7e6..cb54493 100644
+index 6a5164a..cb54493 100644
 --- a/src/gui/generalsettings.cpp
 +++ b/src/gui/generalsettings.cpp
-@@ -34,108 +34,20 @@
+@@ -34,103 +34,20 @@
  
  #include "ignorelisteditor.h"
  #include "common/utility.h"