vcl/Library_vclplug_osx.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
New commits: commit f3516180adfa777d2a4103cd6a090cdbe81d26ab Author: Christian Lohmaier <[email protected]> AuthorDate: Wed Jun 29 12:28:45 2022 +0200 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Thu Jun 30 07:27:03 2022 +0200 Don't link against private CoreUI framework when sandboxed Actual use of the code was already disabled since 2014 with b8bee05dbf85bc4f5834520aa5d64e9ae18aba4e - but the link flags were not conditionalized. Change-Id: Ia1dd299cb78274850eb6a7b10259991bb4970ab9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136614 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit 788dcbef1bae7dbe600f8f193944cd9b31aa27d5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136634 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk index 5e0cfd2e8d3d..fbb0e68ec904 100644 --- a/vcl/Library_vclplug_osx.mk +++ b/vcl/Library_vclplug_osx.mk @@ -32,10 +32,14 @@ $(eval $(call gb_Library_use_custom_headers,vclplug_osx,\ officecfg/registry \ )) +# TODO: arguably the private CoreUI framework should never be used, no matter whether building +# a sandboxed version or a "regular" desktop version $(eval $(call gb_Library_add_libs,vclplug_osx,\ -framework IOKit \ - -F/System/Library/PrivateFrameworks \ - -framework CoreUI \ + $(if $(ENABLE_MACOSX_SANDBOX),,\ + -F/System/Library/PrivateFrameworks \ + -framework CoreUI \ + ) \ -lobjc \ ))
