[Open Office] Build broken with system-icu

[Rene Engelhard]

Hanno Meyer-Thurow wrote:
> My fix is attached.
> Could be cool if someone applies it to cvs, thanks!

Everything buiolds with 2.6,3.4 and 3.6 now? now?

> @@ -71,7 +74,7 @@
>  +}
>  +       ], [ICU_VERSION_MINOR=$v], [])
>  +    done
> -+    if test "$ICU_VERSION_MINOR" -gt "4"; then
> ++    if test "$ICU_VERSION_MINOR" == "4" || test "$ICU_VERSION_MINOR" == "6"; then
>  +       AC_MSG_RESULT([OK])
>  +       ICU_VERSION=3.$ICU_VERSION_MINOR
>  +    else

=, not ==. 

> -+.IF "$(ICU_VERSION)" == "3.4"
>  +MY_BRK_NAMEDBRKFILES:=$(subst,data/,OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))
>  +.ENDIF
> -+

This is wrong. This line appears only in the diff for 3.4, not for 3.6,
sdo the .IF there *is* right.

>  +MY_MISC_CXXFILES := \
> @@ -173,7 +173,7 @@
>  +.ELSE
>   $(MISC)$/OpenOffice_icu_dat.c :  $(MY_BRK_BRKFILES)
>  -    +$(WRAPCMD) $(SOLARBINDIR)$/gencmn -e OpenOffice_icu -n OpenOffice_icu -t tmp -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n"))
> -+    +$(WRAPCMD) gencmn -e OpenOffice_icu -n OpenOffice_icu -t tmp -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n"))
> ++    +$(WRAPCMD) gencmn -e OpenOffice_icu -n OpenOffice_icu -t tmp -S -d $(MISC) O $(mktmp $(MY_BRK_NAMEDBRKFILES:t"\n"))
>       +echo $(USQ)#ifdef _MSC_VER$(USQ) > $@
>       +echo $(USQ)#pragma warning( disable : 4229 4668 )$(USQ) >> $@
>       +echo $(USQ)#endif$(USQ) >> $@
> @@ -183,7 +183,7 @@
>  +    +$(WRAPCMD) genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk
>   $(MISC)$/%_brk.c : $(MISC)$/%.brk
>  -    +$(WRAPCMD) $(SOLARBINDIR)$/genccode -d $(MISC)$ $(MISC)$/$*.brk
> -+    +$(WRAPCMD) genccode -d $(MISC)$ $(MISC)$/$*.brk
> ++    +$(WRAPCMD) genccode -e OpenOffice_icu -n OpenOffice_icu -d $(MISC)$ $(MISC)$/$*.brk
>  +.ENDIF
>  +
>  Index: linguistic/source/hhconvdic.cxx

Looks good. For 3.4. But this breaks internal icu AFAIS. At least thst
differs from the ""normal" code but matches with the icu 3.4 patch.

> @@ -461,8 +461,8 @@
>               icuBI->aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", 
>                       OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
>                       RTL_TEXTENCODING_ASCII_US).getStr(), &status), status);
> -+#endif
>               if (!U_SUCCESS(status) ) {
> ++#endif

Why? Apparently this is needed for 2.6 *and* 3.6.

>                   status = U_ZERO_ERROR;
>  +#if U_ICU_VERSION_MAJOR_NUM == 3 && U_ICU_VERSION_MINOR_NUM == 6
>  +                pUData = udata_open("OpenOffice", "brk", rule, &status);

Already fixed in up-to-date patch...

Please do not commit that patch. I am working on it (which also
included the missing ; fixed, don't you Gentoo guys not have any
in-Gentoo communication)?

Grüße/Regards,

René
-- 
 .''`.  René Engelhard -- Debian GNU/Linux Developer
 : :' : http://www.debian.org | http://people.debian.org/~rene/
 `. `'  rene at debian.org | GnuPG-Key ID: 248AEB73
   `-   Fingerprint: 41FA F208 28D4 7CA5 19BB  7AD9 F859 90B0 248A EB73

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.ximian.com/pipermail/openoffice/attachments/20061015/d0fcaad1/attachment.bin