Update patch hunks.

diff --git a/debian/patches/0002-use_system_buildflags.patch b/debian/patches/0002-use_system_buildflags.patch
index 976edb232ebc1a3d2162b806f1736c9962d36fe5..f1565e96badac2a70c2ba1759da40848cf566663 100644 (file)
--- a/debian/patches/0002-use_system_buildflags.patch
+++ b/debian/patches/0002-use_system_buildflags.patch
@@ -14,7 +14,7 @@ any modification from these flags from package side.
  1 file changed, 1 deletion(-)
 
 diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt
-index 533eedc..0311409 100644
+index 7c7a8e5..00c7813 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 fa7c3edbf8e11f7fb2585d2507b534e1b842c3ea..bb614f27ced29957c0455ce418cb415b3f9f9ef1 100644 (file)
--- a/debian/patches/0003-Use-release-version-for-Debian.patch
+++ b/debian/patches/0003-Use-release-version-for-Debian.patch
@@ -8,12 +8,12 @@ Forwarded: not-needed
  1 file changed, 5 insertions(+)
 
 diff --git a/VERSION.cmake b/VERSION.cmake
-index bce1a3b..3d0ce6a 100644
+index b504186..68ee551 100644
 --- a/VERSION.cmake
 +++ b/VERSION.cmake
-@@ -39,3 +39,8 @@ if( MIRALL_VERSION_BUILD )
- endif( MIRALL_VERSION_BUILD )
+@@ -45,3 +45,8 @@ endif( MIRALL_VERSION_BUILD )
  
+ # not used anymore. For brander, please maintain craftmaster.ini
  set(QT_MAJOR_VERSION 6)
 +
 +# Version from Debian changelog

diff --git a/debian/patches/0004-Don-t-use-GuiPrivate.patch b/debian/patches/0004-Don-t-use-GuiPrivate.patch
index 96f1ab9d4e0178979eff2b0c37c3b68d21a34bbf..c018f58ebb5d620b12a1449440888ed4cacfc491 100644 (file)
--- a/debian/patches/0004-Don-t-use-GuiPrivate.patch
+++ b/debian/patches/0004-Don-t-use-GuiPrivate.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
  1 file changed, 5 deletions(-)
 
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index ce33b8f..abdc291 100644
+index 2bfa004..d3fb5aa 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
 @@ -3,10 +3,6 @@ find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Widgets Svg Qml Quick Qui
@@ -24,7 +24,7 @@ index ce33b8f..abdc291 100644
  if(CMAKE_BUILD_TYPE MATCHES Debug)
      add_definitions(-DQT_QML_DEBUG)
  endif()
-@@ -548,7 +544,6 @@ target_link_libraries(nextcloudCore
+@@ -556,7 +552,6 @@ target_link_libraries(nextcloudCore
    PUBLIC
    Nextcloud::sync
    Qt::Widgets

diff --git a/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch b/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch
index c6c0ad0c84df23a682fb2bbe3ceb3319af86bd8b..f715da19229631cfcbf1c18f6fddac7d49e3d5a1 100644 (file)
--- a/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch
+++ b/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch
@@ -5,16 +5,15 @@ Subject: GIT_SHA1 points to the sha1 of upstream.
 Origin: Debian
 Forwarded: not-needed
 Last-Update: 2024-07-30
-
 ---
  CMakeLists.txt | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 27102a6..f87c3ef 100644
+index 5b7448b..ee4a394 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -106,9 +106,8 @@ include(GNUInstallDirs)
+@@ -112,9 +112,8 @@ include(GNUInstallDirs)
  include(DefineInstallationPaths)
  include(GenerateExportHeader)
  

diff --git a/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch b/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch
index 745eaf93240f5a46317e5de18f029530f6fbc4aa..98a320e50f1af3e504d23f4a4ea3e8249d8d30e0 100644 (file)
--- a/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch
+++ b/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch
@@ -9,10 +9,10 @@ This reverts commit 1417e8cb60e84762f94345b21d587fb54bc90b51.
  1 file changed, 8 insertions(+), 11 deletions(-)
 
 diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
-index ceb41fd..f10fc61 100644
+index e239f05..04e556f 100644
 --- a/src/libsync/owncloudpropagator.cpp
 +++ b/src/libsync/owncloudpropagator.cpp
-@@ -1474,18 +1474,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
+@@ -1497,18 +1497,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
                  }
              } else {
                  try {

diff --git a/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch b/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
index ca6882e7d3526e07b5c252152d8cb051995ebd94..80a8b1e78926b700c296923e49bc7ed6bf4609a9 100644 (file)
--- a/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
+++ b/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
@@ -17,10 +17,10 @@ This reverts commit 5b2af166d3d9c8537c565922750392d4a3f6610e.
  9 files changed, 11 insertions(+), 27 deletions(-)
 
 diff --git a/src/csync/csync.h b/src/csync/csync.h
-index 9da7497..5c8fbc0 100644
+index 8329020..ff1ec56 100644
 --- a/src/csync/csync.h
 +++ b/src/csync/csync.h
-@@ -217,7 +217,6 @@ struct OCSYNC_EXPORT csync_file_stat_s {
+@@ -218,7 +218,6 @@ struct OCSYNC_EXPORT csync_file_stat_s {
    bool is_hidden BITFIELD(1); // Not saved in the DB, only used during discovery for local files.
    bool isE2eEncrypted BITFIELD(1);
    bool is_metadata_missing BITFIELD(1); // Indicates the file has missing metadata, f.ex. the file is not a placeholder in case of vfs.
@@ -28,7 +28,7 @@ index 9da7497..5c8fbc0 100644
  
    QByteArray path;
    QByteArray rename_path;
-@@ -245,7 +244,6 @@ struct OCSYNC_EXPORT csync_file_stat_s {
+@@ -246,7 +245,6 @@ struct OCSYNC_EXPORT csync_file_stat_s {
      , is_hidden(false)
      , isE2eEncrypted(false)
      , is_metadata_missing(false)
@@ -37,10 +37,10 @@ index 9da7497..5c8fbc0 100644
  };
  
 diff --git a/src/csync/vio/csync_vio_local_unix.cpp b/src/csync/vio/csync_vio_local_unix.cpp
-index ec47ab3..c5e22ab 100644
+index 8f319a3..b68eb31 100644
 --- a/src/csync/vio/csync_vio_local_unix.cpp
 +++ b/src/csync/vio/csync_vio_local_unix.cpp
-@@ -170,7 +170,5 @@ static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf
+@@ -169,7 +169,5 @@ static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf
    buf->inode = sb.st_ino;
    buf->modtime = sb.st_mtime;
    buf->size = sb.st_size;
@@ -49,10 +49,10 @@ index ec47ab3..c5e22ab 100644
    return 0;
  }
 diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
-index e842f82..fc92795 100644
+index 1ada8a5..c882c9c 100644
 --- a/src/libsync/discovery.cpp
 +++ b/src/libsync/discovery.cpp
-@@ -1070,10 +1070,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
+@@ -1104,10 +1104,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
          if (_queryLocal != NormalQuery && _queryServer != NormalQuery)
              recurse = false;
  
@@ -63,7 +63,7 @@ index e842f82..fc92795 100644
          if ((item->_direction == SyncFileItem::Down || item->_instruction == CSYNC_INSTRUCTION_CONFLICT || item->_instruction == CSYNC_INSTRUCTION_NEW || item->_instruction == CSYNC_INSTRUCTION_SYNC) &&
                  (item->_modtime <= 0 || item->_modtime >= 0xFFFFFFFF)) {
              item->_instruction = CSYNC_INSTRUCTION_ERROR;
-@@ -1101,13 +1097,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
+@@ -1135,13 +1131,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
              }
          }
  
@@ -78,10 +78,10 @@ index e842f82..fc92795 100644
          processFileFinalize(item, path, recurse, recurseQueryLocal, recurseQueryServer);
      };
 diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
-index 6cd226f..3ca34e9 100644
+index 469dec3..4e15331 100644
 --- a/src/libsync/discoveryphase.cpp
 +++ b/src/libsync/discoveryphase.cpp
-@@ -348,7 +348,6 @@ void DiscoverySingleLocalDirectoryJob::run() {
+@@ -371,7 +371,6 @@ void DiscoverySingleLocalDirectoryJob::run() {
          i.isSymLink = dirent->type == ItemTypeSoftLink;
          i.isVirtualFile = dirent->type == ItemTypeVirtualFile || dirent->type == ItemTypeVirtualFileDownload;
          i.isMetadataMissing = dirent->is_metadata_missing;
@@ -90,10 +90,10 @@ index 6cd226f..3ca34e9 100644
          results.push_back(i);
      }
 diff --git a/src/libsync/discoveryphase.h b/src/libsync/discoveryphase.h
-index bb932f5..2e801de 100644
+index 0c9edce..913f37f 100644
 --- a/src/libsync/discoveryphase.h
 +++ b/src/libsync/discoveryphase.h
-@@ -106,7 +106,6 @@ struct LocalInfo
+@@ -107,7 +107,6 @@ struct LocalInfo
      bool isVirtualFile = false;
      bool isSymLink = false;
      bool isMetadataMissing = false;
@@ -102,10 +102,10 @@ index bb932f5..2e801de 100644
  };
  
 diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
-index 9dbdde6..2931a3d 100644
+index 8361d8a..49900b3 100644
 --- a/src/libsync/filesystem.cpp
 +++ b/src/libsync/filesystem.cpp
-@@ -468,7 +468,6 @@ bool FileSystem::setFolderPermissions(const QString &path,
+@@ -482,7 +482,6 @@ bool FileSystem::setFolderPermissions(const QString &path,
          case OCC::FileSystem::FolderPermissions::ReadOnly:
              break;
          case OCC::FileSystem::FolderPermissions::ReadWrite:
@@ -114,10 +114,10 @@ index 9dbdde6..2931a3d 100644
              break;
          }
 diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
-index f10fc61..193da94 100644
+index 04e556f..d4382f6 100644
 --- a/src/libsync/owncloudpropagator.cpp
 +++ b/src/libsync/owncloudpropagator.cpp
-@@ -1461,9 +1461,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
+@@ -1472,9 +1472,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
                  try {
                      if (FileSystem::fileExists(propagator()->fullLocalPath(_item->_file))) {
                          FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_file), FileSystem::FolderPermissions::ReadOnly);
@@ -133,7 +133,7 @@ index f10fc61..193da94 100644
                      }
                  }
                  catch (const std::filesystem::filesystem_error &e)
-@@ -1475,13 +1481,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
+@@ -1498,13 +1504,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
              } else {
                  try {
                      if (FileSystem::fileExists(propagator()->fullLocalPath(_item->_file))) {
@@ -153,7 +153,7 @@ index f10fc61..193da94 100644
                      }
                  }
 diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
-index c64b921..db23060 100644
+index 24c86a7..2ffcb4b 100644
 --- a/src/libsync/syncengine.cpp
 +++ b/src/libsync/syncengine.cpp
 @@ -363,10 +363,6 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
@@ -168,15 +168,15 @@ index c64b921..db23060 100644
              modificationHappened |= item->_size != prev._fileSize;
  
 diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h
-index 46ee496..d90348a 100644
+index 154d13a..041e48d 100644
 --- a/src/libsync/syncfileitem.h
 +++ b/src/libsync/syncfileitem.h
-@@ -343,8 +343,6 @@ public:
+@@ -344,8 +344,6 @@ public:
      bool _isLivePhoto = false;
      QString _livePhotoFile;
  
 -    bool isPermissionsInvalid = false;
 -
      QString _discoveryResult;
- };
  
+     /// if true, requests the file to be permanently deleted instead of moved to the trashbin