From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1567621-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 95DBA158089
for <garchives@archives.gentoo.org>; Fri, 3 Nov 2023 23:58:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9B7432BC01C;
Fri, 3 Nov 2023 23:58:25 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2BCBA2BC01C
for <gentoo-commits@lists.gentoo.org>; Fri, 3 Nov 2023 23:58:25 +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 6A9C6335D35
for <gentoo-commits@lists.gentoo.org>; Fri, 3 Nov 2023 23:58:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C83E2AB1
for <gentoo-commits@lists.gentoo.org>; Fri, 3 Nov 2023 23:58:22 +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: <1699055784.87f7190edb773b267fe88529b36a442583e09435.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.5.6.2-gcc-14.patch app-office/libreoffice/libreoffice-7.5.6.2.ebuild app-office/libreoffice/libreoffice-7.5.7.1.ebuild app-office/libreoffice/libreoffice-7.5.8.2.ebuild app-office/libreoffice/libreoffice-7.5.9999.ebuild
X-VCS-Directories: app-office/libreoffice/files/ app-office/libreoffice/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 87f7190edb773b267fe88529b36a442583e09435
X-VCS-Branch: master
Date: Fri, 3 Nov 2023 23:58:22 +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: 981db057-5760-4629-92b0-97fb6c686a91
X-Archives-Hash: 9ca657c1875920a4fd230f999c9a916e
commit: 87f7190edb773b267fe88529b36a442583e09435
Author: Kostadin Shishmanov <kocelfc <AT> tutanota <DOT> com>
AuthorDate: Wed Nov 1 15:48:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 3 23:56:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f7190e
app-office/libreoffice: fix build with gcc 14 for 7.5.x
Closes: https://bugs.gentoo.org/916621
Signed-off-by: Kostadin Shishmanov <kocelfc <AT> tutanota.com>
Closes: https://github.com/gentoo/gentoo/pull/33623
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libreoffice-7.5.6.2-gcc-14.patch | 64 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-7.5.6.2.ebuild | 1 +
app-office/libreoffice/libreoffice-7.5.7.1.ebuild | 1 +
app-office/libreoffice/libreoffice-7.5.8.2.ebuild | 1 +
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 1 +
5 files changed, 68 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-7.5.6.2-gcc-14.patch b/app-office/libreoffice/files/libreoffice-7.5.6.2-gcc-14.patch
new file mode 100644
index 000000000000..1d73ea97d807
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.5.6.2-gcc-14.patch
@@ -0,0 +1,64 @@
+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)
+
+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>
+---
+ store/source/storbase.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
+index feac0db962272..207cbf40a8d3c 100644
+--- a/store/source/storbase.hxx
++++ b/store/source/storbase.hxx
+@@ -32,6 +32,7 @@
+
+ #include <store/types.h>
+
++#include <cstdlib>
+ #include <memory>
+ #include <utility>
+
+From 436c879b355f2cde763b0386df92e0d3708180a7 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Mon, 5 Jun 2023 13:52:01 +0200
+Subject: [PATCH] Missing include (for std::find_if)
+
+Change-Id: I91d70d72ea6cb18ed4fde2f3b3a3d037668767e5
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152615
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+index a89b8fc7fc72e..7127581856fce 100644
+--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
++++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+@@ -16,6 +16,7 @@
+
+ #include <LibreOfficeKit/LibreOfficeKitGtk.h>
+
++#include <algorithm>
+ #include <fstream>
+ #include <map>
+ #include <memory>
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
index c8c2708fb0b1..218687cea076 100644
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
@@ -294,6 +294,7 @@ PATCHES=(
# git master
"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+ "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.5.7.1.ebuild b/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
index 5d22adeb817d..b59666e8479d 100644
--- a/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
@@ -294,6 +294,7 @@ PATCHES=(
# git master
"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+ "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
index d17697cc93d8..996c240bfb6e 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
@@ -294,6 +294,7 @@ PATCHES=(
# git master
"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+ "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index d17697cc93d8..996c240bfb6e 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -294,6 +294,7 @@ PATCHES=(
# git master
"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+ "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"