[Libreoffice-commits] .: 3 commits - distro-configs/LibreOfficeiOS.conf README.cross sal/osl

[Tor Lillqvist]

 README.cross                       |    3 +++
 distro-configs/LibreOfficeiOS.conf |    2 +-
 sal/osl/unx/file_volume.cxx        |    6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 8f87fdf6a5058bbb6d2d607e3a9455e8b1a7c113
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Nov 11 11:30:43 2011 +0200

    Add --disable-xmlsec for now

diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 3149506..d02cbb7 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -13,13 +13,13 @@
 --disable-librsvg
 --disable-lockdown
 --disable-mozilla
---disable-nss-module
 --disable-odk
 --disable-opengl
 --disable-python
 --disable-randr
 --disable-randr-link
 --disable-systray
+--disable-xmlsec
 --without-afms
 --without-fonts
 --without-java
commit 3a5f8de40904e200b435a21a6de271adff623d4b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Nov 11 11:27:11 2011 +0200

    WaE: defined but not used

diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index 09ba561..62c1986 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -542,7 +542,7 @@ oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
     return osl_File_E_None;
 }
 
-#if !defined(MACOSX) && !defined(AIX) && !defined(ANDROID)
+#if !defined(MACOSX) && !defined(AIX) && !defined(IOS) && !defined(ANDROID)
 
 /*****************************************
  * osl_newVolumeDeviceHandleImpl
@@ -1145,14 +1145,14 @@ static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
 }
 #endif
 
-#if ( defined(NETBSD) || defined(IOS) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) )
+#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) )
 static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
 {
     return sal_False;
 }
 #endif /* NETBSD || FREEBSD || OPENBSD */
 
-#if ( defined(NETBSD) || defined(IOS) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) )
+#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) )
 static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
 {
     return sal_False;
commit 3ba78a2d45a4b58198a700cb0a4621838618d5f1
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Nov 11 11:03:47 2011 +0200

    Add note about an iOS SDK hickup

diff --git a/README.cross b/README.cross
index 6878cf9..ae1b2c6 100644
--- a/README.cross
+++ b/README.cross
@@ -304,6 +304,9 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4
 --without-helppack-integration
 --without-myspell-dicts
 
+It seems that with the latest iOS SDK one has to do:
+sudo ln -s i686-apple-darwin10 /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk/usr/include/c++/4.2.1/i686-apple-darwin11
+or g++ won't find its headers like <bits/c++config.h>
 
 Android
 -------