external/curl/ExternalProject_curl.mk | 2 +-
external/nss/ExternalPackage_nss.mk | 1 +
external/nss/ExternalProject_nss.mk | 2 +-
external/python3/ExternalProject_python3.mk | 4 ++--
fpicker/source/aqua/SalAquaFilePicker.mm | 4 ++--
sal/osl/unx/uunxapi.cxx | 4 ++--
6 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit e59dd2a28cd25924433ecd330b435554c61ce127
Author: Douglas Mencken <dougmenc...@gmail.com>
Date: Sat Oct 25 05:13:09 2014 -0400
Revert another "is always >= 1080" commit
reverted commit: fe25090e992eefd0c43ca73b656632a650793b1a
use MACOSX_SDK_VERSION instead of MAC_OS_X_VERSION_MIN_ALLOWED
Change-Id: Ib6e63e664dc073a8d751306f613e8be4918c406a
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index 1a0a0a3..f292437 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(filter IOS MACOSX,$(OS)),,--with-nss$(if
$(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
$(if $(filter IOS,$(OS)),--with-darwinssl) \
$(if $(filter MACOSX,$(OS)),\
- --with-darwinssl) \
+ $(if $(filter
1050,$(MACOSX_SDK_VERSION)),,--with-darwinssl)) \
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet
--disable-dict --without-libssh2 \
diff --git a/external/nss/ExternalPackage_nss.mk
b/external/nss/ExternalPackage_nss.mk
index c6d8953fd..986565e 100644
--- a/external/nss/ExternalPackage_nss.mk
+++ b/external/nss/ExternalPackage_nss.mk
@@ -26,6 +26,7 @@ $(eval $(call
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
dist/out/lib/libsmime3.dylib \
dist/out/lib/libsoftokn3.dylib \
dist/out/lib/libssl3.dylib \
+ $(if $(filter
1050,$(MACOSX_SDK_VERSION)),dist/out/lib/libsqlite3.dylib) \
))
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index f518bb4..c87bbf0 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call
gb_ExternalProject
$(if $(filter arm64,$(CC)),USE_64=1)) \
$(if $(filter MACOSX,$(OS)),\
$(if $(filter-out
POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
- NSS_USE_SYSTEM_SQLITE=1) \
+ $(if $(filter-out
1050,$(MACOSX_SDK_VERSION)),NSS_USE_SYSTEM_SQLITE=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
$(if $(filter
MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 045892e..54a9ad1 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -69,8 +69,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads
ac_cv_printf_zd_format=no) \
$(if $(filter MACOSX,$(OS)), \
$(if $(filter
INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) \
- --with-universal-archs=intel \
- ) \
+ $(if $(filter
1050,$(MACOSX_SDK_VERSION)),--with-universal-archs=32-bit,--with-universal-archs=intel)
\
+ ) \
--enable-framework=/@__________________________________________________OOO
--with-framework-name=LibreOfficePython, \
--enable-shared \
) \
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm
b/fpicker/source/aqua/SalAquaFilePicker.mm
index 2eac5b3..86d1da3 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -307,7 +307,7 @@ uno::Sequence<rtl::OUString> SAL_CALL
SalAquaFilePicker::getFiles() throw( uno::
SolarMutexGuard aGuard;
-#if HAVE_FEATURE_MACOSX_SANDBOX
+#if MACOSX_SDK_VERSION >= 1070 && HAVE_FEATURE_MACOSX_SANDBOX
static NSUserDefaults *userDefaults;
static bool triedUserDefaults = false;
@@ -341,7 +341,7 @@ uno::Sequence<rtl::OUString> SAL_CALL
SalAquaFilePicker::getFiles() throw( uno::
{
NSURL *url = [files objectAtIndex:nIndex];
-#if HAVE_FEATURE_MACOSX_SANDBOX
+#if MACOSX_SDK_VERSION >= 1070 && HAVE_FEATURE_MACOSX_SANDBOX
if (userDefaults != NULL &&
[url
respondsToSelector:@selector(bookmarkDataWithOptions:includingResourceValuesForKeys:relativeToURL:error:)])
{
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 995b936..dd0d3f1 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -35,7 +35,7 @@ inline rtl::OString OUStringToOString(const rtl_uString* s)
osl_getThreadTextEncoding());
}
-#if HAVE_FEATURE_MACOSX_SANDBOX
+#if defined(MACOSX) && MACOSX_SDK_VERSION >= 1070 &&
HAVE_FEATURE_MACOSX_SANDBOX
#include <Foundation/Foundation.h>
#include <Security/Security.h>
@@ -289,7 +289,7 @@ int open_c(const char *cpPath, int oflag, int mode)
int result = open(cpPath, oflag, mode);
-#if HAVE_FEATURE_MACOSX_SANDBOX
+#if defined(MACOSX) && MACOSX_SDK_VERSION >= 1070 &&
HAVE_FEATURE_MACOSX_SANDBOX
if (isSandboxed && result != -1 && (oflag & O_CREAT) && (oflag & O_EXCL))
{
// A new file was created. Check if it is outside the sandbox.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
