Accepting request 894318 from LibreOffice:Factory

OBS-URL: https://build.opensuse.org/request/show/894318
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=227

gcc11-fix-error.patch

@@ -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
+ 
+ /**

libreoffice.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed May 19 10:26:14 UTC 2021 - Markéta Machová <mmachova@suse.com>
+
+- Recommend libreoffice-qt5 only when it is actually created
+
+-------------------------------------------------------------------
+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>
+
+- libreoffice requires at least java 1.8.0 to run properly
+- mention some forgotten issues in the changelog
+
 -------------------------------------------------------------------
 Tue May  4 11:31:27 UTC 2021 - Markéta Machová <mmachova@suse.com>
 
@@ -75,7 +91,7 @@ Fri Feb 12 08:07:45 UTC 2021 - Markéta Machová <mmachova@suse.com>
 -------------------------------------------------------------------
 Mon Feb  1 13:08:22 UTC 2021 - Markéta Machová <mmachova@suse.com>
 
-- Update to 7.1.0.3
+- Update to 7.1.0.3 (bsc#1176198, bsc#1176197, bsc#1175552)
   * RC3 7.1 series
 - Update bundled dependencies
 - New patch use-comphelper.patch to fix build
@@ -163,7 +179,7 @@ Tue Oct  6 08:26:14 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 -------------------------------------------------------------------
 Thu Sep  3 11:13:13 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 
-- Update to 7.0.1.2:
+- Update to 7.0.1.2 (bsc#1172941, bsc#1162022):
   * RC2 release of 7.0.1
 
 -------------------------------------------------------------------

libreoffice.spec

@@ -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
@@ -232,7 +234,9 @@ Requires:       libreoffice-l10n-en = %{version}
 Requires:       python3
 Recommends:     dejavu-fonts
 Recommends:     google-carlito-fonts
+%if %{with kdeintegration}
 Recommends:     (libreoffice-qt5 if lxqt-session)
+%endif
 Provides:       %{name}-draw-extensions = %{version}
 Obsoletes:      %{name}-draw-extensions < %{version}
 Provides:       %{name}-impress-extensions = %{version}
@@ -412,10 +416,10 @@ Obsoletes:      %{name}-base-drivers-mysql
 Requires:       %{name}-base-drivers-firebird
 %else
 %ifarch %{ix86}
-Requires:       jre-32 >= 1.6
+Requires:       jre-32 >= 1.8
 %endif
 %ifarch x86_64 aarch64
-Requires:       jre-64 >= 1.6
+Requires:       jre-64 >= 1.8
 %endif
 %endif
 
@@ -617,10 +621,10 @@ Summary:        OfficeBean Java Bean component for LibreOffice
 Group:          Productivity/Office/Suite
 Requires:       %{name} = %{version}
 %ifarch %{ix86}
-Requires:       jre-32 >= 1.6
+Requires:       jre-32 >= 1.8
 %endif
 %ifarch x86_64 aarch64 ppc64le
-Requires:       jre-64 >= 1.6
+Requires:       jre-64 >= 1.8
 %endif
 
 %description officebean
@@ -648,10 +652,10 @@ Requires:       libreoffice-pyuno = %{version}
 Requires(pre):  libreoffice = %{version}
 # the watchWindow extension is written in java
 %ifarch %{ix86}
-Requires:       jre-32 >= 9.0
+Requires:       jre-32 >= 1.8
 %endif
 %ifarch x86_64 aarch64 ppc64le
-Requires:       jre-64 >= 9.0
+Requires:       jre-64 >= 1.8
 %endif
 
 %description calc-extensions
@@ -668,10 +672,10 @@ Requires:       libreoffice-writer = %{version}
 Requires(pre):  libreoffice = %{version}
 # the wiki extension is written in java
 %ifarch %{ix86}
-Requires:       jre-32 >= 9.0
+Requires:       jre-32 >= 1.8
 %endif
 %ifarch x86_64 aarch64 ppc64le
-Requires:       jre-64 >= 9.0
+Requires:       jre-64 >= 1.8
 %endif
 
 %description writer-extensions
@@ -973,6 +977,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