strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't specify entitlements that are not used (sdremote w/o bluetooth)

Browse source 
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+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier 2022-06-29 13:17:14 +02:00
parent d1739c8c73
commit c78b49ec13
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.in
View file

@ -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 {} \;

9
configure.ac
View file

@ -5590,6 +5590,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 \
@ -11760,6 +11761,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
@ -11767,6 +11770,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
@ -11816,6 +11820,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=
@ -11824,6 +11831,7 @@ else
fi
AC_SUBST(ENABLE_SDREMOTE)
AC_SUBST(ENABLE_SDREMOTE_BLUETOOTH)
AC_SUBST(SDREMOTE_ENTITLEMENT)
AC_SUBST(SYSTEM_BLUEZ)
dnl ===================================================================
@ -14681,6 +14689,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

11
lo.xcent → lo.xcent.in
View file

@ -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>