Accepting request 893914 from home:marxin:branches:LibreOffice:Factory

- Add gcc11-fix-error.patch as fix for boo#1186110.

OBS-URL: https://build.opensuse.org/request/show/893914
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=959
This commit is contained in:
Markéta Machová 2021-05-18 07:42:54 +00:00 committed by Git OBS Bridge
parent f19be52c3c
commit 97c368dbc5
3 changed files with 21 additions and 0 deletions

13
gcc11-fix-error.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 6bb0d1b..5691888 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -191,7 +191,7 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
(::std::ostringstream() << stream).str()
#else
#define SAL_STREAM(stream) \
- (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream).str())
+ (dynamic_cast< ::std::ostringstream && >(::std::ostringstream() << stream).str())
#endif
/**

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 18 06:59:06 UTC 2021 - Martin Liška <mliska@suse.cz>
- Add gcc11-fix-error.patch as fix for boo#1186110.
-------------------------------------------------------------------
Fri May 14 07:04:57 UTC 2021 - Markéta Machová <mmachova@suse.com>

View File

@ -103,6 +103,8 @@ Patch3: mediawiki-no-broken-help.diff
Patch4: use-comphelper.patch
# PATCH-FIX-UPSTREAM https://github.com/LibreOffice/core/commit/9fed7b07af44792012028eb57900640a5ee833cb tdf#141930 document set as unmodified if editengine didn't modify on keyevent
Patch5: bsc1184961.patch
# PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error
Patch6: gcc11-fix-error.patch
# Build with java 8
Patch101: 0001-Revert-java-9-changes.patch
# try to save space by using hardlinks
@ -973,6 +975,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch3
%patch4 -p1
%patch5 -p1
%patch6 -p1
%if 0%{?suse_version} < 1500
%patch101 -p1
%endif