Accepting request 683725 from LibreOffice:Factory

OBS-URL: https://build.opensuse.org/request/show/683725
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=174
This commit is contained in:
Dominique Leuenberger 2019-03-12 08:51:14 +00:00 committed by Git OBS Bridge
commit 3f2c698adc
3 changed files with 20 additions and 0 deletions

13
boost_169.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libreoffice-6.2.1.2/sfx2/source/appl/shutdownicon.cxx
===================================================================
--- libreoffice-6.2.1.2.orig/sfx2/source/appl/shutdownicon.cxx
+++ libreoffice-6.2.1.2/sfx2/source/appl/shutdownicon.cxx
@@ -143,7 +143,7 @@ bool LoadModule()
#endif // ENABLE_QUICKSTART_APPLET
}
assert(!boost::logic::indeterminate(loaded));
- return loaded;
+ return (bool)loaded;
}
}

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Mar 10 15:51:32 UTC 2019 - Adam Majer <adam.majer@suse.de>
- boost_169.patch: fix build with Boost 1.69
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 8 09:23:06 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com> Fri Mar 8 09:23:06 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -104,6 +104,7 @@ Patch5: old-boost.patch
Patch6: kde5-32bit-build-fix.patch Patch6: kde5-32bit-build-fix.patch
Patch7: libreoffice-postgresql.patch Patch7: libreoffice-postgresql.patch
Patch8: 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch Patch8: 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch
Patch9: boost_169.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
@ -971,6 +972,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch6 -p1 %patch6 -p1
%patch7 %patch7
%patch8 -p1 %patch8 -p1
%patch9 -p1
%patch990 -p1 %patch990 -p1
%patch991 -p1 %patch991 -p1