public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
Date: Mon,  4 Mar 2024 04:22:04 +0000 (UTC)	[thread overview]
Message-ID: <1709526102.321f0cac07cd882e8ab7f74d7fd5c80c84dcd4a4.sam@gentoo> (raw)

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"
 )


             reply	other threads:[~2024-03-04  4:22 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-04  4:22 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-02 20:19 [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ Andreas Sturmlechner
2025-07-05 17:53 Andreas Sturmlechner
2025-06-13 16:28 Sam James
2025-06-02 16:47 Andreas Sturmlechner
2025-05-06 18:17 Andreas Sturmlechner
2025-03-04 22:04 Sam James
2025-02-22 23:24 Sam James
2024-12-17 21:44 Andreas Sturmlechner
2024-10-05 13:54 Andreas Sturmlechner
2024-09-21  8:29 Andreas Sturmlechner
2024-05-21 15:14 Andreas Sturmlechner
2024-03-28 18:48 Andreas Sturmlechner
2024-03-12 11:50 Andreas Sturmlechner
2024-03-10 16:30 Andreas Sturmlechner
2024-01-28 16:28 Andreas Sturmlechner
2023-11-21 22:36 Andreas Sturmlechner
2023-11-20 13:35 Sam James
2023-11-03 23:58 Sam James
2023-02-01 18:22 Andreas Sturmlechner
2023-01-30  4:01 Sam James
2023-01-13 19:08 Sam James
2023-01-10  0:04 Andreas Sturmlechner
2022-12-17 19:53 David Seifert
2022-11-03  8:40 Andreas Sturmlechner
2022-08-31 21:47 Sam James
2022-06-14 15:20 Andreas Sturmlechner
2022-05-09 19:12 Sam James
2022-05-08 13:35 Andreas Sturmlechner
2022-03-12 15:53 Andreas Sturmlechner
2022-02-05 20:46 Andreas Sturmlechner
2021-12-03 11:11 Andreas Sturmlechner
2021-11-05  5:39 Sam James
2021-09-07 18:28 Andreas Sturmlechner
2021-06-10 15:34 Andreas Sturmlechner
2021-01-24 13:02 Andreas Sturmlechner
2020-12-12 21:59 Andreas Sturmlechner
2020-11-21 22:18 Andreas Sturmlechner
2020-11-21 21:00 Andreas K. Hüttel
2020-11-06  2:22 Andreas Sturmlechner
2020-11-05 22:51 Andreas Sturmlechner
2020-10-29 10:40 Andreas Sturmlechner
2020-10-22 22:04 Andreas Sturmlechner
2020-09-08 18:08 Andreas Sturmlechner
2020-05-31 21:09 Andreas Sturmlechner
2020-04-05 17:05 Andreas Sturmlechner
2020-01-17  2:50 Andreas Sturmlechner
2019-11-01 18:39 Andreas Sturmlechner
2019-10-18 23:59 Andreas Sturmlechner
2019-08-13 15:56 Andreas Sturmlechner
2019-04-21 11:31 Andreas Sturmlechner
2019-04-21 11:31 Andreas Sturmlechner
2019-04-11  9:03 Andreas Sturmlechner
2019-03-30  9:59 Andreas Sturmlechner
2019-02-01 20:14 Andreas Sturmlechner
2019-01-30 22:31 Andreas Sturmlechner
2019-01-23 22:53 Andreas Sturmlechner
2019-01-08  0:17 Andreas Sturmlechner
2018-12-13 11:01 Andreas Sturmlechner
2018-12-13  9:57 Andreas Sturmlechner
2018-10-01 18:13 Andreas Sturmlechner
2018-08-13 21:48 Andreas Sturmlechner
2018-06-10 14:43 Andreas Sturmlechner
2018-05-27 22:59 Andreas Sturmlechner
2018-05-27 19:54 Andreas Sturmlechner
2018-05-27  6:29 Andreas Sturmlechner
2018-04-25 16:15 Andreas Sturmlechner
2017-12-21 13:27 Andreas Sturmlechner
2017-10-08 11:22 Andreas Sturmlechner
2017-02-26 18:37 Andreas Sturmlechner
2016-11-06 18:42 Andreas Hüttel
2016-07-03 20:10 Andreas Hüttel
2016-02-25 16:50 Andreas Hüttel
2016-02-22 17:07 Andreas Hüttel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1709526102.321f0cac07cd882e8ab7f74d7fd5c80c84dcd4a4.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox