[Libreoffice-commits] core.git: 5 commits - configure.ac extensions/source fpicker/source sd/Library_sd.mk sfx2/source sw/Module_sw.mk vcl/osx
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jun 5 04:48:11 UTC 2019
configure.ac | 21 +++++++++++---
extensions/source/macosx/spotlight/OOoContentDataParser.m | 2 -
extensions/source/macosx/spotlight/OOoMetaDataParser.m | 2 -
fpicker/source/aqua/SalAquaFilePicker.mm | 2 -
sd/Library_sd.mk | 5 ++-
sfx2/source/appl/shutdowniconaqua.mm | 4 +-
sw/Module_sw.mk | 4 ++
vcl/osx/salframe.cxx | 5 ---
8 files changed, 30 insertions(+), 15 deletions(-)
New commits:
commit 1d47a33d8874ea28e054c873d7c0c712be9dda78
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Jun 5 07:13:18 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jun 5 07:44:57 2019 +0300
CppunitTest_sw_uiwriter always fails on my Retina iMac, so skip on macOS
Change-Id: I95ee6786a7a7ac0e8c62b634c8de3c25bd68bb70
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index c6a0c5f4fa0f..644649206b1f 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -94,7 +94,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_odfexport \
CppunitTest_sw_odfimport \
CppunitTest_sw_txtexport \
- CppunitTest_sw_uiwriter \
+ $(if $(filter-out MACOSX,$(OS)), \
+ CppunitTest_sw_uiwriter \
+ ) \
CppunitTest_sw_layoutwriter \
CppunitTest_sw_mailmerge \
CppunitTest_sw_globalfilter \
commit 1e95c8dd006147f7a94e24135396277ee2f469b8
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Jun 5 02:06:00 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jun 5 07:44:57 2019 +0300
The Bluetooth code doesn't compile with macOS SDK 10.15
Change-Id: I8fffa4cef9628e6872c881cd0cbdfe85495fa324
diff --git a/configure.ac b/configure.ac
index f03615124aa4..2122bf97d41c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10354,6 +10354,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 \
))
commit c6ab40a2dd25d94786bda82aed85f086f00f050b
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Jun 5 01:19:13 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jun 5 07:44:56 2019 +0300
-[NSWindow setRestorable:] is present since 10.7
No need to use objc_msgSend().
Change-Id: I56c824e3206c37be4b60fb7d82b65c9d5e89958b
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 761f7898d6ad..2a60c8d85f81 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -224,10 +224,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
[mpNSWindow setDelegate: static_cast<id<NSWindowDelegate> >(mpNSWindow)];
- if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
- {
- objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
- }
+ [mpNSWindow setRestorable:NO];
const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth, maGeometry.nHeight )};
mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView userData: nil assumeInside: NO];
commit 4d3628ca769ce07c93e8c4629075eeb7c8dc317e
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Jun 5 01:17:56 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jun 5 07:44:56 2019 +0300
The macOS SDK 10.15 has a tighter declaration of objc_msgSend()
Change-Id: I51734b92965a9fa1f06aa18017d39b4b0d532456
diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m b/extensions/source/macosx/spotlight/OOoContentDataParser.m
index 89d92a8c126a..d3ecf16ffaab 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m
@@ -52,7 +52,7 @@
// So instead of this:
// [parser setDelegate:self];
// do this:
- objc_msgSend(parser, @selector(setDelegate:), self);
+ ((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:), self);
[parser setShouldResolveExternalEntities:NO];
[parser parse];
diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
index 4d2b95d72fff..2b4dac82c555 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
@@ -95,7 +95,7 @@ static NSDictionary *metaXML2MDIKeys;
// So instead of this:
// [parser setDelegate:self];
// do this:
- objc_msgSend(parser, @selector(setDelegate:), self);
+ ((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:), self);
[parser setShouldResolveExternalEntities:NO];
[parser parse];
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index c46cd9cb8739..71a2940dec9e 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -162,7 +162,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute()
// So instead of:
// [m_pDialog setDelegate:m_pDelegate];
// do:
- objc_msgSend(m_pDialog, @selector(setDelegate:), m_pDelegate);
+ ((id (*)(id, SEL, ...))objc_msgSend)(m_pDialog, @selector(setDelegate:), m_pDelegate);
int nStatus = runandwaitforresult();
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index ea040e4c6212..741e89c639c7 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -351,7 +351,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri
// confused. Anyway, to avoid warnings, instead of this:
// [pRecentMenu setDelegate: pRecentDelegate];
// do this:
- objc_msgSend(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
+ ((id (*)(id, SEL, ...))objc_msgSend)(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
[pRecentMenu setAutoenablesItems: NO];
[pItem setSubmenu: pRecentMenu];
@@ -368,7 +368,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri
// See above
// [pRecentMenu setDelegate: pRecentDelegate];
- objc_msgSend(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
+ ((id (*)(id, SEL, ...))objc_msgSend)(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
[pRecentMenu setAutoenablesItems: NO];
[pItem setSubmenu: pRecentMenu];
commit 4378eae8aa5f29d02ac02000ba0d3a769b27c18e
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Jun 4 23:36:47 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jun 5 07:44:55 2019 +0300
Accept also macOS SDK 10.15
Change-Id: I2369db6b76af67d71146903c081ce6427d45c211
diff --git a/configure.ac b/configure.ac
index 7f98a4a429b5..f03615124aa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2735,7 +2735,7 @@ if test $_os = Darwin -o $_os = iOS; then
# higher than or equal to the minimum required should be found.
AC_MSG_CHECKING([what macOS SDK to use])
- for _macosx_sdk in ${with_macosx_sdk-10.14 10.13 10.12}; do
+ for _macosx_sdk in ${with_macosx_sdk-10.15 10.14 10.13 10.12}; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null`
if test -d "$MACOSX_SDK_PATH"; then
with_macosx_sdk="${_macosx_sdk}"
@@ -2773,8 +2773,11 @@ if test $_os = Darwin -o $_os = iOS; then
10.14)
MACOSX_SDK_VERSION=101400
;;
+ 10.15)
+ MACOSX_SDK_VERSION=101500
+ ;;
*)
- AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.12--14])
+ AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.12--15])
;;
esac
@@ -2819,8 +2822,11 @@ if test $_os = Darwin -o $_os = iOS; then
10.14)
MAC_OS_X_VERSION_MIN_REQUIRED="101400"
;;
+ 10.15)
+ MAC_OS_X_VERSION_MIN_REQUIRED="101500"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--14])
+ AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--15])
;;
esac
MAC_OS_X_VERSION_MIN_REQUIRED_DOTS=$with_macosx_version_min_required
@@ -2860,8 +2866,11 @@ if test $_os = Darwin -o $_os = iOS; then
10.14)
MAC_OS_X_VERSION_MAX_ALLOWED="101400"
;;
+ 10.15)
+ MAC_OS_X_VERSION_MAX_ALLOWED="101500"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--14])
+ AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--15])
;;
esac
More information about the Libreoffice-commits
mailing list