Skip to content

Commit

Permalink
Merge branch 'develop' into KDESKTOP-1359-Vfs-functions-should-return…
Browse files Browse the repository at this point in the history
…-an-ExitInfo
  • Loading branch information
herve-er authored Jan 10, 2025
2 parents 588f4d1 + 32211c7 commit 3e21b3b
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 10 deletions.
8 changes: 0 additions & 8 deletions admin/osx/LiteSyncExtensionDebug.entitlements

This file was deleted.

3 changes: 1 addition & 2 deletions admin/osx/sign_app_debug.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,10 @@ codesign -s "$identity" --force --verbose=4 --options=runtime "$src_app/Contents
codesign -s "$identity" --force --verbose=4 --deep --options=runtime --entitlements $(dirname $0)/QtWebEngineProcess.entitlements "$src_app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess"
codesign -s "$identity" --force --verbose=4 --deep --options=runtime --entitlements $(dirname $0)/FinderSyncLoginItemAgent.entitlements "$src_app/Contents/Library/LoginItems/$team_identifier.$app_domain.LoginItemAgent.app"
codesign -s "$identity" --force --verbose=4 --deep --options=runtime --entitlements $(dirname $0)/FinderSyncExtension.entitlements "$src_app/Contents/PlugIns/Extension.appex"
codesign -s "$identity" --force --verbose=4 --deep --options=runtime --entitlements $(dirname $0)/LiteSyncExtensionDebug.entitlements "$src_app/Contents/Library/SystemExtensions/$app_domain.LiteSyncExt.systemextension"
codesign -s "$identity" --force --verbose=4 --deep --options=runtime --entitlements $(dirname $0)/kDriveUninstaller.entitlements "$src_app/Contents/Frameworks/kDrive Uninstaller.app"

codesign -s "$identity" --force --verbose=4 --deep --options=runtime --preserve-metadata=entitlements "$src_app"
codesign -s "$identity" --force --verbose=4 --options=runtime --entitlements $(dirname $0)/kDriveDebug.entitlements "$src_app"
codesign -s "$identity" --force --verbose=4 --options=runtime --entitlements $(dirname $0)/kDriveUninstaller.entitlements "$src_app/Contents/Frameworks/kDrive Uninstaller.app"

# Verify the signature
codesign -dv $src_app
Expand Down
Binary file modified embedded.provisionprofile
Binary file not shown.
1 change: 1 addition & 0 deletions test/libcommonserver/utility/testutility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ void TestUtility::testIsEqualInsensitive(void) {
}

void TestUtility::testMoveItemToTrash(void) {
// !!! Linux - Move to trash fails on tmpfs
LocalTemporaryDirectory tempDir;
SyncPath path = tempDir.path() / "test.txt";
std::ofstream file(path);
Expand Down

0 comments on commit 3e21b3b

Please sign in to comment.