diff --git a/extra/libreoffice-still/PKGBUILD b/extra/libreoffice-still/PKGBUILD index 5c980119f..7633da809 100644 --- a/extra/libreoffice-still/PKGBUILD +++ b/extra/libreoffice-still/PKGBUILD @@ -20,7 +20,7 @@ pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') _LOver=6.4.7.2 pkgver=6.4.7 -pkgrel=7 +pkgrel=8 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/" @@ -64,6 +64,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url2}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff + icu68.patch soffice-template.desktop.in libreoffice-still.sh libreoffice-still.csh) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -108,6 +109,7 @@ sha256sums=('034dd79a60cfff60c7d353130fe2cc8e6a1aabeab50d89e4570ae95f33296644' '884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' + 'f650b91b98f71176ae1e4e7969eb3d6ec3e261dcb873703db0f2df578ee4b08c' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a' 'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1') @@ -131,6 +133,8 @@ prepare() { # fix not upstreamable pyuno paths - FS#54250 patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff + patch -Np0 -i ../icu68.patch + #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in diff --git a/extra/libreoffice-still/icu68.patch b/extra/libreoffice-still/icu68.patch new file mode 100644 index 000000000..59edaffae --- /dev/null +++ b/extra/libreoffice-still/icu68.patch @@ -0,0 +1,31 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +i18npool/source/calendar/calendar_gregorian.cxx:350:40: error: use of undeclared identifier 'TRUE' + body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); + ^ +svx/source/dialog/fntctrl.cxx:1017:24: error: use of undeclared identifier 'TRUE' + bTransparent = TRUE; + ^ + +--- i18npool/source/calendar/calendar_gregorian.cxx.orig 2020-09-30 15:54:35 UTC ++++ i18npool/source/calendar/calendar_gregorian.cxx +@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDa + "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); + int32_t nZoneOffset, nDSTOffset; + UErrorCode status = U_ZERO_ERROR; +- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); ++ body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status ); + if ( !U_SUCCESS(status) ) throw ERROR; + status = U_ZERO_ERROR; + body->setTime( fR - (nZoneOffset + nDSTOffset), status ); +--- svx/source/dialog/fntctrl.cxx.orig 2020-10-07 12:23:42 UTC ++++ svx/source/dialog/fntctrl.cxx +@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSe + rCTLFont.SetFillColor( rColor ); + } + else +- bTransparent = TRUE; ++ bTransparent = true; + + rFont.SetTransparent( bTransparent ); + rCJKFont.SetTransparent( bTransparent );