diff options
| author |   Sam James <sam@gentoo.org> | 2024-03-04 04:21:42 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-03-04 04:21:42 +0000 |
| commit | 321f0cac07cd882e8ab7f74d7fd5c80c84dcd4a4 (patch) | |
| tree | abe643d351a45a490cbb61c6478ed43713a72b42 /app-office | |
| parent | dev-libs/libksba: Stabilize 1.6.6 amd64, #926119 (diff) | |
| download | gentoo-321f0cac07cd882e8ab7f74d7fd5c80c84dcd4a4.tar.gz gentoo-321f0cac07cd882e8ab7f74d7fd5c80c84dcd4a4.tar.bz2 gentoo-321f0cac07cd882e8ab7f74d7fd5c80c84dcd4a4.zip | |
app-office/libreoffice: fix build w/ GCC 14
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-7.6.5.2-gcc14.patch | 38 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.6.5.2.ebuild | 3 |
2 files changed, 41 insertions, 0 deletions
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" ) |