Makefile.in | 1 + configure.ac | 9 +++++++++ lo.xcent.in | 11 ++++------- 3 files changed, 14 insertions(+), 7 deletions(-)
New commits: commit 2f29636a0c70443c3fdd561b263ceb661e4d967f Author: Christian Lohmaier <[email protected]> AuthorDate: Wed Jun 29 13:17:14 2022 +0200 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Thu Jun 30 09:00:37 2022 +0200 don't specify entitlements that are not used (sdremote w/o bluetooth) the network.server entitlement is only needed when the sdremote is enabled, and the bluetooth one only when the bluetooth part is built. Also warn about bluetooth not being built because of obsoleted/removed API. It was "silently" dropped before (lost in the flood of configure output). Change-Id: I38d83aa1132307b5b4b5d6dceba8f9020ffb2373 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136617 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit c78b49ec132eb5126445ebee7d259d3df7fcaa68) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136639 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/Makefile.in b/Makefile.in index ed231eaade1e..29208d2765cc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -225,6 +225,7 @@ distclean : clean compilerplugins-clean $(BUILDDIR)/hardened_runtime.xcent \ $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ $(BUILDDIR)/solenv/lockfile/autoconf.h \ + $(BUILDDIR)/lo.xcent \ $(BUILDDIR)/sysui/desktop/macosx/Info.plist \ $(BUILDDIR)/vs-code*.code-workspace* $(if $(filter WNT,$(OS)),env -i PATH="$$PATH") $(FIND) $(SRCDIR)/solenv/gdb -name \*.pyc -exec rm -f {} \; diff --git a/configure.ac b/configure.ac index 3487f2ff9754..426e99cea2dd 100644 --- a/configure.ac +++ b/configure.ac @@ -5603,6 +5603,7 @@ if test "$cross_compiling" = "yes"; then config_host.mk.in \ config_host_lang.mk.in \ Makefile.in \ + lo.xcent.in \ bin/bffvalidator.sh.in \ bin/odfvalidator.sh.in \ bin/officeotron.sh.in \ @@ -11807,6 +11808,8 @@ AC_MSG_CHECKING([whether to enable Impress remote control]) if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then AC_MSG_RESULT([yes]) ENABLE_SDREMOTE=TRUE + SDREMOTE_ENTITLEMENT=" <key>com.apple.security.network.server</key> + <true/>" AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) if test $OS = MACOSX && test "$MACOSX_SDK_VERSION" -ge 101500; then @@ -11814,6 +11817,7 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then if test "$enable_sdremote_bluetooth" = yes; then AC_MSG_ERROR([macOS SDK $macosx_sdk does not currently support --enable-sdremote-bluetooth]) fi + add_warning "not building the bluetooth part of the sdremote - used api was removed from macOS SDK 10.15" enable_sdremote_bluetooth=no fi # If not explicitly enabled or disabled, default @@ -11863,6 +11867,9 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then AC_MSG_RESULT([no]) ENABLE_SDREMOTE_BLUETOOTH= SYSTEM_BLUEZ= + SDREMOTE_ENTITLEMENT="$SDREMOTE_ENTITLEMENT + <key>com.apple.security.device.bluetooth</key> + <true/>" fi else ENABLE_SDREMOTE= @@ -11871,6 +11878,7 @@ else fi AC_SUBST(ENABLE_SDREMOTE) AC_SUBST(ENABLE_SDREMOTE_BLUETOOTH) +AC_SUBST(SDREMOTE_ENTITLEMENT) AC_SUBST(SYSTEM_BLUEZ) dnl =================================================================== @@ -14724,6 +14732,7 @@ AC_CONFIG_LINKS([include:include]) AC_CONFIG_FILES([config_host.mk config_host_lang.mk Makefile + lo.xcent bin/bffvalidator.sh bin/odfvalidator.sh bin/officeotron.sh diff --git a/lo.xcent b/lo.xcent.in similarity index 74% rename from lo.xcent rename to lo.xcent.in index 56bb981916fe..9a0838fbc388 100644 --- a/lo.xcent +++ b/lo.xcent.in @@ -14,16 +14,13 @@ <true/> <key>com.apple.security.network.client</key> <true/> - <key>com.apple.security.network.server</key> - <true/> - <key>com.apple.security.device.bluetooth</key> - <true/> <key>com.apple.security.print</key> <true/> <key>com.apple.security.cs.disable-executable-page-protection</key> <true/> - <!-- Allow Base to import data from Address Book --> - <key>com.apple.security.personal-information.addressbook</key> - <true/> + <!-- Allow Base to import data from Address Book --> + <key>com.apple.security.personal-information.addressbook</key> + <true/> +@SDREMOTE_ENTITLEMENT@ </dict> </plist>
