onlyoffice-documentserver: use icu78
This is needed so that doctrenderer uses the same version of icu as the nodejs.libv8 . This is a little scary because it's a different version of icu than boost is built with, but seems to work out in practice. After #520553 this should ideally be in sync again. Fixes #536824
This commit is contained in:
@@ -12,7 +12,7 @@
|
|||||||
optipng,
|
optipng,
|
||||||
x265,
|
x265,
|
||||||
libde265,
|
libde265,
|
||||||
icu,
|
icu78,
|
||||||
jdk,
|
jdk,
|
||||||
lib,
|
lib,
|
||||||
nodejs_22,
|
nodejs_22,
|
||||||
@@ -30,6 +30,9 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
# default at the time of writing is still 76,
|
||||||
|
# but libv8 from nodejs_22 needs 78
|
||||||
|
icu = icu78;
|
||||||
openssl' = openssl.override {
|
openssl' = openssl.override {
|
||||||
enableMD2 = true;
|
enableMD2 = true;
|
||||||
static = true;
|
static = true;
|
||||||
@@ -41,8 +44,11 @@ let
|
|||||||
$BUILDRT/Common/3dParty/icu/icu.pri \
|
$BUILDRT/Common/3dParty/icu/icu.pri \
|
||||||
--replace-fail "ICU_MAJOR_VER = 74" "ICU_MAJOR_VER = ${lib.versions.major icu.version}"
|
--replace-fail "ICU_MAJOR_VER = 74" "ICU_MAJOR_VER = ${lib.versions.major icu.version}"
|
||||||
|
|
||||||
mkdir $BUILDRT/Common/3dParty/icu/linux_64
|
mkdir -p $BUILDRT/Common/3dParty/icu/linux_64/build
|
||||||
ln -s ${icu}/lib $BUILDRT/Common/3dParty/icu/linux_64/build
|
ln -s ${icu.dev}/include $BUILDRT/Common/3dParty/icu/linux_64/build/include
|
||||||
|
for i in ${icu}/lib/* ; do
|
||||||
|
ln -s $i $BUILDRT/Common/3dParty/icu/linux_64/build/$(basename $i)
|
||||||
|
done
|
||||||
'';
|
'';
|
||||||
icuQmakeFlags = [
|
icuQmakeFlags = [
|
||||||
"QMAKE_LFLAGS+=-Wl,--no-undefined"
|
"QMAKE_LFLAGS+=-Wl,--no-undefined"
|
||||||
|
|||||||
Reference in New Issue
Block a user