Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2bd894cf4dd28b0d19c0348ddd9d771313e7a4a7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: sm-commit <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2bd894cf4dd28b0d19c0348ddd9d771313e7a4a7)
  • Date: Tue, 30 Mar 2010 18:26:15 +0200

Excerpts from Treeve Jelbert's message of Mon Mar 29 16:44:57 +0200 2010:
> GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
> libs/icu/DETAILS | 16 ++++++++--------
> libs/icu/HISTORY | 3 +++
> 6 files changed, 21 insertions(+), 12 deletions(-)
>
> New commits:
> commit 2bd894cf4dd28b0d19c0348ddd9d771313e7a4a7
> Author: Treeve Jelbert <treeve AT sourcemage.org>
> Commit: Treeve Jelbert <treeve AT sourcemage.org>
>
> icu: => 4.4
>
> diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
> index 6237218..ff553e2 100755
> --- a/libs/icu/DETAILS
> +++ b/libs/icu/DETAILS
> @@ -1,13 +1,13 @@
> SPELL=icu
> -if [[ "$ICU_DEV" == 'y' ]]; then
> - VERSION=4.4.rc1
> - VX=${VERSION//.r/r}
> -
> SOURCE_HASH=sha512:4d80713c1e3a08a9563c138dec476d6b4dcedfbb4b5d27fff6d699c59f0c29c3f4e084fad823b76591b02a6154ac401cf902a799a0f45a26849f5959d148eadd
> -else
> - VERSION=4.2.1
> +#if [[ "$ICU_DEV" == 'y' ]]; then
> +# VERSION=4.4
> +# VX=${VERSION//.r/r}
> +# SOURCE_HASH=sha512:
> +#else
> + VERSION=4.4
> VX=$VERSION
> -
> SOURCE_HASH=sha512:c2ec0edbdb9a5790e88f7b09c96b31f9b2120bed0c1a575cdabbcc1f9281e6cb137b44707d0ad44f794e6c9abde64c6b76d8cf4818d51459d3fb11c2e10e01dc
> -fi
> +
> SOURCE_HASH=sha512:b137751b3859b5482a4f1397ea1c8b343c658289e4fcea6740b160c8a99dac1a39dcb80c0dcd5fcae7cbf7bd3f1d73189fffd2c428ba6f43ad82994d9a21739b
> +#fi
> SPELLX=icu4c
> VERSIONX=${VERSION//./_}
> SOURCE=$SPELLX-$VERSIONX-src.tgz
> diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
> index e24b2f3..8d25981 100644
> --- a/libs/icu/HISTORY
> +++ b/libs/icu/HISTORY
> @@ -1,3 +1,6 @@
> +2010-03-29 Treeve Jelbert <treeve AT sourcemage.org>
> + * DETAILS: version 4.4 (both)
> +
> 2010-03-07 Treeve Jelbert <treeve AT sourcemage.org>
> * DETAILS: version 4.4.rc1 (devel)
>

This icu version breaks the build of stable webkitgtk:
CXX WebCore/platform/text/libWebCore_la-TextBoundariesICU.lo
WebCore/platform/text/TextBoundariesICU.cpp: In function 'int
WebCore::findNextWordFromIndex(const UChar*, int, int, bool)':
WebCore/platform/text/TextBoundariesICU.cpp:39: error: cannot convert
'WebCore::TextBreakIterator*' to 'UBreakIterator*' in initialization
WebCore/platform/text/TextBoundariesICU.cpp: In function 'void
WebCore::findWordBoundary(const UChar*, int, int, int*, int*)':
WebCore/platform/text/TextBoundariesICU.cpp:70: error: cannot convert
'WebCore::TextBreakIterator*' to 'UBreakIterator*' in initialization
make[1]: *** [WebCore/platform/text/libWebCore_la-TextBoundariesICU.lo] Error
1
make[1]: Leaving directory `/usr/src/webkit-1.1.15.4'
make: *** [all] Error 2

Seems to be an API change, not sure what else is broken by it. I'll see if I
can find a patch from the webkit svn for this issue. There still might be
other spells that are broken though. At least for the next stable-rc branch,
I'll downgrade icu to 4.2.
--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org




Archive powered by MHonArc 2.6.24.

Top of Page