diff --git a/icu68.patch b/icu68.patch new file mode 100644 index 0000000..f6fec1b --- /dev/null +++ b/icu68.patch @@ -0,0 +1,37 @@ +From 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Mon Sep 17 00:00:00 2001 +From: Rene Engelhard +Date: Sun, 1 Nov 2020 18:30:49 +0100 +Subject: fix build with ICU 68 + +use standard true. + +/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)': +/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope + 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); + | ^~~~ + +/usr/include/unicode/umachine.h says: + +@deprecated ICU 68 Use standard "true" instead. + +Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057 +Tested-by: Jenkins +Reviewed-by: Eike Rathke +--- + i18npool/source/calendar/calendar_gregorian.cxx | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx +index b7ae49fbd96e..59ee46fa0e0f 100644 +--- a/i18npool/source/calendar/calendar_gregorian.cxx ++++ b/i18npool/source/calendar/calendar_gregorian.cxx +@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) + "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 ); diff --git a/libreoffice.changes b/libreoffice.changes index 20c9ca6..db5c571 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 2 11:07:57 UTC 2021 - Callum Farmer + +- Add icu68.patch: fix build with ICU 68 + ------------------------------------------------------------------- Sat Dec 19 21:58:35 UTC 2020 - Andras Timar diff --git a/libreoffice.spec b/libreoffice.spec index 56bcb35..2b9734c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -102,6 +102,8 @@ Patch4: 0001-Upgrade-liborcus-to-0.16.0.patch # LO-L3: Shadow effect(s) for table completely missing - part 1 and 2 Patch5: bsc1178944.diff Patch6: bsc1178943.diff +# Fix build with ICU 68 +Patch7: icu68.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -962,6 +964,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %patch990 -p1 %patch991 -p1