From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23C1B1382C5 for ; Sun, 24 Jan 2021 13:02:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6ADE0E09F6; Sun, 24 Jan 2021 13:02:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D73FE09F7 for ; Sun, 24 Jan 2021 13:02:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 33EE23411B8 for ; Sun, 24 Jan 2021 13:02:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43CAB4AE for ; Sun, 24 Jan 2021 13:02:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1611493149.5d807dbc22e70f8bcce8fd99637b0464686d26fd.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch app-office/libreoffice/libreoffice-7.0.4.2.ebuild X-VCS-Directories: app-office/libreoffice/files/ app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5d807dbc22e70f8bcce8fd99637b0464686d26fd X-VCS-Branch: master Date: Sun, 24 Jan 2021 13:02:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 72a89672-1e44-4738-b1d4-1d4bad60ad69 X-Archives-Hash: f535d8012bd82f9b5d51f5693c8e3eb2 commit: 5d807dbc22e70f8bcce8fd99637b0464686d26fd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 24 12:56:37 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 24 12:59:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d807dbc app-office/libreoffice: Fix build with GCC-11 Reported-by: Geoff Leach cs.rmit.edu.au> Closes: https://bugs.gentoo.org/766656 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libreoffice-7.0.4.2-gcc11.patch | 31 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-7.0.4.2.ebuild | 3 +++ 2 files changed, 34 insertions(+) diff --git a/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch b/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch new file mode 100644 index 00000000000..748a6c21d74 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch @@ -0,0 +1,31 @@ +From 8830cf86b146b1252ac37f351a23246088d569b0 Mon Sep 17 00:00:00 2001 +From: Jeff Law +Date: Tue, 3 Nov 2020 08:05:03 -0700 +Subject: 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 +--- + 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 c7132fd079c4..96fb3161782d 100644 +--- a/include/o3tl/lru_map.hxx ++++ b/include/o3tl/lru_map.hxx +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + namespace o3tl + { +-- +cgit v1.2.1 + diff --git a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild index 1a4ef40f551..ee160145711 100644 --- a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild @@ -292,6 +292,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" + + # 7.0 branch + "${FILESDIR}/${PN}-7.0.4.2-gcc11.patch" ) S="${WORKDIR}/${PN}-${MY_PV}"