commit:     c2f728904f3b8f7186e9b8392115eb2234faeb58
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 13 18:56:37 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 13 18:56:37 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f72890

app-office/libreoffice: even even more GCC 16 fixes

.. and scrub-patch'd.

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

 .../files/libreoffice-25.2.4.3-gcc16.patch         | 62 +++++++++++++++-------
 1 file changed, 44 insertions(+), 18 deletions(-)

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
index 987e13da8a0c..2ac9d5929691 100644
--- a/app-office/libreoffice/files/libreoffice-25.2.4.3-gcc16.patch
+++ b/app-office/libreoffice/files/libreoffice-25.2.4.3-gcc16.patch
@@ -1,6 +1,8 @@
 
https://github.com/LibreOffice/core/commit/6ebc3c540f2aa13363e3dcb32a44bfa2c7f66a9f
 
https://github.com/LibreOffice/core/commit/0084c2b22ce26084df5a379135ba8ac174585ac0
 
https://github.com/LibreOffice/core/commit/19c32b44fead600118377417012b111a4f238766
+https://gerrit.libreoffice.org/c/core/+/186476/1
+https://gerrit.libreoffice.org/c/core/+/186477/1
 
 From 6ebc3c540f2aa13363e3dcb32a44bfa2c7f66a9f Mon Sep 17 00:00:00 2001
 From: Stephan Bergmann <[email protected]>
@@ -11,12 +13,6 @@ Change-Id: I9d2a59fd198679c2a7a7ce124e2548f2add61d6d
 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186303
 Tested-by: Jenkins
 Reviewed-by: Stephan Bergmann <[email protected]>
----
- 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 @@
@@ -37,12 +33,6 @@ Change-Id: I8f03310ab1b5da503670f77bf9c5211e956dd48c
 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186305
 Tested-by: Jenkins
 Reviewed-by: Stephan Bergmann <[email protected]>
----
- sc/source/core/data/dptabsrc.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sc/source/core/data/dptabsrc.cxx 
b/sc/source/core/data/dptabsrc.cxx
-index ad8f2490f2bab..61123f89cd8ab 100644
 --- a/sc/source/core/data/dptabsrc.cxx
 +++ b/sc/source/core/data/dptabsrc.cxx
 @@ -20,6 +20,7 @@
@@ -63,12 +53,6 @@ Change-Id: I1755b440515724315aa2e540fe3de4a473371dc4
 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186304
 Tested-by: Jenkins
 Reviewed-by: Stephan Bergmann <[email protected]>
----
- sax/source/tools/converter.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
-index c026e35d770ae..f27fc325e26de 100644
 --- a/sax/source/tools/converter.cxx
 +++ b/sax/source/tools/converter.cxx
 @@ -39,6 +39,7 @@
@@ -79,3 +63,45 @@ index c026e35d770ae..f27fc325e26de 100644
  #include <map>
  #include <string_view>
  
+From bae60d77e59b93588c1698c3f8fe0d0002122c7b Mon Sep 17 00:00:00 2001
+Message-ID: 
<bae60d77e59b93588c1698c3f8fe0d0002122c7b.1749840898.git....@gentoo.org>
+From: Sam James <[email protected]>
+Date: Fri, 13 Jun 2025 19:09:27 +0100
+Subject: [PATCH 1/2] svl: include <cstdint> for uintptr_t
+
+Change-Id: I0d71229fe4dde51b81f9a681bda9d146ba9554be
+--- a/svl/source/notify/broadcast.cxx
++++ b/svl/source/notify/broadcast.cxx
+@@ -22,6 +22,7 @@
+ #include <svl/hint.hxx>
+ #include <o3tl/safeint.hxx>
+ #include <cassert>
++#include <cstdint>
+ #include <algorithm>
+ 
+ /**
+-- 
+2.49.0
+
+From e98650b7b829c37132ab817176c75b4abda9d9b3 Mon Sep 17 00:00:00 2001
+Message-ID: 
<e98650b7b829c37132ab817176c75b4abda9d9b3.1749840898.git....@gentoo.org>
+In-Reply-To: 
<bae60d77e59b93588c1698c3f8fe0d0002122c7b.1749840898.git....@gentoo.org>
+References: 
<bae60d77e59b93588c1698c3f8fe0d0002122c7b.1749840898.git....@gentoo.org>
+From: Sam James <[email protected]>
+Date: Fri, 13 Jun 2025 19:30:18 +0100
+Subject: [PATCH 2/2] vcl: include <cstdint> for uint32_t
+
+Change-Id: I274aca50232290ec05be9ea2700720526b8f761d
+--- a/include/vcl/font/Feature.hxx
++++ b/include/vcl/font/Feature.hxx
+@@ -14,6 +14,7 @@
+ #include <rtl/character.hxx>
+ #include <rtl/ustring.hxx>
+ #include <unotools/resmgr.hxx>
++#include <cstdint>
+ #include <vector>
+ 
+ namespace vcl::font
+-- 
+2.49.0
+

Reply via email to