[Libreoffice-commits] .: 4 commits - icu/icu4c-android.patch icu/icu4c-build.patch icu/makefile.mk

[Tor Lillqvist]

 icu/icu4c-android.patch |   50 ++++++++++++++++++------------------------------
 icu/icu4c-build.patch   |   32 ++++++++++++++++++++++++++++++
 icu/makefile.mk         |    2 -
 3 files changed, 52 insertions(+), 32 deletions(-)

New commits:
commit f9b5e3d8ce2b1201ff021d70f466d3cb61efd777
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri May 11 15:58:36 2012 +0300

    Fix copy/pasted comment
    
    Change-Id: I I782827cfaf58e6eb4f6f3f8cd4159a0f787a7024

diff --git a/icu/makefile.mk b/icu/makefile.mk
index 4009280..fe00f46 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -121,7 +121,7 @@ icu_CXXFLAGS+=-fno-omit-frame-pointer
 .ENDIF
 
 .IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-# Problems with uint64_t on Android unless disabling strictness
+# Problems on Android unless disabling dynamic loading
 DISABLE_DYLOAD=--disable-dyload
 .ENDIF
 
commit 5a20d2be688e5f0e316a71b3fc7582a2935e8787
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri May 11 15:57:59 2012 +0300

    "gcc-android" needs to be recognized on the build platform
    
    Change-Id: I0f44150a31fa11afd908c3ba340d73effacfe17f

diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch
index 1056ea4..dea0e0a 100644
--- a/icu/icu4c-android.patch
+++ b/icu/icu4c-android.patch
@@ -41,38 +41,6 @@
  *)
      ;;
  esac
---- misc/icu/source/tools/toolutil/pkg_genc.c
-+++ misc/build/icu/source/tools/toolutil/pkg_genc.c
-@@ -145,6 +145,28 @@
- 
-         ".long ","",HEX_0X
-     },
-+    {"gcc-android",
-+	"\t.arch armv5te\n"
-+	"\t.fpu softvfp\n"
-+	"\t.eabi_attribute 20, 1\n"
-+	"\t.eabi_attribute 21, 1\n"
-+	"\t.eabi_attribute 23, 3\n"
-+	"\t.eabi_attribute 24, 1\n"
-+	"\t.eabi_attribute 25, 1\n"
-+	"\t.eabi_attribute 26, 2\n"
-+	"\t.eabi_attribute 30, 6\n"
-+	"\t.eabi_attribute 18, 4\n"
-+	"\t.file \"%s.s\"\n"
-+	"\t.global %s\n"
-+	"\t.section .rodata\n"
-+	"\t.align 2\n"
-+	"\t.type %s, %%object\n"
-+	"%s:\n",
-+
-+	"\t.word ",
-+	"\t.section .note.GNU-stack,\"\",%%progbits\n",
-+	HEX_0X
-+    },
-     {"sun",
-         "\t.section \".rodata\"\n"
-         "\t.align   8\n"
-
 --- misc/icu/source/common/putilimp.h
 +++ misc/build/icu/source/common/putilimp.h
 @@ -86,6 +86,8 @@
diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch
index db2d441..8082fc1 100644
--- a/icu/icu4c-build.patch
+++ b/icu/icu4c-build.patch
@@ -9,6 +9,38 @@
  #define SMALL_BUFFER_FLAG_NAMES 32
  #define BUFFER_PADDING_SIZE 20
  
+--- misc/icu/source/tools/toolutil/pkg_genc.c
++++ misc/build/icu/source/tools/toolutil/pkg_genc.c
+@@ -145,6 +145,28 @@
+ 
+         ".long ","",HEX_0X
+     },
++    {"gcc-android",
++	"\t.arch armv5te\n"
++	"\t.fpu softvfp\n"
++	"\t.eabi_attribute 20, 1\n"
++	"\t.eabi_attribute 21, 1\n"
++	"\t.eabi_attribute 23, 3\n"
++	"\t.eabi_attribute 24, 1\n"
++	"\t.eabi_attribute 25, 1\n"
++	"\t.eabi_attribute 26, 2\n"
++	"\t.eabi_attribute 30, 6\n"
++	"\t.eabi_attribute 18, 4\n"
++	"\t.file \"%s.s\"\n"
++	"\t.global %s\n"
++	"\t.section .rodata\n"
++	"\t.align 2\n"
++	"\t.type %s, %%object\n"
++	"%s:\n",
++
++	"\t.word ",
++	"\t.section .note.GNU-stack,\"\",%%progbits\n",
++	HEX_0X
++    },
+     {"sun",
+         "\t.section \".rodata\"\n"
+         "\t.align   8\n"
+
 --- misc/icu/source/common/stringpiece.cpp	2010-09-29 20:37:20.000000000 +0200
 +++ misc/build/icu/source/common/stringpiece.cpp	2011-03-15 10:57:24.722045561 +0100
 @@ -75,7 +75,7 @@
commit 95a8ac4f5ad2c5d59f03725b7e101d0d2a8654f0
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri May 11 15:37:17 2012 +0300

    The timezone variable is called just that on Android
    
    Change-Id: Icd3f13bec24227174b3698ed26f97d8c55d892ff

diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch
index f8163d3..1056ea4 100644
--- a/icu/icu4c-android.patch
+++ b/icu/icu4c-android.patch
@@ -84,3 +84,12 @@
  #else
  #   define U_HAVE_NL_LANGINFO_CODESET 1
  #endif
+@@ -114,6 +114,8 @@
+ 
+ #ifdef U_TIMEZONE
+     /* Use the predefined value. */
++#elif defined(__ANDROID__)
++#   define U_TIMEZONE timezone
+ #elif U_PLATFORM_IS_LINUX_BASED
+ #   define U_TIMEZONE __timezone
+ #elif U_PLATFORM_USES_ONLY_WIN32_API
commit a973651de8b119f76e93459c26c0363664a8ed4e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri May 11 15:28:01 2012 +0300

    No <langinfo.h> for Android
    
    Change-Id: I8063d5524b34177d77500069c85a3ae718fa5422

diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch
index e6befb0..f8163d3 100644
--- a/icu/icu4c-android.patch
+++ b/icu/icu4c-android.patch
@@ -73,3 +73,14 @@
          "\t.section \".rodata\"\n"
          "\t.align   8\n"
 
+--- misc/icu/source/common/putilimp.h
++++ misc/build/icu/source/common/putilimp.h
+@@ -86,6 +86,8 @@
+     /* Use the predefined value. */
+ #elif U_PLATFORM_HAS_WIN32_API
+ #   define U_HAVE_NL_LANGINFO_CODESET 0
++#elif defined(__ANDROID__)
++#   define U_HAVE_NL_LANGINFO_CODESET 0
+ #else
+ #   define U_HAVE_NL_LANGINFO_CODESET 1
+ #endif