Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libreoffice.git#1593bddb65b1518fbd17c2d273b0f921f9e9e6fb
This commit is contained in:
parent
3dd01279cb
commit
539465dd6b
24
0001-gcc11.patch
Normal file
24
0001-gcc11.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
From 6959a4c217d352e52673a3fec870eac17ceb60dc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jeff Law <law@redhat.com>
|
||||||
|
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 <cassert>
|
||||||
|
#include <list>
|
||||||
|
#include <unordered_map>
|
||||||
|
+#include <cstddef>
|
||||||
|
|
||||||
|
namespace o3tl
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
|
|||||||
Name: libreoffice
|
Name: libreoffice
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: %{libo_version}.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
|
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/
|
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
|
Patch7: 0001-export-HYPERLINK-target-in-html-clipboard-export.patch
|
||||||
Patch8: 0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch
|
Patch8: 0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch
|
||||||
Patch9: 0001-fix-disable-pdfium-build.patch
|
Patch9: 0001-fix-disable-pdfium-build.patch
|
||||||
|
Patch10: 0001-gcc11.patch
|
||||||
|
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
# not upstreamed
|
# not upstreamed
|
||||||
@ -2262,6 +2263,9 @@ done
|
|||||||
%{_includedir}/LibreOfficeKit
|
%{_includedir}/LibreOfficeKit
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 02 2020 Jeff Law <law@redhat.com> - 1:7.0.3.2-2
|
||||||
|
- Fix missing #include for gcc-11
|
||||||
|
|
||||||
* Thu Oct 29 2020 Caolán McNamara <caolanm@redhat.com> - 1:7.0.3.2-1
|
* Thu Oct 29 2020 Caolán McNamara <caolanm@redhat.com> - 1:7.0.3.2-1
|
||||||
- latest version
|
- latest version
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user