Le 29/12/2019 à 02:56, Jean-Marc Pigeon via blfs-dev a écrit :
> Hello
>
> I was not able to recompile libreoffice and webkitgtk
> with installed icu-65.
> Problem is related to U16_NEXT macro.
>
> about webkitgtk, I "sed" few sources
>
> ;----------------------------------------------------------
> #To fix a Bug within URLHelpers.cpp
> sed -i \
> -e "/16_NEXT(buffer, i, length, c)/s/$/;/" \
> Source/WTF/wtf/URLHelpers.cpp
>
> #To fix a Bug within Document.cpp
> sed -i \
> -e "/U16_NEXT(characters, i, length, c)/s/$/;/" \
> -e "/U16_NEXT(qualifiedName, i, length, c)/s/$/;/" \
> Source/WebCore/dom/Document.cpp
> ;----------------------------------------------------------
>
> About libreoffice, the problem stand within
> package libfreehand.
> It is a little bit tricky to apply (at script level) as
> libfreehand is a tar file within libreoffice.
>
> Here is the (still to be release) patch from github
> ;---------------------------------------------------------------------
>> diff -ur libfreehand.org/src/lib/libfreehand_utils.cpp
>> libfreehand/src/lib/libfreehand_utils.cpp
>> --- libfreehand.org/src/lib/libfreehand_utils.cpp 2017-09-16
>> 12:28:50.000000000 +0200
>> +++ libfreehand/src/lib/libfreehand_utils.cpp 2019-10-28
>> 23:02:38.581354923 +0100
>> @@ -162,7 +162,7 @@
>> while (j < length)
>> {
>> UChar32 c;
>> - U16_NEXT(s, j, length, c)
>> + U16_NEXT(s, j, length, c);
>> unsigned char outbuf[U8_MAX_LENGTH+1];
>> int i = 0;
>> U8_APPEND_UNSAFE(&outbuf[0], i, c);
>>
> ;---------------------------------------------------------------------
I had reported the webkitgtk issue in
http://lists.linuxfromscratch.org/pipermail/blfs-dev/2019-December/037011.html
I proposed:
grep -rl --exclude-dir icu 'U16_NEXT.*[^;]$' |
xargs sed -i 's/U16_NEXT.*[^;]$/&;/'
Maybe the same approach could be applied to libreoffice as well...
But since libfreehand is downloaded after starting the build (see Ken's post
http://lists.linuxfromscratch.org/pipermail/blfs-dev/2019-December/036971.html)
it is trickier. For now, we have removed using system ICU for libreoffice in
SVN book.
> [...]
Pierre
--
http://lists.linuxfromscratch.org/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
