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 777a3c206612b79f3ddfc3c2f984c52d865a4149..789e06c51e87c2685ecc556207fba60b9924c394 100644 (file)
--- a/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch
+++ b/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch
@@ -12,9 +12,11 @@ so we need to push them to known places.
  shell_integration/dolphin/CMakeLists.txt | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
+diff --git a/shell_integration/dolphin/CMakeLists.txt b/shell_integration/dolphin/CMakeLists.txt
+index 1642c80..e97f08a 100644
 --- a/shell_integration/dolphin/CMakeLists.txt
 +++ b/shell_integration/dolphin/CMakeLists.txt
-@@ -31,13 +31,14 @@ add_library(${OWNCLOUDDOLPHINHELPER} SHA
+@@ -31,13 +31,14 @@ add_library(${OWNCLOUDDOLPHINHELPER} SHARED
      ownclouddolphinpluginhelper.cpp)
  target_link_libraries(${OWNCLOUDDOLPHINHELPER} Qt5::Network)
  generate_export_header(${OWNCLOUDDOLPHINHELPER} BASE_NAME ownclouddolphinpluginhelper)
@@ -30,7 +32,7 @@ so we need to push them to known places.
  
  #---ACTION PLUGIN---
  set(OWNCLOUDDOLPHINACTIONPLUGIN ${APPLICATION_EXECUTABLE}dolphinactionplugin)
-@@ -46,3 +47,4 @@ target_link_libraries(${OWNCLOUDDOLPHINA
+@@ -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})

diff --git a/debian/patches/0002-use_system_buildflags.patch b/debian/patches/0002-use_system_buildflags.patch
index 3a228ab0ffb2dc93438641ef0f65573b99595447..d030fdfd94e033690e64d4781cad0d7a76c53c72 100644 (file)
--- a/debian/patches/0002-use_system_buildflags.patch
+++ b/debian/patches/0002-use_system_buildflags.patch
@@ -13,6 +13,8 @@ any modification from these flags from package side.
  src/csync/CMakeLists.txt | 1 -
  1 file changed, 1 deletion(-)
 
+diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt
+index 5bdd5e5..3483342 100644
 --- a/src/csync/CMakeLists.txt
 +++ b/src/csync/CMakeLists.txt
 @@ -14,7 +14,6 @@ set(LIBRARY_SOVERSION "0")

diff --git a/debian/patches/0003-Use-release-version-for-Debian.patch b/debian/patches/0003-Use-release-version-for-Debian.patch
index 507c9dc1fa52578be69652940c402dc8b4054bdf..e7ea9808430cc5fc924d3ffbeb658c0e6452ec73 100644 (file)
--- a/debian/patches/0003-Use-release-version-for-Debian.patch
+++ b/debian/patches/0003-Use-release-version-for-Debian.patch
@@ -9,6 +9,8 @@ Drop upstream git information from version output.
  VERSION.cmake  |  5 +++++
  2 files changed, 5 insertions(+), 17 deletions(-)
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0176eaf..48eb717 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -73,29 +73,12 @@ include(GNUInstallDirs)
@@ -41,9 +43,11 @@ Drop upstream git information from version output.
  set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
  set(SHAREDIR ${CMAKE_INSTALL_FULL_DATADIR})
  
+diff --git a/VERSION.cmake b/VERSION.cmake
+index 54dfc54..ba3acd5 100644
 --- a/VERSION.cmake
 +++ b/VERSION.cmake
-@@ -29,3 +29,8 @@ set( MIRALL_VERSION_STRING "${MIRALL_VER
+@@ -29,3 +29,8 @@ set( MIRALL_VERSION_STRING "${MIRALL_VERSION}${MIRALL_VERSION_SUFFIX}" )
  if( MIRALL_VERSION_BUILD )
      set( MIRALL_VERSION_STRING "${MIRALL_VERSION_STRING} (build ${MIRALL_VERSION_BUILD})" )
  endif( MIRALL_VERSION_BUILD )

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 a77f4fd1fe8c162128fdf6294d70ea144bc03a90..102e8b8ea8d4f2b601f2ef51ff392230d997f835 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,11 +4,13 @@ Subject: Revert: 8fb673457b42 ("Add a button to create a debug archive")
 
 Drop dependency on Qt5::GuiPrivate
 ---
- src/gui/CMakeLists.txt      |  2 +-
- src/gui/generalsettings.cpp | 98 ---------------------------------------------
- src/gui/generalsettings.h   |  1 -
- 3 files changed, 1 insertion(+), 100 deletions(-)
+ src/gui/CMakeLists.txt      |   5 ---
+ src/gui/generalsettings.cpp | 100 --------------------------------------------
+ src/gui/generalsettings.h   |   1 -
+ 3 files changed, 106 deletions(-)
 
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index 6ed209e..183ef28 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
 @@ -9,10 +9,6 @@ if(QUICK_COMPILER)
@@ -22,7 +24,7 @@ Drop dependency on Qt5::GuiPrivate
  if(CMAKE_BUILD_TYPE MATCHES Debug)
      add_definitions(-DQT_QML_DEBUG)
  endif()
-@@ -534,7 +530,6 @@ target_link_libraries(nextcloudCore
+@@ -536,7 +532,6 @@ target_link_libraries(nextcloudCore
    PUBLIC
    Nextcloud::sync
    Qt5::Widgets
@@ -30,9 +32,11 @@ Drop dependency on Qt5::GuiPrivate
    Qt5::Svg
    Qt5::Network
    Qt5::Xml
+diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
+index 4a7ff30..52f6094 100644
 --- a/src/gui/generalsettings.cpp
 +++ b/src/gui/generalsettings.cpp
-@@ -34,106 +34,20 @@
+@@ -34,108 +34,20 @@
  
  #include "ignorelisteditor.h"
  #include "common/utility.h"
@@ -116,7 +120,9 @@ Drop dependency on Qt5::GuiPrivate
 -{
 -    const auto entries = createFileList();
 -
+-    // TODO: Port away from this private API (best to port to KArchive)
 -    QZipWriter zip(filename);
+-    zip.setCreationPermissions(zip.creationPermissions() | QFile::ReadOther);
 -    for (const auto &entry : entries) {
 -        if (entry.localFilename.isEmpty()) {
 -            zip.addDirectory(entry.zipFilename);
@@ -139,7 +145,7 @@ Drop dependency on Qt5::GuiPrivate
  namespace OCC {
  
  GeneralSettings::GeneralSettings(QWidget *parent)
-@@ -224,7 +138,6 @@ GeneralSettings::GeneralSettings(QWidget
+@@ -226,7 +138,6 @@ GeneralSettings::GeneralSettings(QWidget *parent)
      _ui->monoIconsCheckBox->setVisible(Theme::instance()->monoIconsAvailable());
  
      connect(_ui->ignoredFilesButton, &QAbstractButton::clicked, this, &GeneralSettings::slotIgnoreFilesEditor);
@@ -147,7 +153,7 @@ Drop dependency on Qt5::GuiPrivate
  
      // accountAdded means the wizard was finished and the wizard might change some options.
      connect(AccountManager::instance(), &AccountManager::accountAdded, this, &GeneralSettings::loadMiscSettings);
-@@ -468,17 +381,6 @@ void GeneralSettings::slotIgnoreFilesEdi
+@@ -470,17 +381,6 @@ void GeneralSettings::slotIgnoreFilesEditor()
      }
  }
  
@@ -165,6 +171,8 @@ Drop dependency on Qt5::GuiPrivate
  void GeneralSettings::slotShowLegalNotice()
  {
      auto notice = new LegalNotice();
+diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h
+index acc8793..e7176f1 100644
 --- a/src/gui/generalsettings.h
 +++ b/src/gui/generalsettings.h
 @@ -51,7 +51,6 @@ private slots: