From 1593bddb65b1518fbd17c2d273b0f921f9e9e6fb Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 3 Nov 2020 12:00:56 -0700 Subject: [PATCH] Fix missing #include for gcc-11 --- 0001-gcc11.patch | 24 ++++++++++++++++++++++++ libreoffice.spec | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 0001-gcc11.patch diff --git a/0001-gcc11.patch b/0001-gcc11.patch new file mode 100644 index 0000000..a3e3b4e --- /dev/null +++ b/0001-gcc11.patch @@ -0,0 +1,24 @@ +From 6959a4c217d352e52673a3fec870eac17ceb60dc Mon Sep 17 00:00:00 2001 +From: Jeff Law +Date: Tue, 3 Nov 2020 08:05:03 -0700 +Subject: [PATCH] gcc11 + +--- + include/o3tl/lru_map.hxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx +index e822fde029..33a1487fa2 100644 +--- a/include/o3tl/lru_map.hxx ++++ b/include/o3tl/lru_map.hxx +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + namespace o3tl + { +-- +2.28.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 8fbd629..cd1e6d8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 1%{?libo_prerelease}%{?dist} +Release: 2%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -254,6 +254,7 @@ Patch6: 0001-rhbz-1882616-move-cursor-one-step-at-a-time-in-the-d.patch Patch7: 0001-export-HYPERLINK-target-in-html-clipboard-export.patch Patch8: 0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch Patch9: 0001-fix-disable-pdfium-build.patch +Patch10: 0001-gcc11.patch %if 0%{?rhel} # not upstreamed @@ -2262,6 +2263,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Tue Nov 02 2020 Jeff Law - 1:7.0.3.2-2 +- Fix missing #include for gcc-11 + * Thu Oct 29 2020 Caolán McNamara - 1:7.0.3.2-1 - latest version