configure.ac | 2 +- icu/icu4c-build.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)
New commits: commit e79b6715070cdb4512d8ead784103930ebe8b221 Author: Tor Lillqvist <[email protected]> Date: Tue Jun 18 17:04:55 2013 +0300 Stop defining "inline" as empty on OS X and iOS in icu It causes problems on newer SDKs. Change-Id: I6bdb1e50cb239d99b190460fdb11d5c684e92275 diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index 1e50511..ba47658 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -1,3 +1,22 @@ +--- misc/icu/source/common/umutex.h ++++ misc/icu/source/common/umutex.h +@@ -48,16 +48,8 @@ + #endif /* win32 */ + + #if U_PLATFORM_IS_DARWIN_BASED +-#if defined(__STRICT_ANSI__) +-#define UPRV_REMAP_INLINE +-#define inline +-#endif + #include <libkern/OSAtomic.h> + #define USE_MAC_OS_ATOMIC_INCREMENT 1 +-#if defined(UPRV_REMAP_INLINE) +-#undef inline +-#undef UPRV_REMAP_INLINE +-#endif + #endif + + /* --- misc/icu/source/tools/toolutil/pkg_genc.h +++ misc/build/icu/source/tools/toolutil/pkg_genc.h @@ -58,7 +58,7 @@ commit 204867dbecc9058a39ba4b6bc97021ca5d04af59 Author: Tor Lillqvist <[email protected]> Date: Tue Jun 18 15:58:17 2013 +0300 Accept also iOS SDK 7.0 Change-Id: I7c863819f5d6022201ce9d450703b5b4d4463dc2 diff --git a/configure.ac b/configure.ac index 4d744ec..97293ad 100644 --- a/configure.ac +++ b/configure.ac @@ -2697,7 +2697,7 @@ if test $_os = iOS; then fi pref_sdk_ver=6.1 - for I in 6.1 6.0; do + for I in 6.1 6.0 7.0; do t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$I.sdk if test -d $t; then sysroot=$t _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
