[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/icu-4.2.1.diff |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 0ef0caa6bce4568ae9386fde4d828d5bbf561ff3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 14 18:45:08 2010 +0300

    Don't bother with icu4c-aix.patch as it seems to break
    
    We don't build LibreOffice for AIX with internal ICU using patches
    anyway, do we? Following caolan's advice.

diff --git a/patches/dev300/icu-4.2.1.diff b/patches/dev300/icu-4.2.1.diff
index 024ee49..eb73a4e 100644
--- a/patches/dev300/icu-4.2.1.diff
+++ b/patches/dev300/icu-4.2.1.diff
@@ -895,7 +895,7 @@ diff --git icu/makefile.mk icu/makefile.mk
 index 2fafcfa..acf0630 100644
 --- icu/makefile.mk
 +++ icu/makefile.mk
-@@ -39,7 +39,7 @@ TARGET=so_icu
+@@ -39,16 +39,15 @@ TARGET=so_icu
  
  .IF "$(ICU_MICRO)"!="0"
  TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)_$(ICU_MICRO)-src
@@ -904,6 +904,16 @@ index 2fafcfa..acf0630 100644
  .ELSE
  TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)-src
  TARFILE_MD5=
+ .ENDIF
+ TARFILE_ROOTDIR=icu
+ 
+ PATCH_FILES=\
+-    ${TARFILE_NAME}.patch \
+-    icu4c-aix.patch
++    ${TARFILE_NAME}.patch
+ 
+ # ADDITIONAL_FILES=
+ 
 @@ -234,7 +234,7 @@ OUT2BIN= \
      $(BUILD_DIR)$/..$/bin$/icuin$(ICU_MAJOR)$(ICU_MINOR)$(ICU_BUILD_LIBPOST).dll \
      $(BUILD_DIR)$/..$/bin$/icuuc$(ICU_MAJOR)$(ICU_MINOR)$(ICU_BUILD_LIBPOST).dll \