Library_merged.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 827fa4cb7bba8dc5f101c6325075d5b54210cd01 Author: Christian Lohmaier <[email protected]> AuthorDate: Sun Dec 1 17:08:43 2024 +0100 Commit: Christian Lohmaier <[email protected]> CommitDate: Sun Dec 1 19:31:45 2024 +0100 mac-sandboxing: also exclude AppleRemote when using --enable-mergelibs mergelibs have been added to the LibreOfficeMacOSX distro config in e6e22bee153e36989069124e8d1a55d6d6ba433a, but AppleRemote has been disabled in the sandboxing case since 2013 4fe9ef81aa83403bd3b7df555ccbd96cbdfd7c2d "The AppleRemote code is blocked by sandboxing so bypass it in that case" (unclear to me whether fundamentally not working or whether it was disabled to get sandboxing as a whole in a working state quickly, since there was an earlier entitlement for mac.remotecontrols) Change-Id: I8514319b1d9ffa3a993267eaebac0c2ff058740f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177621 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/Library_merged.mk b/Library_merged.mk index 843dcb058245..946b3af6285a 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -39,7 +39,7 @@ endif ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_libraries,merged,\ - AppleRemote \ + $(if $(ENABLE_MACOSX_SANDBOX),,AppleRemote) \ )) endif
