Makefile.in | 1 +
configure.ac | 9 +++++++++
lo.xcent.in | 11 ++++-------
3 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 23b81098bd580eada788986682ab3bb4e1f53c83
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Jun 29 13:17:14 2022 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Thu Jun 30 09:01:06 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 <lohmaier+libreoff...@googlemail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136626
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/Makefile.in b/Makefile.in
index d74dba59344c..d3f1047be4ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -225,6 +225,7 @@ distclean : clean compilerplugins-clean
$(BUILDDIR)/configure \
$(BUILDDIR)/hardened_runtime.xcent \
$(BUILDDIR)/instsetoo_native/util/openoffice.lst \
+ $(BUILDDIR)/lo.xcent \
$(BUILDDIR)/sysui/desktop/macosx/Info.plist \
$(BUILDDIR)/vs-code-template.code-workspace
$(if $(filter WNT,$(OS)),env -i PATH="$$PATH") $(FIND)
$(SRCDIR)/solenv/gdb -name \*.pyc -exec rm {} \;
diff --git a/configure.ac b/configure.ac
index 1bce50885f53..557c5da4a766 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5490,6 +5490,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 \
@@ -11796,6 +11797,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
@@ -11803,6 +11806,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
@@ -11852,6 +11856,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=
@@ -11860,6 +11867,7 @@ else
fi
AC_SUBST(ENABLE_SDREMOTE)
AC_SUBST(ENABLE_SDREMOTE_BLUETOOTH)
+AC_SUBST(SDREMOTE_ENTITLEMENT)
AC_SUBST(SYSTEM_BLUEZ)
dnl ===================================================================
@@ -14667,6 +14675,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>
