Accepting request 683590 from home:adamm:branches:LibreOffice:Factory
- boost_169.patch: fix build with Boost 1.69 OBS-URL: https://build.opensuse.org/request/show/683590 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=765
This commit is contained in:
parent
d8d59a2f7f
commit
1940718c71
13
boost_169.patch
Normal file
13
boost_169.patch
Normal 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;
|
||||
}
|
||||
|
||||
}
|
@ -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>
|
||||
|
||||
|
@ -104,6 +104,7 @@ Patch5: old-boost.patch
|
||||
Patch6: kde5-32bit-build-fix.patch
|
||||
Patch7: libreoffice-postgresql.patch
|
||||
Patch8: 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch
|
||||
Patch9: boost_169.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
|
||||
%patch6 -p1
|
||||
%patch7
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch990 -p1
|
||||
%patch991 -p1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user