From 403bf61489eaded6982fe5700b4dbf58d869aa12 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <thorsten.behrens@allotropia.de>
Date: Wed, 6 Dec 2023 11:44:15 +0100
Subject: Fix build for gcc13
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was part of the following commit:

  Author: Stephan Bergmann <sbergman@redhat.com>
  Date:   Mon May 23 10:21:54 2022 +0200

    Missing #include <stdint.h> in various external code

    ...which is a problem presumably since GCC 13 trunk
    <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6f038efd93593da6e661b829d1bd3877e75550f1>
    "libstdc++: Avoid including <cstdint> for std::char_traits".  (All the broken
    C++ code used unqualified uintptr_t etc. rather than std::uintptr_t etc., so I
    deemed it more appropriate to include <stdint.h> rather than <cstdint>.)

    Change-Id: Id9dfc383c5986126a425971c4557b90ac45ac963
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134760
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

Plus the gist of this one:

  Author: Caolán McNamara <caolanm@redhat.com>
  Date:   Tue Nov 3 14:10:31 2020 +0000

    presumably 'true' is sufficient in all cases

    Change-Id: I9366193085a4c46ef64f0a9660e51b8678ca35f9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105252
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm@redhat.com>

Change-Id: Iae063b6270dfe60cebe27833b1a22f7af1fc312c
---
 external/liborcus/include.patch.0               | 21 +++++++++++++++++++++
 i18npool/source/calendar/calendar_gregorian.cxx |  2 +-
 svx/source/dialog/fntctrl.cxx                   |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/external/liborcus/include.patch.0 b/external/liborcus/include.patch.0
index 9555dd534b3e..3bed5aebf865 100644
--- a/external/liborcus/include.patch.0
+++ b/external/liborcus/include.patch.0
@@ -1,3 +1,24 @@
+--- include/orcus/base64.hpp
++++ include/orcus/base64.hpp
+@@ -9,6 +9,7 @@
+ #define __ORCUS_BASE64_HPP__
+ 
+ #include "env.hpp"
++#include <stdint.h>
+ #include <vector>
+ #include <string>
+ 
+--- include/orcus/types.hpp
++++ include/orcus/types.hpp
+@@ -16,6 +16,7 @@
+ #pragma GCC diagnostic ignored "-Wshadow"
+ #endif
+ 
++#include <stdint.h>
+ #include <cstdlib>
+ #include <vector>
+ #include <string>
+
 --- src/liborcus/orcus_xlsx.cpp
 +++ src/liborcus/orcus_xlsx.cpp
 @@ -32,6 +32,7 @@
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index f3dc6ede1f66..1dacd8868265 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays )
             "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR);
     int32_t nZoneOffset, nDSTOffset;
     UErrorCode status = U_ZERO_ERROR;
-    body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
+    body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status );
     if ( !U_SUCCESS(status) ) throw ERROR;
     status = U_ZERO_ERROR;
     body->setTime( fR - (nZoneOffset + nDSTOffset), status );
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index d312d7ad5f49..10c84ca95222 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack
          rCTLFont.SetFillColor( rColor );
     }
     else
-        bTransparent = TRUE;
+        bTransparent = true;
 
     rFont.SetTransparent( bTransparent );
     rCJKFont.SetTransparent( bTransparent );
-- 
cgit