[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

["Sam James" <sam@gentoo.org>]

commit:     49cba18492d5f932a13d52cdd2e9e4e61de32472
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 13 16:28:01 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 13 16:28:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49cba184

app-office/libreoffice: another GCC 16 fix

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libreoffice-25.2.4.3-gcc16.patch         | 28 ++++++++++++++++++++++
 .../libreoffice/libreoffice-25.2.4.3-r1.ebuild     |  1 +
 .../libreoffice/libreoffice-25.2.9999.ebuild       |  1 +
 3 files changed, 30 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-25.2.4.3-gcc16.patch b/app-office/libreoffice/files/libreoffice-25.2.4.3-gcc16.patch
new file mode 100644
index 000000000000..fd4d84465211
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-25.2.4.3-gcc16.patch
@@ -0,0 +1,28 @@
+https://github.com/LibreOffice/core/commit/6ebc3c540f2aa13363e3dcb32a44bfa2c7f66a9f
+
+From 6ebc3c540f2aa13363e3dcb32a44bfa2c7f66a9f Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <stephan.bergmann@allotropia.de>
+Date: Mon, 9 Jun 2025 21:03:40 +0200
+Subject: [PATCH] Missing include (for USHRT_MAX)
+
+Change-Id: I9d2a59fd198679c2a7a7ce124e2548f2add61d6d
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186303
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
+---
+ include/comphelper/errcode.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/comphelper/errcode.hxx b/include/comphelper/errcode.hxx
+index 865ab5538897b..3adc6ecdf790b 100644
+--- a/include/comphelper/errcode.hxx
++++ b/include/comphelper/errcode.hxx
+@@ -21,6 +21,7 @@
+ #include <config_options.h>
+ #include <rtl/ustring.hxx>
+ #include <comphelper/comphelperdllapi.h>
++#include <climits>
+ #include <ostream>
+ #include <o3tl/typed_flags_set.hxx>
+ #include <optional>
+

diff --git a/app-office/libreoffice/libreoffice-25.2.4.3-r1.ebuild b/app-office/libreoffice/libreoffice-25.2.4.3-r1.ebuild
index 3cf40ef9eea9..d800a26f3950 100644
--- a/app-office/libreoffice/libreoffice-25.2.4.3-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.4.3-r1.ebuild
@@ -301,6 +301,7 @@ PATCHES=(
 	# git master:
 	"${FILESDIR}/${PN}-25.2-unused-qt6network.patch"
 	"${FILESDIR}/${PN}-25.2.3.2-poppler-25.05.patch"
+	"${FILESDIR}/${PN}-25.2.4.3-gcc16.patch"
 )
 
 _check_reqs() {

diff --git a/app-office/libreoffice/libreoffice-25.2.9999.ebuild b/app-office/libreoffice/libreoffice-25.2.9999.ebuild
index 5de9ad5fc9f1..9f440bb04505 100644
--- a/app-office/libreoffice/libreoffice-25.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.9999.ebuild
@@ -296,6 +296,7 @@ PATCHES=(
 
 	# git master
 	"${FILESDIR}/${PN}-25.2-unused-qt6network.patch"
+	"${FILESDIR}/${PN}-25.2.4.3-gcc16.patch"
 
 	# add qt6 backend as possible fallback for gtk-based desktop environments:
 	# https://bugs.gentoo.org/950170