Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
fe25090e
Kaydet (Commit)
fe25090e
authored
Eki 16, 2014
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
MAC_OS_X_VERSION_MIN_REQUIRED is always >= 1080 now
Change-Id: I40d03ab9acb67ab72b9047017452f069ce88fd4b
üst
b02e958f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
9 deletions
+8
-9
ExternalProject_curl.mk
external/curl/ExternalProject_curl.mk
+1
-1
ExternalPackage_nss.mk
external/nss/ExternalPackage_nss.mk
+0
-1
ExternalProject_nss.mk
external/nss/ExternalProject_nss.mk
+1
-1
ExternalProject_python3.mk
external/python3/ExternalProject_python3.mk
+2
-2
SalAquaFilePicker.mm
fpicker/source/aqua/SalAquaFilePicker.mm
+2
-2
uunxapi.cxx
sal/osl/unx/uunxapi.cxx
+2
-2
No files found.
external/curl/ExternalProject_curl.mk
Dosyayı görüntüle @
fe25090e
...
@@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
...
@@ -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 MACOSX,$(OS)),,--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
$(if $(filter IOS,$(OS)),--with-darwinssl) \
$(if $(filter IOS,$(OS)),--with-darwinssl) \
$(if $(filter MACOSX,$(OS)),\
$(if $(filter MACOSX,$(OS)),\
$(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,--with-darwinssl)
) \
--with-darwinssl
) \
--without-ssl \
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
--without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
--disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
...
...
external/nss/ExternalPackage_nss.mk
Dosyayı görüntüle @
fe25090e
...
@@ -26,7 +26,6 @@ $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
...
@@ -26,7 +26,6 @@ $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
dist/out/lib/libsmime3.dylib \
dist/out/lib/libsmime3.dylib \
dist/out/lib/libsoftokn3.dylib \
dist/out/lib/libsoftokn3.dylib \
dist/out/lib/libssl3.dylib \
dist/out/lib/libssl3.dylib \
$(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),dist/out/lib/libsqlite3.dylib) \
))
))
else ifeq ($(OS),WNT)
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
...
...
external/nss/ExternalProject_nss.mk
Dosyayı görüntüle @
fe25090e
...
@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
...
@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
$(if $(filter arm64,$(CC)),USE_64=1)) \
$(if $(filter arm64,$(CC)),USE_64=1)) \
$(if $(filter MACOSX,$(OS)),\
$(if $(filter MACOSX,$(OS)),\
$(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
$(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
$(if $(filter-out 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)
) \
NSS_USE_SYSTEM_SQLITE=1
) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
$(if $(CROSS_COMPILING),\
$(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
$(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
...
...
external/python3/ExternalProject_python3.mk
Dosyayı görüntüle @
fe25090e
...
@@ -69,8 +69,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
...
@@ -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 WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \
$(if $(filter MACOSX,$(OS)), \
$(if $(filter MACOSX,$(OS)), \
$(if $(filter INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) \
$(if $(filter INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) \
$(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),--with-universal-archs=32-bit,--with-universal-archs=intel)
\
--with-universal-archs=intel
\
) \
) \
--enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \
--enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \
--enable-shared \
--enable-shared \
) \
) \
...
...
fpicker/source/aqua/SalAquaFilePicker.mm
Dosyayı görüntüle @
fe25090e
...
@@ -307,7 +307,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::
...
@@ -307,7 +307,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::
SolarMutexGuard aGuard;
SolarMutexGuard aGuard;
#if
MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 &&
HAVE_FEATURE_MACOSX_SANDBOX
#if HAVE_FEATURE_MACOSX_SANDBOX
static NSUserDefaults *userDefaults;
static NSUserDefaults *userDefaults;
static bool triedUserDefaults = false;
static bool triedUserDefaults = false;
...
@@ -341,7 +341,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::
...
@@ -341,7 +341,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::
{
{
NSURL *url = [files objectAtIndex:nIndex];
NSURL *url = [files objectAtIndex:nIndex];
#if
MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 &&
HAVE_FEATURE_MACOSX_SANDBOX
#if HAVE_FEATURE_MACOSX_SANDBOX
if (userDefaults != NULL &&
if (userDefaults != NULL &&
[url respondsToSelector:@selector(bookmarkDataWithOptions:includingResourceValuesForKeys:relativeToURL:error:)])
[url respondsToSelector:@selector(bookmarkDataWithOptions:includingResourceValuesForKeys:relativeToURL:error:)])
{
{
...
...
sal/osl/unx/uunxapi.cxx
Dosyayı görüntüle @
fe25090e
...
@@ -35,7 +35,7 @@ inline rtl::OString OUStringToOString(const rtl_uString* s)
...
@@ -35,7 +35,7 @@ inline rtl::OString OUStringToOString(const rtl_uString* s)
osl_getThreadTextEncoding
());
osl_getThreadTextEncoding
());
}
}
#if
defined(MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 &&
HAVE_FEATURE_MACOSX_SANDBOX
#if HAVE_FEATURE_MACOSX_SANDBOX
#include <Foundation/Foundation.h>
#include <Foundation/Foundation.h>
#include <Security/Security.h>
#include <Security/Security.h>
...
@@ -289,7 +289,7 @@ int open_c(const char *cpPath, int oflag, int mode)
...
@@ -289,7 +289,7 @@ int open_c(const char *cpPath, int oflag, int mode)
int
result
=
open
(
cpPath
,
oflag
,
mode
);
int
result
=
open
(
cpPath
,
oflag
,
mode
);
#if
defined(MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 &&
HAVE_FEATURE_MACOSX_SANDBOX
#if HAVE_FEATURE_MACOSX_SANDBOX
if
(
isSandboxed
&&
result
!=
-
1
&&
(
oflag
&
O_CREAT
)
&&
(
oflag
&
O_EXCL
))
if
(
isSandboxed
&&
result
!=
-
1
&&
(
oflag
&
O_CREAT
)
&&
(
oflag
&
O_EXCL
))
{
{
// A new file was created. Check if it is outside the sandbox.
// A new file was created. Check if it is outside the sandbox.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment