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

- Add patch to fix building on SLE12:

Browse Source 
* old-boost.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=815
This commit is contained in:
Tomáš Chvátal 2019-08-20 10:27:38 +00:00 committed by Git OBS Bridge
parent b1a6264e16
commit 504e5c4a86
3 changed files with 21 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 @@
-------------------------------------------------------------------
Tue Aug 20 10:27:08 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Add patch to fix building on SLE12:
* old-boost.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 19 11:49:21 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com> Mon Aug 19 11:49:21 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

2
libreoffice.spec
View File

@ -103,6 +103,7 @@ Patch3: mediawiki-no-broken-help.diff
Patch4: gcc.patch Patch4: gcc.patch
Patch5: mdds-1-5.patch Patch5: mdds-1-5.patch
Patch6: 0001-Fix-buidling-with-older-boost.patch Patch6: 0001-Fix-buidling-with-older-boost.patch
Patch7: old-boost.patch
# try to save space by using hardlinks # try to save space by using hardlinks
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep # save time by relying on rpm check rather than doing stupid find+grep
@ -989,6 +990,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1
%patch990 -p1 %patch990 -p1
%patch991 -p1 %patch991 -p1

13
old-boost.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index bad7d74672d0..07d3549e750d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1287,7 +1287,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
OUString sSetupVersion = utl::ConfigManager::getProductVersion();
sal_Int32 iCurrent = sSetupVersion.getToken(0,'.').toInt32() * 10 + sSetupVersion.getToken(1,'.').toInt32();
OUString sLastVersion
- = officecfg::Setup::Product::ooSetupLastVersion::get().value_or("0.0");
+ = officecfg::Setup::Product::ooSetupLastVersion::get().get_value_or("0.0");
sal_Int32 iLast = sLastVersion.getToken(0,'.').toInt32() * 10 + sLastVersion.getToken(1,'.').toInt32();
if ((iCurrent > iLast) && !Application::IsHeadlessModeEnabled() && !bIsUITest)
{