diff options
| author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2018-11-27 11:40:49 +0100 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2018-11-29 14:08:26 +0100 |
| commit | 9c0d40fbc7d01ff46b78b798361bf3a19cc18bdc (patch) | |
| tree | a2afd07ced2da313c5cdc6183bb1ea7e832d9a7e /external | |
| parent | a55d15e27f4290b9aaf5597161b2b3c5200d3f85 (diff) | |
Rename Mac OS X to official name macOS in comments and documentation
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95
Reviewed-on: https://gerrit.libreoffice.org/64102
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'external')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 4 | ||||
| -rw-r--r-- | external/nss/README | 2 | ||||
| -rw-r--r-- | external/redland/raptor/raptor_config.h | 2 | ||||
| -rw-r--r-- | external/rhino/rhino1_5R5-updateToolTip.patch | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 73d5620eaa01..86e22aa2fa19 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -35,8 +35,8 @@ ifeq ($(SYSTEM_NSS),) curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss endif -# use --with-darwinssl on Mac OS X >10.5 and iOS to get a native UI for SSL certs for CMIS usage -# use --with-nss only on platforms other than Mac OS X and iOS +# use --with-darwinssl on macOS >10.5 and iOS to get a native UI for SSL certs for CMIS usage +# use --with-nss only on platforms other than macOS and iOS $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ ./configure \ diff --git a/external/nss/README b/external/nss/README index d4fbd68bd193..6997cea6ca06 100644 --- a/external/nss/README +++ b/external/nss/README @@ -16,7 +16,7 @@ See also == libsqlite3 == -With all supported Mac OS X SDK we use +With all supported macOS SDK we use NSS_USE_SYSTEM_SQLITE=1 to build using the system sqlite. diff --git a/external/redland/raptor/raptor_config.h b/external/redland/raptor/raptor_config.h index 3e94fee947ad..74f58de95e94 100644 --- a/external/redland/raptor/raptor_config.h +++ b/external/redland/raptor/raptor_config.h @@ -332,7 +332,7 @@ `char[]'. */ #undef YYTEXT_POINTER -/* Enable large inode numbers on Mac OS X 10.5. */ +/* Enable large inode numbers on macOS 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 #endif diff --git a/external/rhino/rhino1_5R5-updateToolTip.patch b/external/rhino/rhino1_5R5-updateToolTip.patch index 16857d35fca6..be0700daf6c5 100644 --- a/external/rhino/rhino1_5R5-updateToolTip.patch +++ b/external/rhino/rhino1_5R5-updateToolTip.patch @@ -9,7 +9,7 @@ private void updateToolTip() { - // in case fileName is very long, try to set tool tip on frame - Component c = getComponent(1); -+ // Try to set tool tip on frame. On Mac OS X 10.5, ++ // Try to set tool tip on frame. On macOS 10.5, + // the number of components is different, so try to be safe. + int n = getComponentCount() - 1; + if (n > 1) { |