From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1607073-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 25429158041
for <garchives@archives.gentoo.org>; Mon, 4 Mar 2024 04:22:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 62E1AE2A79;
Mon, 4 Mar 2024 04:22:07 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 448D5E2A79
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Mar 2024 04:22:07 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6DAE333BEF5
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Mar 2024 04:22:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C10AF119
for <gentoo-commits@lists.gentoo.org>; Mon, 4 Mar 2024 04:22:04 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1709526102.321f0cac07cd882e8ab7f74d7fd5c80c84dcd4a4.sam@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.6.5.2-gcc14.patch app-office/libreoffice/libreoffice-7.6.5.2.ebuild
X-VCS-Directories: app-office/libreoffice/ app-office/libreoffice/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 321f0cac07cd882e8ab7f74d7fd5c80c84dcd4a4
X-VCS-Branch: master
Date: Mon, 4 Mar 2024 04:22:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: cedbd7cb-a2f2-44ce-904b-1bdf229bb83f
X-Archives-Hash: f362659ceb468b4de55b4c7824c220d0
commit: 321f0cac07cd882e8ab7f74d7fd5c80c84dcd4a4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 04:21:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 04:21:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321f0cac
app-office/libreoffice: fix build w/ GCC 14
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libreoffice-7.6.5.2-gcc14.patch | 38 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-7.6.5.2.ebuild | 3 ++
2 files changed, 41 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch b/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch
new file mode 100644
index 000000000000..a98012320375
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch
@@ -0,0 +1,38 @@
+https://github.com/LibreOffice/core/commit/db98a3f1b1a703ea8e1284b8815eea2274abb2db
+
+From db98a3f1b1a703ea8e1284b8815eea2274abb2db Mon Sep 17 00:00:00 2001
+From: Martin Jambor <mjambor@suse.cz>
+Date: Wed, 7 Jun 2023 18:11:45 +0200
+Subject: [PATCH] Add cstdlib include necessary to build with gcc14 libstdc++
+ (tdf#155715)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without explicitely including <cstdlib>, compiling some files
+including store/source/storbase.hxx (such as store/source/storpage.cxx
+which includes it through store/source/storpage.hxx) will result in
+errors:
+
+ error: ‘malloc’ is not a member of ‘std’
+
+and
+
+ error: ‘free’ is not a member of ‘std’
+
+This patch simply adds the necessary include.
+
+Change-Id: I3d1fa2a17c5ae9d512f1de9d434dac3d82fc353f
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152712
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+--- a/store/source/storbase.hxx
++++ b/store/source/storbase.hxx
+@@ -32,6 +32,7 @@
+
+ #include <store/types.h>
+
++#include <cstdlib>
+ #include <memory>
+ #include <utility>
+
diff --git a/app-office/libreoffice/libreoffice-7.6.5.2.ebuild b/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
index 938dfe9ad75d..f13092052517 100644
--- a/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
@@ -296,6 +296,9 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+ # upstream
+ "${FILESDIR}/${PN}-7.6.5.2-gcc14.patch"
+
# maybe upstreamable
"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
)