[packages/libreoffice] upstream fix for gcc11
atler
atler at pld-linux.org
Fri Jun 25 16:57:12 CEST 2021
commit 3fb1580cf100f53e375f01143042d2679faa82fe
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Jun 25 14:56:09 2021 +0000
upstream fix for gcc11
gcc11.patch | 28 ++++++++++++++++++++++++++++
libreoffice.spec | 2 ++
2 files changed, 30 insertions(+)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index e8926e9..2a79941 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -99,6 +99,7 @@ Source30: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9
Patch0: disable-failing-test.patch
Patch1: %{name}-upgrade-liborcus-to-0.16.0.patch
+Patch2: gcc11.patch
URL: http://www.documentfoundation.org/
BuildRequires: /usr/bin/getopt
@@ -2842,6 +2843,7 @@ oraz narzędzie ui-previewer do sprawdzania wyglądu okien dialogowych.
%setup -q -a1 -a2 -a3
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for dir in *-%{version}; do
[ -f $dir/ChangeLog ] && %{__mv} $dir/ChangeLog ChangeLog-$dir
diff --git a/gcc11.patch b/gcc11.patch
new file mode 100644
index 0000000..b7d5eb8
--- /dev/null
+++ b/gcc11.patch
@@ -0,0 +1,28 @@
+From 8830cf86b146b1252ac37f351a23246088d569b0 Mon Sep 17 00:00:00 2001
+From: Jeff Law <law at redhat.com>
+Date: Tue, 3 Nov 2020 08:05:03 -0700
+Subject: [PATCH] include cstddef for gcc11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I2f845ce9bb660ad6c1eea80ea81dd71add2c0db1
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107191
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara <caolanm at redhat.com>
+---
+ 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 c7132fd079c43..96fb3161782d7 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
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libreoffice.git/commitdiff/3fb1580cf100f53e375f01143042d2679faa82fe
More information about the pld-cvs-commit
mailing list