configure.ac | 4 ++++ sd/Library_sd.mk | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)
New commits: commit e93e0fb7ac8f14230434653e5d5f318707712667 Author: Tor Lillqvist <[email protected]> AuthorDate: Wed Jun 5 02:06:00 2019 +0300 Commit: Tor Lillqvist <[email protected]> CommitDate: Thu Oct 31 07:53:15 2019 +0100 The Bluetooth code doesn't compile with macOS SDK 10.15 Change-Id: I8fffa4cef9628e6872c881cd0cbdfe85495fa324 (cherry picked from commit 1e95c8dd006147f7a94e24135396277ee2f469b8) Reviewed-on: https://gerrit.libreoffice.org/81772 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Tor Lillqvist <[email protected]> diff --git a/configure.ac b/configure.ac index b9fb4765932a..f04351f6cc41 100644 --- a/configure.ac +++ b/configure.ac @@ -10493,6 +10493,10 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then ENABLE_SDREMOTE=TRUE AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) + if test $OS = MACOSX -a "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; then + # The Bluetooth code doesn't compile with macOS SDK 10.15 + enable_sdremote_bluetooth=no + fi # If not explicitly enabled or disabled, default if test -z "$enable_sdremote_bluetooth"; then case "$OS" in diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index a38184c07673..85953e285575 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -517,6 +517,10 @@ $(eval $(call gb_Library_add_objcxxobjects,sd,\ sd/source/ui/remotecontrol/OSXNetworkService \ )) +$(eval $(call gb_Library_use_system_darwin_frameworks,sd,\ + Foundation \ +)) + else # OS!=MACSOX ifeq ($(ENABLE_AVAHI),TRUE) @@ -565,7 +569,6 @@ $(eval $(call gb_Library_add_libs,sd,\ )) $(eval $(call gb_Library_use_system_darwin_frameworks,sd,\ - Foundation \ IOBluetooth \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
