From f19be52c3c9bd9607c5de6f7e01b7e80d2fbfaa4a406e1316f6620932b8a2d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Fri, 14 May 2021 08:34:42 +0000
Subject: [PATCH 1/5] Accepting request 893042 from LibreOffice:7.1

- libreoffice requires at least java 1.8.0 to run properly
- mention some forgotten issues in the changelog

- Update to 7.1.0.3 (bsc#1176198, bsc#1176197, bsc#1175552)
- Update to 7.0.1.2 (bsc#1172941, bsc#1162022):

OBS-URL: https://build.opensuse.org/request/show/893042
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=958
---
 libreoffice.changes | 10 ++++++++--
 libreoffice.spec    | 16 ++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/libreoffice.changes b/libreoffice.changes
index c92ce18..2579c51 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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 +81,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 +169,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
 
 -------------------------------------------------------------------
diff --git a/libreoffice.spec b/libreoffice.spec
index 20426ad..764fcf1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -412,10 +412,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 +617,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 +648,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 +668,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

From 97c368dbc579e9c3cab120580e00b516b2c3e10f18239cff7fc91235cef186bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Tue, 18 May 2021 07:42:54 +0000
Subject: [PATCH 2/5] 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
---
 gcc11-fix-error.patch | 13 +++++++++++++
 libreoffice.changes   |  5 +++++
 libreoffice.spec      |  3 +++
 3 files changed, 21 insertions(+)
 create mode 100644 gcc11-fix-error.patch

diff --git a/gcc11-fix-error.patch b/gcc11-fix-error.patch
new file mode 100644
index 0000000..c578cda
--- /dev/null
+++ b/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
+ 
+ /**
diff --git a/libreoffice.changes b/libreoffice.changes
index 2579c51..cdbfd93 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -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>
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 764fcf1..c46b047 100644
--- a/libreoffice.spec
+++ b/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
@@ -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

From 2a538243a4b90bd38ed5e8bcbe5a5a88dab92d1132664ba055f1ca1488f150fc Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 19 May 2021 11:25:37 +0000
Subject: [PATCH 3/5] Accepting request 894296 from LibreOffice:7.1

- Recommend libreoffice-qt5 only when it is actually created

OBS-URL: https://build.opensuse.org/request/show/894296
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=960
---
 libreoffice.changes | 5 +++++
 libreoffice.spec    | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/libreoffice.changes b/libreoffice.changes
index cdbfd93..3c1f871 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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>
 
diff --git a/libreoffice.spec b/libreoffice.spec
index c46b047..8793afe 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -234,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}

From cb3eb53aa8a01a132961876f5038bd8abe987eb8fd4a796e5c032a31e9d09ada Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 19 May 2021 14:25:42 +0000
Subject: [PATCH 4/5] OBS-URL:
 https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=961

---
 libreoffice.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libreoffice.spec b/libreoffice.spec
index 8793afe..52d402b 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -235,7 +235,7 @@ Requires:       python3
 Recommends:     dejavu-fonts
 Recommends:     google-carlito-fonts
 %if %{with kdeintegration}
-Recommends:     (libreoffice-qt5 if lxqt-session)
+Recommends:     libreoffice-qt5
 %endif
 Provides:       %{name}-draw-extensions = %{version}
 Obsoletes:      %{name}-draw-extensions < %{version}

From fb224555fdef4950aa294acf980cfd7d460909f95d5d2547e6cd70a17c06d8d9 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 19 May 2021 14:39:06 +0000
Subject: [PATCH 5/5] OBS-URL:
 https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=962

---
 libreoffice.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libreoffice.spec b/libreoffice.spec
index 52d402b..8793afe 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -235,7 +235,7 @@ Requires:       python3
 Recommends:     dejavu-fonts
 Recommends:     google-carlito-fonts
 %if %{with kdeintegration}
-Recommends:     libreoffice-qt5
+Recommends:     (libreoffice-qt5 if lxqt-session)
 %endif
 Provides:       %{name}-draw-extensions = %{version}
 Obsoletes:      %{name}-draw-extensions < %{version}