pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add patch to fix build with old icu from Leap 42:

Browse Source 
* old-icu.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=772
This commit is contained in:
Tomáš Chvátal 2019-03-15 15:06:43 +00:00 committed by Git OBS Bridge
parent 7c1e7d19de
commit 4683ad5d2e
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libreoffice.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 15 15:05:42 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Add patch to fix build with old icu from Leap 42:
* old-icu.patch
-------------------------------------------------------------------
Thu Mar 14 14:44:58 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

2
libreoffice.spec
View File

@ -104,6 +104,7 @@ Patch7: libreoffice-postgresql.patch
Patch8: 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch
Patch9: boost_169.patch
Patch10: kde5.patch
Patch11: old-icu.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
@ -971,6 +972,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch990 -p1
%patch991 -p1

24
old-icu.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 75fd8f82b874..caf84853071e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -9408,7 +9408,8 @@ void ScInterpreter::ScRegex()
{
// Find n-th occurrence.
sal_Int32 nCount = 0;
- while (aRegexMatcher.find( status) && U_SUCCESS(status) && ++nCount < nOccurrence)
+ int32_t nStartPos = 0;
+ while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status) && ++nCount < nOccurrence)
;
if (U_FAILURE(status))
{
@@ -9448,7 +9449,8 @@ void ScInterpreter::ScRegex()
{
// Replace n-th occurrence of match with replacement.
sal_Int32 nCount = 0;
- while (aRegexMatcher.find( status) && U_SUCCESS(status))
+ int32_t nStartPos = 0;
+ while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status))
{
// XXX NOTE: After several RegexMatcher::find() the
// RegexMatcher::appendReplacement() still starts at the