fix: Convert full source paths to relative in logs

.github/workflows/clang-format.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-    - uses: cpp-linter/cpp-linter-action@7dacd91f6a008a7c714bba700f4d08468a1eb428 # v2.16.4
+    - uses: cpp-linter/cpp-linter-action@b7fbdde0f6776f478f4d8867c2b746077fa7ea89 # v2.16.5
       id: linter
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linux-clang-compile-tests.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     name: Linux Clang compilation and tests
     runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-trixie-6.8.2-2
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -17,7 +17,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
+          cmake .. -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror
           ninja
       - name: Run tests
         run: |

.github/workflows/linux-gcc-compile-tests.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     name: Linux GCC compilation and tests
     runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-trixie-6.8.2-2
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -17,7 +17,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
+          cmake .. -G Ninja -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror
           ninja
       - name: Run tests
         run: |

.github/workflows/reuse.yml

@@ -24,4 +24,4 @@ jobs:
           persist-credentials: false
 
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5.0.0
+        uses: fsfe/reuse-action@676e2d560c9a403aa252096d99fcab3e1132b0f5 # v6.0.0

.github/workflows/stale.yml

@@ -17,7 +17,7 @@ jobs:
       issues: write
 
     steps:
-      - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
         with:
           operations-per-run: 1500
           days-before-stale: 28

.gitignore

@@ -195,3 +195,9 @@ convert.exe
 *state-*.png
 theme.qrc
 *.AppImage
+
+# Xcode Build Artifacts
+DerivedData
+
+# Swift Package Manager Build Artifacts
+.swiftpm

CMakeLists.txt

@@ -82,7 +82,20 @@ if (NOT DEFINED PACKAGE)
     set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client")
 endif()
 
-set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+set(APPLE_SUPPRESS_X11_WARNING ON)
+
+find_package(ECM 6.0.0 REQUIRED NO_MODULE)
+set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://invent.kde.org/frameworks/extra-cmake-modules")
+
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
+
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(ECMMarkNonGuiExecutable)
+include(ECMSetupVersion)
+
+#include(KDECompilerSettings NO_POLICY_SCOPE)
+include(ECMEnableSanitizers)
 
 include(ECMCoverageOption)
 

README.md

@@ -36,6 +36,7 @@ If you find any bugs or have any suggestion for improvement, please
 > [!TIP]
 > For building the client on macOS we have a tool called `mac-crafter`.
 > You will find more information about it in [its dedicated README](admin/osx/mac-crafter/README.md).
+> Also, please note the [README in the NextcloudIntegration project](shell_integration/MacOSX/NextcloudIntegration/README.md) which provides an even more convenient way to work on and build the desktop client on macOS by using Xcode.
 
 #### 1. 🚀 Set up your local development environment
 

REUSE.toml

@@ -29,6 +29,16 @@ precedence = "aggregate"
 SPDX-FileCopyrightText = "2014 ownCloud GmbH"
 SPDX-License-Identifier = "GPL-2.0-or-later"
 
+[[annotations]]
+path = [
+    "admin/osx/TransifexStringCatalogSanitizer/Package.swift",
+    "admin/osx/TransifexStringCatalogSanitizer/Package.resolved",
+    "admin/osx/TransifexStringCatalogSanitizer/README.md",
+]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
+SPDX-License-Identifier = "GPL-2.0-or-later"
+
 [[annotations]]
 path = ["admin/osx/mac-crafter/Package.resolved", "shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved"]
 precedence = "aggregate"
@@ -42,13 +52,21 @@ SPDX-FileCopyrightText = "2014 ownCloud GmbH, 2022 Nextcloud GmbH and Nextcloud
 SPDX-License-Identifier = "GPL-2.0-or-later"
 
 [[annotations]]
-path = ["shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj", "shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/contents.xcworkspacedata", "shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist", "shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/xcshareddata/xcschemes/FinderSyncExt.xcscheme"]
+path = [
+    "shell_integration/MacOSX/NextcloudIntegration/.gitignore",
+    "shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj", 
+    "shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/contents.xcworkspacedata", 
+    "shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist", 
+    "shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/xcshareddata/xcschemes/FinderSyncExt.xcscheme",
+    "shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/xcshareddata/xcschemes/NextcloudDev.xcscheme",
+    "shell_integration/MacOSX/NextcloudIntegration/README.md"
+]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "GPL-2.0-or-later"
 
 [[annotations]]
-path = ["shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Localizable.xcstrings", "shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Localizable.xcstrings"]
+path = ["shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Localizable.xcstrings", "shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Localizable.xcstrings", "shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Assets.xcassets/*", "shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Assets.xcassets/FileProviderDomainSymbol.symbolset/*", "shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Assets.xcassets/*", "shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Assets.xcassets/FileProviderDomainSymbol.symbolset/*"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2015 ownCloud GmbH, 2022 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "GPL-2.0-or-later"

VERSION.cmake

@@ -5,12 +5,12 @@
 # ------------------------------------
 # Version information
 # ------------------------------------
-set(MIRALL_VERSION_MAJOR 3)
-set(MIRALL_VERSION_MINOR 17)
+set(MIRALL_VERSION_MAJOR 4)
+set(MIRALL_VERSION_MINOR 0)
 set(MIRALL_VERSION_PATCH 50)
 set(MIRALL_VERSION_YEAR  2025)
 set(MIRALL_SOVERSION     0)
-set(MIRALL_PREVERSION_HUMAN "3.18.0 alpha")  # For preversions where PATCH>=50. Use version + alpha, rc1, rc2, etc.
+set(MIRALL_PREVERSION_HUMAN "4.1.0 alpha")  # For preversions where PATCH>=50. Use version + alpha, rc1, rc2, etc.
 set(NCEXT_BUILD_NUM 47)
 set(NCEXT_VERSION 3,0,0,${NCEXT_BUILD_NUM})
 

admin/osx/TransifexStringCatalogSanitizer/.gitignore

@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm
+.netrc

admin/osx/TransifexStringCatalogSanitizer/Package.swift

@@ -0,0 +1,21 @@
+// swift-tools-version: 6.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "TransifexStringCatalogSanitizer",
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .executableTarget(
+            name: "TransifexStringCatalogSanitizer",
+            dependencies: [
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+            ]
+        ),
+    ]
+)

admin/osx/TransifexStringCatalogSanitizer/README.md

@@ -0,0 +1,15 @@
+# Transifex String Catalog Sanitizer
+
+Sanitize Xcode string catalogs which were pulled from a Transifex online resource.
+
+## Usage
+
+See the integrated help for up to date reference.
+
+```sh
+swift run TransifexStringCatalogSanitizer --help
+```
+
+## Development
+
+This Swift command-line utility can be easily run and debugged from Xcode.

admin/osx/TransifexStringCatalogSanitizer/Sources/TransifexStringCatalogSanitizer/TransifexStringCatalogSanitizer.swift

@@ -0,0 +1,83 @@
+//  SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+//  SPDX-License-Identifier: GPL-2.0-or-later
+
+import ArgumentParser
+import Foundation
+
+@main
+struct TransifexStringCatalogSanitizer: ParsableCommand {
+    @Argument(help: "The string catalog file to sanitize.")
+    var input: String
+
+    mutating func run() throws {
+        let url = URL(fileURLWithPath: input)
+        let data = try Data(contentsOf: url)
+
+        guard var root = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+            throw TransifexStringCatalogSanitizerError.jsonObject
+        }
+
+        guard var strings = root["strings"] as? [String: Any] else {
+            throw TransifexStringCatalogSanitizerError.missingStrings
+        }
+
+        try sanitizeStrings(&strings)
+
+        // Update the root with modified strings
+        root["strings"] = strings
+
+        // Write the processed data back to the original file
+        let processedData = try JSONSerialization.data(withJSONObject: root, options: [.prettyPrinted, .sortedKeys])
+        try processedData.write(to: url)
+    }
+
+    private func sanitizeStrings(_ strings: inout [String: Any]) throws {
+        for key in strings.keys.sorted() {
+            print("💬 \"\(key)\"")
+
+            guard var string = strings[key] as? [String: Any] else {
+                throw TransifexStringCatalogSanitizerError.missingString
+            }
+
+            guard var localizations = string["localizations"] as? [String: Any] else {
+                throw TransifexStringCatalogSanitizerError.missingLocalizations
+            }
+
+            try sanitizeLocalizations(&localizations)
+
+            // Update the string with modified localizations
+            string["localizations"] = localizations
+            strings[key] = string
+        }
+    }
+
+    private func sanitizeLocalizations(_ localizations: inout [String: Any]) throws {
+        var localizationsToRemove: [String] = []
+
+        for localeCode in localizations.keys.sorted() {
+            guard let localization = localizations[localeCode] as? [String: Any] else {
+                throw TransifexStringCatalogSanitizerError.missingLocalization
+            }
+
+            guard let stringUnit = localization["stringUnit"] as? [String: Any] else {
+                throw TransifexStringCatalogSanitizerError.missingStringUnit
+            }
+
+            guard let value = stringUnit["value"] as? String else {
+                throw TransifexStringCatalogSanitizerError.missingValue
+            }
+
+            if value.isEmpty {
+                print("\t❌ \(localeCode): empty, will be removed")
+                localizationsToRemove.append(localeCode)
+            } else {
+                print("\t✅ \(localeCode): \"\(value)\"")
+            }
+        }
+
+        // Remove empty localizations
+        for localeCode in localizationsToRemove {
+            localizations.removeValue(forKey: localeCode)
+        }
+    }
+}

admin/osx/TransifexStringCatalogSanitizer/Sources/TransifexStringCatalogSanitizer/TransifexStringCatalogSanitizerError.swift

@@ -0,0 +1,12 @@
+//  SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+//  SPDX-License-Identifier: GPL-2.0-or-later
+
+enum TransifexStringCatalogSanitizerError: Error {
+    case jsonObject
+    case missingLocalization
+    case missingLocalizations
+    case missingString
+    case missingStrings
+    case missingStringUnit
+    case missingValue
+}

admin/win/msi/collect-transform.xsl.in

@@ -42,4 +42,8 @@
   <xsl:key name="vc-redist-64-search" match="wix:Component[contains(wix:File/@Source, 'vc_redist.x64.exe')]" use="@Id" />
   <xsl:template match="wix:Component[key('vc-redist-64-search', @Id)]" />
   <xsl:template match="wix:ComponentRef[key('vc-redist-64-search', @Id)]" />
-</xsl:stylesheet>
+
+  <xsl:key name="qt6-webengine-core-pdb" match="wix:Component[contains(wix:File/@Source, 'Qt6WebEngineCore.pdb')]" use="@Id" />
+  <xsl:template match="wix:Component[key('qt6-webengine-core-pdb', @Id)]" />
+  <xsl:template match="wix:ComponentRef[key('qt6-webengine-core-pdb', @Id)]" />
+</xsl:stylesheet>

cmake/modules/AddCMockaTest.cmake

@@ -19,6 +19,7 @@ endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
 
 function (ADD_CMOCKA_TEST _testName _testSource)
     add_executable(${_testName} ${_testSource})
+    set_target_properties(${_testName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
     target_link_libraries(${_testName} ${ARGN})
-    add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName})
+    add_test(${_testName} ${BIN_OUTPUT_DIRECTORY}/${_testName})
 endfunction (ADD_CMOCKA_TEST)